diff --git a/kristofers/game/scenes/main_menu.tscn b/kristofers/game/scenes/main_menu.tscn
index 06e6ab9..8d09d5b 100644
--- a/kristofers/game/scenes/main_menu.tscn
+++ b/kristofers/game/scenes/main_menu.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=4 format=2]
 
 [ext_resource path="res://font/roboto.tres" type="DynamicFont" id=1]
-[ext_resource path="res://code/network_setup.gd" type="Script" id=2]
+[ext_resource path="res://code/server/network_setup.gd" type="Script" id=2]
 [ext_resource path="res://code/UI.gd" type="Script" id=3]
 
 [node name="network_setup" type="Control"]
diff --git a/kristofers/game/scenes/server_advertiser.tscn b/kristofers/game/scenes/server_advertiser.tscn
index 6c6dc44..82d724d 100644
--- a/kristofers/game/scenes/server_advertiser.tscn
+++ b/kristofers/game/scenes/server_advertiser.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://code/server_advertiser.gd" type="Script" id=1]
+[ext_resource path="res://code/server/server_advertiser.gd" type="Script" id=1]
 
 [node name="server_advertiser" type="Node"]
 script = ExtResource( 1 )
diff --git a/kristofers/game/scenes/server_browser.tscn b/kristofers/game/scenes/server_browser.tscn
index 2054895..4825e50 100644
--- a/kristofers/game/scenes/server_browser.tscn
+++ b/kristofers/game/scenes/server_browser.tscn
@@ -2,7 +2,7 @@
 
 [ext_resource path="res://font/roboto.tres" type="DynamicFont" id=1]
 [ext_resource path="res://scenes/server_listener.tscn" type="PackedScene" id=2]
-[ext_resource path="res://code/server_browser.gd" type="Script" id=3]
+[ext_resource path="res://code/server/server_browser.gd" type="Script" id=3]
 
 [sub_resource type="Animation" id=1]
 resource_name = "searching_for_servers"
@@ -144,5 +144,3 @@ __meta__ = {
 [connection signal="pressed" from="background_panel/manual_setup" to="." method="_on_manual_setup_pressed"]
 [connection signal="pressed" from="background_panel/go_back" to="." method="_on_go_back_pressed"]
 [connection signal="pressed" from="background_panel/server_ip_text_edit/join_server" to="." method="_on_join_server_pressed"]
-[connection signal="new_server" from="server_listener" to="." method="_on_server_listener_new_server"]
-[connection signal="remove_server" from="server_listener" to="." method="_on_server_listener_remove_server"]
diff --git a/kristofers/game/scenes/server_display.tscn b/kristofers/game/scenes/server_display.tscn
index 3252bdb..e27a169 100644
--- a/kristofers/game/scenes/server_display.tscn
+++ b/kristofers/game/scenes/server_display.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=2]
 
 [ext_resource path="res://font/roboto.tres" type="DynamicFont" id=1]
-[ext_resource path="res://code/server_display.gd" type="Script" id=2]
+[ext_resource path="res://code/server/server_display.gd" type="Script" id=2]
 
 [node name="server_display" type="Label"]
 anchor_right = 1.0
diff --git a/kristofers/game/scenes/server_listener.tscn b/kristofers/game/scenes/server_listener.tscn
index 8e0df2b..08fdcb6 100644
--- a/kristofers/game/scenes/server_listener.tscn
+++ b/kristofers/game/scenes/server_listener.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://code/server_listener.gd" type="Script" id=1]
+[ext_resource path="res://code/server/server_listener.gd" type="Script" id=1]
 
 [node name="server_listener" type="Node"]
 script = ExtResource( 1 )