diff --git a/game/characters/player/player.tscn b/game/characters/player/player.tscn
index d4b9c6d..6fa48ad 100644
--- a/game/characters/player/player.tscn
+++ b/game/characters/player/player.tscn
@@ -4,8 +4,8 @@
 [ext_resource type="PackedScene" uid="uid://5qlocc0yu8ug" path="res://game/collision_switcher.tscn" id="2_j06tb"]
 [ext_resource type="PackedScene" uid="uid://cvx6akiplg21s" path="res://game/characters/player/player_sprite.tscn" id="2_n6ad3"]
 [ext_resource type="PackedScene" uid="uid://3ll3i1fgktg2" path="res://game/state_machine/state_machine.tscn" id="4_65114"]
-[ext_resource type="PackedScene" uid="uid://c7adrbfobmvl8" path="res://game/state_machine/abstract_state.tscn" id="5_65114"]
-[ext_resource type="Script" uid="uid://bnxccvt265hlu" path="res://game/characters/player/states/idle_state.gd" id="6_3qf5w"]
+[ext_resource type="PackedScene" uid="uid://c0d4wfdg7xjti" path="res://game/characters/player/state_machine/player_state.tscn" id="5_65114"]
+[ext_resource type="Script" uid="uid://bnxccvt265hlu" path="res://game/characters/player/state_machine/idle_state.gd" id="6_3qf5w"]
 
 [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_xln5q"]
 radius = 4.0
@@ -53,8 +53,9 @@ shape = SubResource("CapsuleShape2D_t6gq4")
 
 [node name="StateMachine" parent="." unique_id=633169960 instance=ExtResource("4_65114")]
 
-[node name="IdleState" parent="StateMachine" unique_id=739226464 instance=ExtResource("5_65114")]
+[node name="IdleState" parent="StateMachine" unique_id=739226464 node_paths=PackedStringArray("player") instance=ExtResource("5_65114")]
 script = ExtResource("6_3qf5w")
+player = NodePath("../..")
 
 [connection signal="animation_finished" from="AnimatedSprite2D" to="." method="_on_animation_finished"]
 [connection signal="animation_looped" from="AnimatedSprite2D" to="." method="_on_animation_looped"]
diff --git a/game/characters/player/state_machine/idle_state.gd b/game/characters/player/state_machine/idle_state.gd
new file mode 100644
index 0000000..5b70470
--- /dev/null
+++ b/game/characters/player/state_machine/idle_state.gd
@@ -0,0 +1 @@
+extends PlayerState
diff --git a/game/characters/player/states/idle_state.gd.uid b/game/characters/player/state_machine/idle_state.gd.uid
similarity index 100%
rename from game/characters/player/states/idle_state.gd.uid
rename to game/characters/player/state_machine/idle_state.gd.uid
diff --git a/game/characters/player/state_machine/player_state.gd b/game/characters/player/state_machine/player_state.gd
new file mode 100644
index 0000000..7182c46
--- /dev/null
+++ b/game/characters/player/state_machine/player_state.gd
@@ -0,0 +1,5 @@
+class_name PlayerState
+extends AbstractState
+
+
+@export var player: Player
diff --git a/game/characters/player/state_machine/player_state.gd.uid b/game/characters/player/state_machine/player_state.gd.uid
new file mode 100644
index 0000000..f3eaf82
--- /dev/null
+++ b/game/characters/player/state_machine/player_state.gd.uid
@@ -0,0 +1 @@
+uid://cl4tgf5j7xxvm
diff --git a/game/characters/player/state_machine/player_state.tscn b/game/characters/player/state_machine/player_state.tscn
new file mode 100644
index 0000000..f9a8642
--- /dev/null
+++ b/game/characters/player/state_machine/player_state.tscn
@@ -0,0 +1,7 @@
+[gd_scene format=3 uid="uid://c0d4wfdg7xjti"]
+
+[ext_resource type="PackedScene" uid="uid://c7adrbfobmvl8" path="res://game/state_machine/abstract_state.tscn" id="1_cun6f"]
+[ext_resource type="Script" uid="uid://cl4tgf5j7xxvm" path="res://game/characters/player/state_machine/player_state.gd" id="2_h7f7n"]
+
+[node name="PlayerState" unique_id=739226464 instance=ExtResource("1_cun6f")]
+script = ExtResource("2_h7f7n")
diff --git a/game/characters/player/states/idle_state.gd b/game/characters/player/states/idle_state.gd
deleted file mode 100644
index bcfcae5..0000000
--- a/game/characters/player/states/idle_state.gd
+++ /dev/null
@@ -1 +0,0 @@
-extends AbstractState