diff --git a/scenes/ai.tscn b/scenes/ai.tscn
new file mode 100644
index 0000000..43c8512
--- /dev/null
+++ b/scenes/ai.tscn
@@ -0,0 +1,9 @@
+[gd_scene load_steps=2 format=2]
+
+[ext_resource path="res://scripts/ai.gd" type="Script" id=1]
+
+[node name="Node" type="Node" index="0"]
+
+script = ExtResource( 1 )
+
+
diff --git a/scenes/ai/ai-player.tscn b/scenes/ai/ai-player.tscn
deleted file mode 100644
index 99742fd..0000000
--- a/scenes/ai/ai-player.tscn
+++ /dev/null
@@ -1,10 +0,0 @@
-[gd_scene load_steps=3 format=2]
-
-[ext_resource path="res://scenes/player.tscn" type="PackedScene" id=1]
-[ext_resource path="res://scripts/ai/ai-player.gd" type="Script" id=2]
-
-[node name="RigidBody" index="0" instance=ExtResource( 1 )]
-
-script = ExtResource( 2 )
-
-
diff --git a/scenes/ai/heroes/0.tscn b/scenes/ai/heroes/0.tscn
deleted file mode 100644
index 6a4e274..0000000
--- a/scenes/ai/heroes/0.tscn
+++ /dev/null
@@ -1,14 +0,0 @@
-[gd_scene load_steps=3 format=2]
-
-[ext_resource path="res://scenes/heroes/0.tscn" type="PackedScene" id=1]
-[ext_resource path="res://scripts/ai/ai-player.gd" type="Script" id=2]
-
-[node name="RigidBody" index="0" instance=ExtResource( 1 )]
-
-[node name="AIController" type="Node" parent="." index="7"]
-
-pause_mode = 2
-script = ExtResource( 2 )
-_sections_unfolded = [ "Pause" ]
-
-
diff --git a/scripts/ai/ai-player.gd b/scripts/ai.gd
similarity index 100%
rename from scripts/ai/ai-player.gd
rename to scripts/ai.gd
diff --git a/scripts/lobby.gd b/scripts/lobby.gd
index 89471ad..25c6401 100644
--- a/scripts/lobby.gd
+++ b/scripts/lobby.gd
@@ -203,8 +203,6 @@ remote func done_preconfiguring(who):
 sync func spawn_player(p):
 	var hero = player_info[p].hero
 	var player = load("res://scenes/heroes/" + str(hero) + ".tscn").instance()
-	if "is_ai" in player_info[p] and player_info[p].is_ai:
-		player = load("res://scenes/ai/heroes/" + str(hero) + ".tscn").instance()
 	player.set_name(str(p))
 	player.set_network_master(p)
 	player.player_info = player_info[p]
diff --git a/scripts/player.gd b/scripts/player.gd
index 293cb1d..138a4bb 100644
--- a/scripts/player.gd
+++ b/scripts/player.gd
@@ -40,6 +40,9 @@ func _ready():
 		spawn()
 	else:
 		remove_child(get_node(master_only))
+	
+	if "is_ai" in player_info and player_info.is_ai:
+		add_child(preload("res://scenes/ai.tscn").instance())
 
 func spawn():
 	var placement = Vector3()