diff --git a/scenes/monster/monster.gd b/entities/monster/monster.gd
similarity index 100%
rename from scenes/monster/monster.gd
rename to entities/monster/monster.gd
diff --git a/scenes/monster/monster.tscn b/entities/monster/monster.tscn
similarity index 89%
rename from scenes/monster/monster.tscn
rename to entities/monster/monster.tscn
index 901d16c..bcddc6f 100644
--- a/scenes/monster/monster.tscn
+++ b/entities/monster/monster.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=5 format=3 uid="uid://cytaswycabcel"]
 
-[ext_resource type="Script" path="res://scenes/monster/monster.gd" id="1_5gfkg"]
+[ext_resource type="Script" path="res://entities/monster/monster.gd" id="1_5gfkg"]
 [ext_resource type="Material" uid="uid://ctul3e67rcq23" path="res://materials/CollisionDebugMaterial.tres" id="2_bf2kb"]
 
 [sub_resource type="SphereShape3D" id="SphereShape3D_tjvna"]
diff --git a/scenes/monster_spawnpoint/monster_spawnpoint.gd b/entities/monster_spawnpoint/monster_spawnpoint.gd
similarity index 97%
rename from scenes/monster_spawnpoint/monster_spawnpoint.gd
rename to entities/monster_spawnpoint/monster_spawnpoint.gd
index d0021c9..5afed0c 100644
--- a/scenes/monster_spawnpoint/monster_spawnpoint.gd
+++ b/entities/monster_spawnpoint/monster_spawnpoint.gd
@@ -1,7 +1,7 @@
 class_name MonsterSpawnpoint
 extends Node3D
 
-@onready var monster_tscn = preload("res://scenes/monster/monster.tscn")
+@onready var monster_tscn = preload("res://entities/monster/monster.tscn")
 
 # a spawnpoint that can spawn monsters
 # monsters are only spawned, if the player is not looking
diff --git a/scenes/monster_spawnpoint/monster_spawnpoint.tscn b/entities/monster_spawnpoint/monster_spawnpoint.tscn
similarity index 89%
rename from scenes/monster_spawnpoint/monster_spawnpoint.tscn
rename to entities/monster_spawnpoint/monster_spawnpoint.tscn
index c38a45c..cd64eb1 100644
--- a/scenes/monster_spawnpoint/monster_spawnpoint.tscn
+++ b/entities/monster_spawnpoint/monster_spawnpoint.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=4 format=3 uid="uid://dawpmu4vvv3rs"]
 
-[ext_resource type="Script" path="res://scenes/monster_spawnpoint/monster_spawnpoint.gd" id="1_p2vfw"]
+[ext_resource type="Script" path="res://entities/monster_spawnpoint/monster_spawnpoint.gd" id="1_p2vfw"]
 
 [sub_resource type="SphereMesh" id="SphereMesh_phb77"]
 radius = 0.4
diff --git a/scenes/player/player.gd b/entities/player/player.gd
similarity index 100%
rename from scenes/player/player.gd
rename to entities/player/player.gd
diff --git a/scenes/player/player.tscn b/entities/player/player.tscn
similarity index 93%
rename from scenes/player/player.tscn
rename to entities/player/player.tscn
index 784a0a0..3755f51 100644
--- a/scenes/player/player.tscn
+++ b/entities/player/player.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=4 format=3 uid="uid://be5bc5gjbo875"]
 
-[ext_resource type="Script" path="res://scenes/player/player.gd" id="1_mv2yl"]
+[ext_resource type="Script" path="res://entities/player/player.gd" id="1_mv2yl"]
 [ext_resource type="PackedScene" uid="uid://cy36aygvs66pn" path="res://assets/models/gobot/gobot_skin.tscn" id="2_a4t6w"]
 
 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_xuba7"]
diff --git a/scenes/game.gd b/game.gd
similarity index 84%
rename from scenes/game.gd
rename to game.gd
index dd52257..8d0c685 100644
--- a/scenes/game.gd
+++ b/game.gd
@@ -18,14 +18,14 @@ func _ready() -> void:
 	
 # this event comes from the MainMenu Node in the UI
 func _on_ui_on_new_game_started() -> void:
