diff --git a/src/player/movement_controller.gd b/src/player/movement/movement_controller.gd
similarity index 92%
rename from src/player/movement_controller.gd
rename to src/player/movement/movement_controller.gd
index 848b14a..984e4b4 100644
--- a/src/player/movement_controller.gd
+++ b/src/player/movement/movement_controller.gd
@@ -1,6 +1,7 @@
 class_name MovementController extends Node
 ## Character movement controller
 
+@export var enabled := true
 @export var movement_enabled := true
 
 @export_group("Speed")
@@ -36,11 +37,14 @@ func get_friction() -> float:
 
 ## Make the character jump.
 func jump() -> void:
-	if movement_enabled and character.is_on_floor():
+	if enabled and movement_enabled and character.is_on_floor():
 		character.velocity.y = jump_force
 
 
 func _physics_process(delta: float) -> void:
+	if not enabled:
+		return
+
 	if not character.is_on_floor():
 		# Apply gravity
 		character.velocity += character.get_gravity() * delta
diff --git a/src/player/movement_controller.gd.uid b/src/player/movement/movement_controller.gd.uid
similarity index 100%
rename from src/player/movement_controller.gd.uid
rename to src/player/movement/movement_controller.gd.uid
diff --git a/src/player/player_input_controller.gd b/src/player/movement/player_input_controller.gd
similarity index 100%
rename from src/player/player_input_controller.gd
rename to src/player/movement/player_input_controller.gd
diff --git a/src/player/player_input_controller.gd.uid b/src/player/movement/player_input_controller.gd.uid
similarity index 100%
rename from src/player/player_input_controller.gd.uid
rename to src/player/movement/player_input_controller.gd.uid
diff --git a/src/player/player.tscn b/src/player/player.tscn
index ffad472..4ff89e3 100644
--- a/src/player/player.tscn
+++ b/src/player/player.tscn
@@ -7,8 +7,8 @@
 [ext_resource type="Script" uid="uid://buq2c8inefgdl" path="res://src/player/camera/strafe_bank_effect.gd" id="3_x42xx"]
 [ext_resource type="Script" uid="uid://bndyjh51gkqeo" path="res://src/player/camera/fall_kick_effect.gd" id="4_8ydov"]
 [ext_resource type="Script" uid="uid://032jyhgkb2rv" path="res://src/player/camera/mouselook_controller.gd" id="4_244u8"]
-[ext_resource type="Script" uid="uid://c0nxcunx0fo4r" path="res://src/player/movement_controller.gd" id="6_jiejy"]
-[ext_resource type="Script" uid="uid://d11erhxna68vd" path="res://src/player/player_input_controller.gd" id="7_o822w"]
+[ext_resource type="Script" uid="uid://c0nxcunx0fo4r" path="res://src/player/movement/movement_controller.gd" id="6_jiejy"]
+[ext_resource type="Script" uid="uid://d11erhxna68vd" path="res://src/player/movement/player_input_controller.gd" id="7_o822w"]
 [ext_resource type="Script" uid="uid://dao84umfatnid" path="res://src/player/debug_hud.gd" id="9_l271a"]
 
 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_qnmj6"]
@@ -52,6 +52,7 @@ height = 1.0
 
 [sub_resource type="SystemFont" id="SystemFont_x42xx"]
 font_names = PackedStringArray("Monospace")
+subpixel_positioning = 0
 
 [sub_resource type="Theme" id="Theme_l271a"]
 default_font = SubResource("SystemFont_x42xx")