diff --git a/Main.tscn b/Main.tscn
index a6f0b5c..cd40bfa 100644
--- a/Main.tscn
+++ b/Main.tscn
@@ -37,6 +37,7 @@ margin_bottom = 182.0
 rect_scale = Vector2( 2, 2 )
 
 [node name="Viewport" type="Viewport" parent="ViewportContainer"]
+unique_name_in_owner = true
 size = Vector2( 320, 180 )
 handle_input_locally = false
 render_target_update_mode = 3
diff --git a/lib/templates/Actor/ActorTemplate.tscn b/lib/parent_scenes/ActorTemplate.tscn
similarity index 90%
rename from lib/templates/Actor/ActorTemplate.tscn
rename to lib/parent_scenes/ActorTemplate.tscn
index 2a6279b..19a8563 100644
--- a/lib/templates/Actor/ActorTemplate.tscn
+++ b/lib/parent_scenes/ActorTemplate.tscn
@@ -1,20 +1,20 @@
 [gd_scene load_steps=6 format=2]
 
-[ext_resource path="res://lib/classes/animated_sprite_state_receiver.gd" type="Script" id=1]
-[ext_resource path="res://lib/classes/state_machine.gd" type="Script" id=2]
-[ext_resource path="res://lib/classes/audiostreamplayer_state_receiver.gd" type="Script" id=3]
-[ext_resource path="res://lib/classes/movement_state_receiver.gd" type="Script" id=5]
-[ext_resource path="res://lib/classes/actor.gd" type="Script" id=8]
+[ext_resource path="res://lib/classes/state_machine.gd" type="Script" id=1]
+[ext_resource path="res://lib/classes/actor.gd" type="Script" id=2]
+[ext_resource path="res://lib/classes/movement_state_receiver.gd" type="Script" id=3]
+[ext_resource path="res://lib/classes/animated_sprite_state_receiver.gd" type="Script" id=4]
+[ext_resource path="res://lib/classes/audiostreamplayer_state_receiver.gd" type="Script" id=5]
 
 [node name="ActorTemplate" type="KinematicBody2D"]
 collision_layer = 2
-script = ExtResource( 8 )
-
-[node name="Movement_StateMachine" type="Node" parent="."]
 script = ExtResource( 2 )
 
-[node name="AnimatedSprite_StateReceiver" type="AnimatedSprite" parent="."]
+[node name="Movement_StateMachine" type="Node" parent="."]
 script = ExtResource( 1 )
+
+[node name="AnimatedSprite_StateReceiver" type="AnimatedSprite" parent="."]
+script = ExtResource( 4 )
 __meta__ = {
 "_aseprite_wizard_config_": {
 "layer": "",
@@ -31,9 +31,9 @@ __meta__ = {
 callable_state_machine = NodePath("../Movement_StateMachine")
 
 [node name="Movement_StateReceiver" type="Node" parent="."]
-script = ExtResource( 5 )
+script = ExtResource( 3 )
 callable_state_machine = NodePath("../Movement_StateMachine")
 
 [node name="AudioStreamPlayer_StateReceiver" type="AudioStreamPlayer" parent="."]
-script = ExtResource( 3 )
+script = ExtResource( 5 )
 callable_state_machine = NodePath("../Movement_StateMachine")
diff --git a/src/actors/players/playerD/Player.tscn b/src/actors/players/playerD/Player.tscn
index 277d3b0..513aa1c 100644
--- a/src/actors/players/playerD/Player.tscn
+++ b/src/actors/players/playerD/Player.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=116 format=2]
 
-[ext_resource path="res://lib/templates/Actor/ActorTemplate.tscn" type="PackedScene" id=1]
+[ext_resource path="res://lib/parent_scenes/ActorTemplate.tscn" type="PackedScene" id=1]
 [ext_resource path="res://src/actors/players/playerD/movement_component.gd" type="Script" id=2]
 [ext_resource path="res://src/actors/players/playerD/Player.gd" type="Script" id=3]
 [ext_resource path="res://lib/components/Health_Component.tscn" type="PackedScene" id=7]
diff --git a/src/actors/players/playerE/PlayerE.tscn b/src/actors/players/playerE/PlayerE.tscn
index 1158a9d..d99036e 100644
--- a/src/actors/players/playerE/PlayerE.tscn
+++ b/src/actors/players/playerE/PlayerE.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=36 format=2]
 
-[ext_resource path="res://lib/templates/Actor/ActorTemplate.tscn" type="PackedScene" id=1]
+[ext_resource path="res://lib/parent_scenes/ActorTemplate.tscn" type="PackedScene" id=1]
 [ext_resource path="res://assets/actors/players/playerE/PlayerE_SpriteFrames.tres" type="SpriteFrames" id=2]
 [ext_resource path="res://src/actors/players/playerE/PlayerE.gd" type="Script" id=3]
 [ext_resource path="res://src/actors/players/playerE/states/idle.tres" type="Resource" id=4]