-	var world = preload("res://scenes/worlds/debug_level.tscn").instantiate()
+	var world = preload("res://worlds/debug_level.tscn").instantiate()
 	UI.show_ingame_controls()
 	
 	# Add the starting world
 	%CurrentLevel.add_child(world)
 	
 	# Add the starting player to the starting world
-	var player = preload("res://scenes/player/player.tscn").instantiate()
+	var player = preload("res://entities/player/player.tscn").instantiate()
 	world.add_child(player)
 
 # event comes from the MainMenu Node in the UI
diff --git a/scenes/game.tscn b/game.tscn
similarity index 75%
rename from scenes/game.tscn
rename to game.tscn
index fc19034..fb4aa8f 100644
--- a/scenes/game.tscn
+++ b/game.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=3 uid="uid://cswuap81n7t3f"]
 
-[ext_resource type="Script" path="res://scenes/game.gd" id="1_mfbtr"]
-[ext_resource type="PackedScene" uid="uid://b5y7pdfe6ougf" path="res://scenes/ui/ui.tscn" id="2_ynhuf"]
+[ext_resource type="Script" path="res://game.gd" id="1_mfbtr"]
+[ext_resource type="PackedScene" uid="uid://b5y7pdfe6ougf" path="res://ui/ui.tscn" id="2_ynhuf"]
 
 [node name="Game" type="Node3D"]
 script = ExtResource("1_mfbtr")
diff --git a/project.godot b/project.godot
index 7f03946..c31bff6 100644
--- a/project.godot
+++ b/project.godot
@@ -11,14 +11,14 @@ config_version=5
 [application]
 
 config/name="monsterfangen"
-run/main_scene="res://scenes/game.tscn"
+run/main_scene="res://game.tscn"
 config/features=PackedStringArray("4.3", "Mobile")
 boot_splash/image="res://assets/logo/logo.png"
 config/icon="res://assets/logo/logo.png"
 
 [autoload]
 
-UI="*res://scenes/ui/ui.gd"
+UI="*res://ui/ui.gd"
 SaveGame="*res://globals/save_game.gd"
 SaveData="*res://resources/save_data.gd"
 
@@ -30,6 +30,17 @@ window/stretch/mode="canvas_items"
 window/stretch/aspect="expand"
 window/handheld/orientation=1
 
+[file_customization]
+
+folder_colors={
+"res://assets/": "red",
+"res://entities/": "blue",
+"res://globals/": "gray",
+"res://materials/": "pink",
+"res://resources/": "yellow",
+"res://ui/": "green"
+}
+
 [global_group]
 
 Persist="Contains all nodes that need to be saved"
diff --git a/scripts/camera_controls.gd b/ui/camera_controls.gd
similarity index 100%
rename from scripts/camera_controls.gd
rename to ui/camera_controls.gd
diff --git a/scenes/ui/ingame_controls.gd b/ui/ingame_controls.gd
similarity index 100%
rename from scenes/ui/ingame_controls.gd
rename to ui/ingame_controls.gd
diff --git a/scenes/ui/ingame_controls.tscn b/ui/ingame_controls.tscn
similarity index 96%
rename from scenes/ui/ingame_controls.tscn
rename to ui/ingame_controls.tscn
index ad93b3f..ec1e4fd 100644
--- a/scenes/ui/ingame_controls.tscn
+++ b/ui/ingame_controls.tscn
@@ -1,8 +1,8 @@
 [gd_scene load_steps=11 format=3 uid="uid://1anjhvi173g3"]
 
-[ext_resource type="Script" path="res://scenes/ui/ingame_controls.gd" id="1_iw1sp"]
+[ext_resource type="Script" path="res://ui/ingame_controls.gd" id="1_iw1sp"]
 [ext_resource type="Texture2D" uid="uid://2vxx2waofxpw" path="res://assets/textures/Xbox Series/Vector/xbox_button_menu_outline.svg" id="1_wr5sh"]
-[ext_resource type="Script" path="res://scripts/joystick.gd" id="2_pyri2"]
+[ext_resource type="Script" path="res://ui/joystick.gd" id="2_pyri2"]
 [ext_resource type="Texture2D" uid="uid://8anyvhkcy4ng" path="res://assets/textures/Xbox Series/Vector/xbox_button_a.svg" id="3_lgi8v"]
 [ext_resource type="Texture2D" uid="uid://cbep021ykpb23" path="res://assets/textures/Game Icons/Vector/2x/save.png" id="5_2pil1"]
 [ext_resource type="Texture2D" uid="uid://bwyoxxotdisyp" path="res://assets/textures/Game Icons/Vector/2x/gear.png" id="5_nwwsc"]
diff --git a/scenes/ui/ingame_menu.gd b/ui/ingame_menu.gd
similarity index 88%
rename from scenes/ui/ingame_menu.gd
rename to ui/ingame_menu.gd
index cbc25fa..2461141 100644
--- a/scenes/ui/ingame_menu.gd
+++ b/ui/ingame_menu.gd
@@ -2,7 +2,7 @@ extends MarginContainer
 class_name MonsterList
 
 @onready var monster_list_entry_container: MarginContainer = $MarginContainer/PanelContainer/VBoxContainer/MonsterListEntryContainer
-@onready var monster_list_entry = preload("res://scenes/ui/monster_list_entry.tscn")
+@onready var monster_list_entry = preload("res://ui/monster_list_entry.tscn")
 
 func _ready() -> void:
 	visible = false
diff --git a/scenes/ui/ingame_menu.tscn b/ui/ingame_menu.tscn
similarity index 98%
rename from scenes/ui/ingame_menu.tscn
rename to ui/ingame_menu.tscn
index 6f86d4c..8cd5e06 100644
--- a/scenes/ui/ingame_menu.tscn
+++ b/ui/ingame_menu.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=8 format=3 uid="uid://bbvbnrcjatkrb"]
 
-[ext_resource type="Script" path="res://scenes/ui/ingame_menu.gd" id="1_beinb"]
+[ext_resource type="Script" path="res://ui/ingame_menu.gd" id="1_beinb"]
 [ext_resource type="FontFile" uid="uid://bjaavdnopfh0q" path="res://assets/fonts/aoboshi_one/AoboshiOne-Regular.ttf" id="2_1e4kf"]
 [ext_resource type="Texture2D" uid="uid://bhh31i3wgww43" path="res://assets/textures/Game Icons/Vector/2x/singleplayer.png" id="2_c2ia0"]
 [ext_resource type="Texture2D" uid="uid://c737p2osplq2o" path="res://assets/textures/Xbox Series/Vector/xbox_button_x_outline.svg" id="3_kgfth"]
diff --git a/scripts/joystick.gd b/ui/joystick.gd
similarity index 100%
rename from scripts/joystick.gd
rename to ui/joystick.gd
diff --git a/scenes/ui/main_menu.gd b/ui/main_menu.gd
similarity index 100%
rename from scenes/ui/main_menu.gd
rename to ui/main_menu.gd
diff --git a/scenes/ui/main_menu.tscn b/ui/main_menu.tscn
similarity index 99%
rename from scenes/ui/main_menu.tscn
rename to ui/main_menu.tscn
index ad199db..16f1cac 100644
--- a/scenes/ui/main_menu.tscn
+++ b/ui/main_menu.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=10 format=3 uid="uid://dt00rjsodtady"]
 
 [ext_resource type="Texture2D" uid="uid://b6ylra30qxf30" path="res://assets/logo/logo.png" id="1_1fmce"]
-[ext_resource type="Script" path="res://scenes/ui/main_menu.gd" id="1_5gs73"]
+[ext_resource type="Script" path="res://ui/main_menu.gd" id="1_5gs73"]
 [ext_resource type="FontFile" uid="uid://bjaavdnopfh0q" path="res://assets/fonts/aoboshi_one/AoboshiOne-Regular.ttf" id="2_aqmkw"]
 [ext_resource type="Texture2D" uid="uid://da7o6lfuoliid" path="res://assets/textures/Backgrounds/meadow2.jpg" id="2_bb61v"]
 
diff --git a/scenes/ui/monster_list_entry.gd b/ui/monster_list_entry.gd
similarity index 100%
rename from scenes/ui/monster_list_entry.gd
rename to ui/monster_list_entry.gd
diff --git a/scenes/ui/monster_list_entry.tscn b/ui/monster_list_entry.tscn
similarity index 97%
rename from scenes/ui/monster_list_entry.tscn
rename to ui/monster_list_entry.tscn
index 7a70e6d..f3cbaa9 100644
--- a/scenes/ui/monster_list_entry.tscn
+++ b/ui/monster_list_entry.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=9 format=3 uid="uid://brp2sljqnkuhe"]
 
 [ext_resource type="Texture2D" uid="uid://b6ylra30qxf30" path="res://assets/logo/logo.png" id="1_16gb7"]
-[ext_resource type="Script" path="res://scenes/ui/monster_list_entry.gd" id="1_spojl"]
+[ext_resource type="Script" path="res://ui/monster_list_entry.gd" id="1_spojl"]
 [ext_resource type="Texture2D" uid="uid://2vxx2waofxpw" path="res://assets/textures/Xbox Series/Vector/xbox_button_menu_outline.svg" id="2_5n4ar"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_s3mod"]
diff --git a/scenes/ui/ui.gd b/ui/ui.gd
similarity index 100%
rename from scenes/ui/ui.gd
rename to ui/ui.gd
diff --git a/scenes/ui/ui.tscn b/ui/ui.tscn
similarity index 87%
rename from scenes/ui/ui.tscn
rename to ui/ui.tscn
index 1214b77..745c970 100644
--- a/scenes/ui/ui.tscn
+++ b/ui/ui.tscn
@@ -1,9 +1,9 @@
 [gd_scene load_steps=5 format=3 uid="uid://b5y7pdfe6ougf"]
 
-[ext_resource type="Script" path="res://scripts/camera_controls.gd" id="1_x56x6"]
-[ext_resource type="PackedScene" uid="uid://dt00rjsodtady" path="res://scenes/ui/main_menu.tscn" id="3_tcmm8"]
-[ext_resource type="PackedScene" uid="uid://1anjhvi173g3" path="res://scenes/ui/ingame_controls.tscn" id="4_likk0"]
-[ext_resource type="PackedScene" uid="uid://bbvbnrcjatkrb" path="res://scenes/ui/ingame_menu.tscn" id="5_qjqu1"]
+[ext_resource type="Script" path="res://ui/camera_controls.gd" id="1_x56x6"]
+[ext_resource type="PackedScene" uid="uid://dt00rjsodtady" path="res://ui/main_menu.tscn" id="3_tcmm8"]
+[ext_resource type="PackedScene" uid="uid://1anjhvi173g3" path="res://ui/ingame_controls.tscn" id="4_likk0"]
+[ext_resource type="PackedScene" uid="uid://bbvbnrcjatkrb" path="res://ui/ingame_menu.tscn" id="5_qjqu1"]
 
 [node name="UI" type="CanvasLayer"]
 
diff --git a/scenes/worlds/debug_level.tscn b/worlds/debug_level.tscn
similarity index 96%
rename from scenes/worlds/debug_level.tscn
rename to worlds/debug_level.tscn
index e18f5c8..a102923 100644
--- a/scenes/worlds/debug_level.tscn
+++ b/worlds/debug_level.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=10 format=3 uid="uid://p8agd0dfam0p"]
 
-[ext_resource type="PackedScene" uid="uid://dawpmu4vvv3rs" path="res://scenes/monster_spawnpoint/monster_spawnpoint.tscn" id="3_esgto"]
+[ext_resource type="PackedScene" uid="uid://dawpmu4vvv3rs" path="res://entities/monster_spawnpoint/monster_spawnpoint.tscn" id="3_esgto"]
 [ext_resource type="Script" path="res://resources/monster_data.gd" id="3_iktqp"]
 [ext_resource type="Resource" uid="uid://0xqaef8uftnv" path="res://resources/monsters/debuggy.tres" id="4_noslo"]