Merge pull request #130 from Spartan322/organize/godot-project

90 files changed, 88 insertions, 88 deletions

diff --git a/game/addons/openvic-plugin/ReleaseExportEditorPlugin.gd b/game/addons/openvic-plugin/ReleaseExportEditorPlugin.gd
index ac6c5bc..5deb761 100644
--- a/game/addons/openvic-plugin/ReleaseExportEditorPlugin.gd
+++ b/game/addons/openvic-plugin/ReleaseExportEditorPlugin.gd
@@ -9,7 +9,7 @@ func _get_name():
 	return "OpenVic-ReleaseExportEditorPlugin"
 
 func _export_file(path: String, type: String, features: PackedStringArray) -> void:
-	if path != "res://src/Utility/GIT_INFO.gd": return
+	if path != "res://src/GIT_INFO.gd": return
 	var GitInfoScript : String = ""
 	_get_commit_long()
 	_get_commit_short()
diff --git a/game/project.godot b/game/project.godot
index 3bb2438..253a54b 100644
--- a/game/project.godot
+++ b/game/project.godot
@@ -12,7 +12,7 @@ config_version=5
 
 config/name="OpenVic"
 config/description="A faithful recreation of Victoria 2: Heart of Darkness with a focus on enhancing performance, multiplayer stability, and modability for modern machines."
-run/main_scene="res://src/GameStart.tscn"
+run/main_scene="res://src/Game/GameStart.tscn"
 config/features=PackedStringArray("4.0", "Forward Plus")
 boot_splash/bg_color=Color(0.380392, 0.145098, 0.14902, 1)
 boot_splash/image="res://splash_assets/splash_image.png"
@@ -21,14 +21,14 @@ config/project_settings_override.template="user://settings.cfg"
 
 [autoload]
 
-ArgumentParser="*res://src/Autoload/Arguments/ArgumentParser.tscn"
-Events="*res://src/Autoload/Events.gd"
-Resolution="*res://src/Autoload/Resolution.gd"
-SoundManager="*res://src/Autoload/SoundManager.gd"
-MusicConductor="*res://src/MusicConductor/MusicConductor.tscn"
+ArgumentParser="*res://src/Game/Autoload/Argument/ArgumentParser.tscn"
+Events="*res://src/Game/Autoload/Events.gd"
+Resolution="*res://src/Game/Autoload/Resolution.gd"
+SoundManager="*res://src/Game/Autoload/SoundManager.gd"
+MusicConductor="*res://src/Game/MusicConductor/MusicConductor.tscn"
 Keychain="*res://addons/keychain/Keychain.gd"
-GuiScale="*res://src/Autoload/GuiScale.gd"
-SaveManager="*res://src/Autoload/SaveManager.gd"
+GuiScale="*res://src/Game/Autoload/GuiScale.gd"
+SaveManager="*res://src/Game/Autoload/SaveManager.gd"
 
 [display]
 
diff --git a/game/src/Utility/GIT_INFO.gd b/game/src/GIT_INFO.gd
index eddb7a1..eddb7a1 100644
--- a/game/src/Utility/GIT_INFO.gd
+++ b/game/src/GIT_INFO.gd
diff --git a/game/src/Autoload/Arguments/ArgumentOption.gd b/game/src/Game/Autoload/Argument/ArgumentOption.gd
index f14cef0..f14cef0 100644
--- a/game/src/Autoload/Arguments/ArgumentOption.gd
+++ b/game/src/Game/Autoload/Argument/ArgumentOption.gd
diff --git a/game/src/Autoload/Arguments/ArgumentParser.gd b/game/src/Game/Autoload/Argument/ArgumentParser.gd
index ce89dd8..ce89dd8 100644
--- a/game/src/Autoload/Arguments/ArgumentParser.gd
+++ b/game/src/Game/Autoload/Argument/ArgumentParser.gd
diff --git a/game/src/Autoload/Arguments/ArgumentParser.tscn b/game/src/Game/Autoload/Argument/ArgumentParser.tscn
index 8fda8f1..09e5e6c 100644
--- a/game/src/Autoload/Arguments/ArgumentParser.tscn
+++ b/game/src/Game/Autoload/Argument/ArgumentParser.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=6 format=3 uid="uid://dayjmgc34tqo6"]
 
-[ext_resource type="Script" path="res://src/Autoload/Arguments/ArgumentParser.gd" id="1_pc7xr"]
-[ext_resource type="Script" path="res://src/Autoload/Arguments/ArgumentOption.gd" id="2_4hguj"]
+[ext_resource type="Script" path="res://src/Game/Autoload/Argument/ArgumentParser.gd" id="1_pc7xr"]
+[ext_resource type="Script" path="res://src/Game/Autoload/Argument/ArgumentOption.gd" id="2_4hguj"]
 
 [sub_resource type="Resource" id="Resource_tq3y4"]
 script = ExtResource("2_4hguj")
diff --git a/game/src/Autoload/Events.gd b/game/src/Game/Autoload/Events.gd
index 4387cc7..4387cc7 100644
--- a/game/src/Autoload/Events.gd
+++ b/game/src/Game/Autoload/Events.gd
diff --git a/game/src/Autoload/Events/GameDebug.gd b/game/src/Game/Autoload/Events/GameDebug.gd
index df7a23a..df7a23a 100644
--- a/game/src/Autoload/Events/GameDebug.gd
+++ b/game/src/Game/Autoload/Events/GameDebug.gd
diff --git a/game/src/Autoload/Events/Localisation.gd b/game/src/Game/Autoload/Events/Localisation.gd
index eda7e51..eda7e51 100644
--- a/game/src/Autoload/Events/Localisation.gd
+++ b/game/src/Game/Autoload/Events/Localisation.gd
diff --git a/game/src/Autoload/Events/Options.gd b/game/src/Game/Autoload/Events/Options.gd
index fbeccef..fbeccef 100644
--- a/game/src/Autoload/Events/Options.gd
+++ b/game/src/Game/Autoload/Events/Options.gd
diff --git a/game/src/Autoload/Events/ShaderManager.gd b/game/src/Game/Autoload/Events/ShaderManager.gd
index a503c52..a503c52 100644
--- a/game/src/Autoload/Events/ShaderManager.gd
+++ b/game/src/Game/Autoload/Events/ShaderManager.gd
diff --git a/game/src/Autoload/GuiScale.gd b/game/src/Game/Autoload/GuiScale.gd
index afd73df..afd73df 100644
--- a/game/src/Autoload/GuiScale.gd
+++ b/game/src/Game/Autoload/GuiScale.gd
diff --git a/game/src/Autoload/Resolution.gd b/game/src/Game/Autoload/Resolution.gd
index c973ba9..c973ba9 100644
--- a/game/src/Autoload/Resolution.gd
+++ b/game/src/Game/Autoload/Resolution.gd
diff --git a/game/src/Autoload/SaveManager.gd b/game/src/Game/Autoload/SaveManager.gd
index fb7806b..fb7806b 100644
--- a/game/src/Autoload/SaveManager.gd
+++ b/game/src/Game/Autoload/SaveManager.gd
diff --git a/game/src/Autoload/SoundManager.gd b/game/src/Game/Autoload/SoundManager.gd
index c58ce1a..c58ce1a 100644
--- a/game/src/Autoload/SoundManager.gd
+++ b/game/src/Game/Autoload/SoundManager.gd
diff --git a/game/src/GameMenu.gd b/game/src/Game/GameMenu.gd
index 4b589f9..4b589f9 100644
--- a/game/src/GameMenu.gd
+++ b/game/src/Game/GameMenu.gd
diff --git a/game/src/GameMenu.tscn b/game/src/Game/GameMenu.tscn
index 224ae2e..73287a5 100644
--- a/game/src/GameMenu.tscn
+++ b/game/src/Game/GameMenu.tscn
@@ -1,11 +1,11 @@
 [gd_scene load_steps=7 format=3 uid="uid://o4u142w4qkln"]
 
-[ext_resource type="Script" path="res://src/GameMenu.gd" id="1_cafwe"]
-[ext_resource type="PackedScene" uid="uid://bp5n3mlu45ygw" path="res://src/MainMenu/MainMenu.tscn" id="2_2jbkh"]
-[ext_resource type="PackedScene" uid="uid://cnbfxjy1m6wja" path="res://src/OptionMenu/OptionsMenu.tscn" id="3_111lv"]
-[ext_resource type="PackedScene" uid="uid://c8knthxkwj1uj" path="res://src/CreditsMenu/CreditsMenu.tscn" id="4_n0hoo"]
-[ext_resource type="PackedScene" uid="uid://do60kx0d3nrh4" path="res://src/LobbyMenu/LobbyMenu.tscn" id="4_nofk1"]
-[ext_resource type="PackedScene" uid="uid://cvl76duuym1wq" path="res://src/MusicConductor/MusicPlayer.tscn" id="6_lts1m"]
+[ext_resource type="Script" path="res://src/Game/GameMenu.gd" id="1_cafwe"]
+[ext_resource type="PackedScene" uid="uid://bp5n3mlu45ygw" path="res://src/Game/Menu/MainMenu/MainMenu.tscn" id="2_2jbkh"]
+[ext_resource type="PackedScene" uid="uid://cnbfxjy1m6wja" path="res://src/Game/Menu/OptionMenu/OptionsMenu.tscn" id="3_111lv"]
+[ext_resource type="PackedScene" uid="uid://c8knthxkwj1uj" path="res://src/Game/Menu/CreditsMenu/CreditsMenu.tscn" id="4_n0hoo"]
+[ext_resource type="PackedScene" uid="uid://do60kx0d3nrh4" path="res://src/Game/Menu/LobbyMenu/LobbyMenu.tscn" id="4_nofk1"]
+[ext_resource type="PackedScene" uid="uid://cvl76duuym1wq" path="res://src/Game/MusicConductor/MusicPlayer.tscn" id="6_lts1m"]
 
 [node name="GameMenu" type="Control" node_paths=PackedStringArray("_main_menu", "_options_menu", "_lobby_menu", "_credits_menu")]
 layout_mode = 3
diff --git a/game/src/GameSession/GameSession.gd b/game/src/Game/GameSession/GameSession.gd
index 5bb1c2f..5bb1c2f 100644
--- a/game/src/GameSession/GameSession.gd
+++ b/game/src/Game/GameSession/GameSession.gd
diff --git a/game/src/GameSession/GameSession.tscn b/game/src/Game/GameSession/GameSession.tscn
index 188ccde..c9f4095 100644
--- a/game/src/GameSession/GameSession.tscn
+++ b/game/src/Game/GameSession/GameSession.tscn
@@ -1,14 +1,14 @@
 [gd_scene load_steps=10 format=3 uid="uid://bgnupcshe1m7r"]
 
-[ext_resource type="Script" path="res://src/GameSession/GameSession.gd" id="1_eklvp"]
-[ext_resource type="PackedScene" uid="uid://cvl76duuym1wq" path="res://src/MusicConductor/MusicPlayer.tscn" id="2_kt6aa"]
-[ext_resource type="PackedScene" uid="uid://g524p8lr574w" path="res://src/GameSession/MapControlPanel/MapControlPanel.tscn" id="3_afh6d"]
-[ext_resource type="PackedScene" uid="uid://dvdynl6eir40o" path="res://src/GameSession/GameSessionMenu.tscn" id="3_bvmqh"]
-[ext_resource type="PackedScene" uid="uid://dkehmdnuxih2r" path="res://src/GameSession/MapView.tscn" id="4_xkg5j"]
-[ext_resource type="PackedScene" uid="uid://byq323jbel48u" path="res://src/GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.tscn" id="5_osjnn"]
-[ext_resource type="PackedScene" uid="uid://cnbfxjy1m6wja" path="res://src/OptionMenu/OptionsMenu.tscn" id="6_p5mnx"]
-[ext_resource type="PackedScene" uid="uid://dd8k3p7r3huwc" path="res://src/GameSession/GameSpeedPanel.tscn" id="7_myy4q"]
-[ext_resource type="PackedScene" uid="uid://d3g6wbvwflmyk" path="res://src/SaveLoadMenu/SaveLoadMenu.tscn" id="8_4g7ko"]
+[ext_resource type="Script" path="res://src/Game/GameSession/GameSession.gd" id="1_eklvp"]
+[ext_resource type="PackedScene" uid="uid://cvl76duuym1wq" path="res://src/Game/MusicConductor/MusicPlayer.tscn" id="2_kt6aa"]
+[ext_resource type="PackedScene" uid="uid://g524p8lr574w" path="res://src/Game/GameSession/MapControlPanel/MapControlPanel.tscn" id="3_afh6d"]
+[ext_resource type="PackedScene" uid="uid://dvdynl6eir40o" path="res://src/Game/GameSession/GameSessionMenu.tscn" id="3_bvmqh"]
+[ext_resource type="PackedScene" uid="uid://dkehmdnuxih2r" path="res://src/Game/GameSession/MapView.tscn" id="4_xkg5j"]
+[ext_resource type="PackedScene" uid="uid://byq323jbel48u" path="res://src/Game/GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.tscn" id="5_osjnn"]
+[ext_resource type="PackedScene" uid="uid://cnbfxjy1m6wja" path="res://src/Game/Menu/OptionMenu/OptionsMenu.tscn" id="6_p5mnx"]
+[ext_resource type="PackedScene" uid="uid://dd8k3p7r3huwc" path="res://src/Game/GameSession/GameSpeedPanel.tscn" id="7_myy4q"]
+[ext_resource type="PackedScene" uid="uid://d3g6wbvwflmyk" path="res://src/Game/Menu/SaveLoadMenu/SaveLoadMenu.tscn" id="8_4g7ko"]
 
 [node name="GameSession" type="Control" node_paths=PackedStringArray("_game_session_menu")]
 editor_description = "SS-102, UI-546"
diff --git a/game/src/GameSession/GameSessionMenu.gd b/game/src/Game/GameSession/GameSessionMenu.gd
index 23ef2ef..23ef2ef 100644
--- a/game/src/GameSession/GameSessionMenu.gd
+++ b/game/src/Game/GameSession/GameSessionMenu.gd
diff --git a/game/src/GameSession/GameSessionMenu.tscn b/game/src/Game/GameSession/GameSessionMenu.tscn
index 025ef3b..196a5d8 100644
--- a/game/src/GameSession/GameSessionMenu.tscn
+++ b/game/src/Game/GameSession/GameSessionMenu.tscn
@@ -1,8 +1,8 @@
 [gd_scene load_steps=4 format=3 uid="uid://dvdynl6eir40o"]
 
 [ext_resource type="Theme" uid="uid://cqrfmjt5yeti7" path="res://theme/game_session_menu.tres" id="1_2onog"]
-[ext_resource type="Script" path="res://src/GameSession/GameSessionMenu.gd" id="1_usq6o"]
-[ext_resource type="PackedScene" uid="uid://o4u142w4qkln" path="res://src/GameMenu.tscn" id="2_xi6a4"]
+[ext_resource type="Script" path="res://src/Game/GameSession/GameSessionMenu.gd" id="1_usq6o"]
+[ext_resource type="PackedScene" uid="uid://o4u142w4qkln" path="res://src/Game/GameMenu.tscn" id="2_xi6a4"]
 
 [node name="GameSessionMenu" type="PanelContainer" node_paths=PackedStringArray("_main_menu_dialog", "_quit_dialog")]
 process_mode = 3
diff --git a/game/src/GameSession/GameSpeedPanel.gd b/game/src/Game/GameSession/GameSpeedPanel.gd
index 80708b1..80708b1 100644
--- a/game/src/GameSession/GameSpeedPanel.gd
+++ b/game/src/Game/GameSession/GameSpeedPanel.gd
diff --git a/game/src/GameSession/GameSpeedPanel.tscn b/game/src/Game/GameSession/GameSpeedPanel.tscn
index 8a37565..fab988e 100644
--- a/game/src/GameSession/GameSpeedPanel.tscn
+++ b/game/src/Game/GameSession/GameSpeedPanel.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://dd8k3p7r3huwc"]
 
-[ext_resource type="Script" path="res://src/GameSession/GameSpeedPanel.gd" id="1_pfs8t"]
+[ext_resource type="Script" path="res://src/Game/GameSession/GameSpeedPanel.gd" id="1_pfs8t"]
 
 [node name="GameSpeedPanel" type="PanelContainer" node_paths=PackedStringArray("_longform_date_button", "_play_pause_display_button", "_decrease_speed_button", "_increase_speed_button")]
 script = ExtResource("1_pfs8t")
diff --git a/game/src/GameSession/MapControlPanel/MapControlPanel.gd b/game/src/Game/GameSession/MapControlPanel/MapControlPanel.gd
index 0cef057..0cef057 100644
--- a/game/src/GameSession/MapControlPanel/MapControlPanel.gd
+++ b/game/src/Game/GameSession/MapControlPanel/MapControlPanel.gd
diff --git a/game/src/GameSession/MapControlPanel/MapControlPanel.tscn b/game/src/Game/GameSession/MapControlPanel/MapControlPanel.tscn
index bd4a010..a00f110 100644
--- a/game/src/GameSession/MapControlPanel/MapControlPanel.tscn
+++ b/game/src/Game/GameSession/MapControlPanel/MapControlPanel.tscn
@@ -1,8 +1,8 @@
 [gd_scene load_steps=7 format=3 uid="uid://g524p8lr574w"]
 
-[ext_resource type="Script" path="res://src/GameSession/MapControlPanel/MapControlPanel.gd" id="1_ign64"]
-[ext_resource type="Shader" path="res://src/GameSession/MapControlPanel/Minimap.gdshader" id="2_rinsg"]
-[ext_resource type="Script" path="res://src/GameSession/MapControlPanel/Minimap.gd" id="3_s4dml"]
+[ext_resource type="Script" path="res://src/Game/GameSession/MapControlPanel/MapControlPanel.gd" id="1_ign64"]
+[ext_resource type="Shader" path="res://src/Game/GameSession/MapControlPanel/Minimap.gdshader" id="2_rinsg"]
+[ext_resource type="Script" path="res://src/Game/GameSession/MapControlPanel/Minimap.gd" id="3_s4dml"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_bhuqb"]
 shader = ExtResource("2_rinsg")
diff --git a/game/src/GameSession/MapControlPanel/Minimap.gd b/game/src/Game/GameSession/MapControlPanel/Minimap.gd
index 1f9b75e..1f9b75e 100644
--- a/game/src/GameSession/MapControlPanel/Minimap.gd
+++ b/game/src/Game/GameSession/MapControlPanel/Minimap.gd
diff --git a/game/src/GameSession/MapControlPanel/Minimap.gdshader b/game/src/Game/GameSession/MapControlPanel/Minimap.gdshader
index 608abe2..271b809 100644
--- a/game/src/GameSession/MapControlPanel/Minimap.gdshader
+++ b/game/src/Game/GameSession/MapControlPanel/Minimap.gdshader
@@ -1,6 +1,6 @@
 shader_type canvas_item;
 
-#include "res://src/GameSession/ProvinceIndexSampler.gdshaderinc"
+#include "res://src/Game/GameSession/ProvinceIndexSampler.gdshaderinc"
 
 // Index of the currently selected province
 uniform uint selected_index;
diff --git a/game/src/GameSession/MapView.gd b/game/src/Game/GameSession/MapView.gd
index ced8bb7..ced8bb7 100644
--- a/game/src/GameSession/MapView.gd
+++ b/game/src/Game/GameSession/MapView.gd
diff --git a/game/src/GameSession/MapView.tscn b/game/src/Game/GameSession/MapView.tscn
index fa6ffcd..fb4ac07 100644
--- a/game/src/GameSession/MapView.tscn
+++ b/game/src/Game/GameSession/MapView.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=5 format=3 uid="uid://dkehmdnuxih2r"]
 
-[ext_resource type="Script" path="res://src/GameSession/MapView.gd" id="1_exccw"]
-[ext_resource type="Shader" path="res://src/GameSession/TerrainMap.gdshader" id="1_upocn"]
+[ext_resource type="Script" path="res://src/Game/GameSession/MapView.gd" id="1_exccw"]
+[ext_resource type="Shader" path="res://src/Game/GameSession/TerrainMap.gdshader" id="1_upocn"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_tayeg"]
 render_priority = 0
diff --git a/game/src/GameSession/ProvinceIndexSampler.gdshaderinc b/game/src/Game/GameSession/ProvinceIndexSampler.gdshaderinc
index 65f73d8..65f73d8 100644
--- a/game/src/GameSession/ProvinceIndexSampler.gdshaderinc
+++ b/game/src/Game/GameSession/ProvinceIndexSampler.gdshaderinc
diff --git a/game/src/GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.gd b/game/src/Game/GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.gd
index 67060bf..67060bf 100644
--- a/game/src/GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.gd
+++ b/game/src/Game/GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.gd
diff --git a/game/src/GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.tscn b/game/src/Game/GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.tscn
index a233db0..f8c1e65 100644
--- a/game/src/GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.tscn
+++ b/game/src/Game/GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://byq323jbel48u"]
 
-[ext_resource type="Script" path="res://src/GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.gd" id="1_3n8k5"]
+[ext_resource type="Script" path="res://src/Game/GameSession/ProvinceOverviewPanel/ProvinceOverviewPanel.gd" id="1_3n8k5"]
 
 [node name="ProvinceOverviewPanel" type="PanelContainer" node_paths=PackedStringArray("_province_name_label", "_region_name_label", "_life_rating_bar", "_rgo_icon_texture_rect", "_rgo_name_label", "_buildings_container")]
 editor_description = "UI-56"
diff --git a/game/src/GameSession/TerrainMap.gdshader b/game/src/Game/GameSession/TerrainMap.gdshader
index 88e7019..852ccc3 100644
--- a/game/src/GameSession/TerrainMap.gdshader
+++ b/game/src/Game/GameSession/TerrainMap.gdshader
@@ -2,7 +2,7 @@ shader_type spatial;
 
 render_mode unshaded;
 
-#include "res://src/GameSession/ProvinceIndexSampler.gdshaderinc"
+#include "res://src/Game/GameSession/ProvinceIndexSampler.gdshaderinc"
 
 // Province colour texture
 uniform sampler2D province_colour_tex: source_color, repeat_enable, filter_nearest;
diff --git a/game/src/GameStart.tscn b/game/src/Game/GameStart.tscn
index 2046bb5..dd683e8 100644
--- a/game/src/GameStart.tscn
+++ b/game/src/Game/GameStart.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=6 format=3 uid="uid://1udsn4mggep2"]
 
-[ext_resource type="PackedScene" uid="uid://o4u142w4qkln" path="res://src/GameMenu.tscn" id="1_wlojq"]
-[ext_resource type="Script" path="res://src/SplashContainer.gd" id="2_xmcgv"]
+[ext_resource type="PackedScene" uid="uid://o4u142w4qkln" path="res://src/Game/GameMenu.tscn" id="1_vadki"]
+[ext_resource type="Script" path="res://src/Game/SplashContainer.gd" id="2_xmcgv"]
 [ext_resource type="Texture2D" uid="uid://deef5hufq0j61" path="res://splash_assets/splash_end.png" id="3_qfv12"]
 [ext_resource type="Texture2D" uid="uid://cgdnixsyh7bja" path="res://splash_assets/splash_image.png" id="4_5b6yq"]
 [ext_resource type="VideoStream" path="res://splash_assets/splash_startup.ogv" id="5_8euyy"]
@@ -14,7 +14,7 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 
-[node name="GameMenu" parent="." instance=ExtResource("1_wlojq")]
+[node name="GameMenu" parent="." instance=ExtResource("1_vadki")]
 visible = false
 layout_mode = 1
 
diff --git a/game/src/LocaleButton.gd b/game/src/Game/LocaleButton.gd
index 2b717a4..2b717a4 100644
--- a/game/src/LocaleButton.gd
+++ b/game/src/Game/LocaleButton.gd
diff --git a/game/src/LocaleButton.tscn b/game/src/Game/LocaleButton.tscn
index 55f1c29..c4b58f8 100644
--- a/game/src/LocaleButton.tscn
+++ b/game/src/Game/LocaleButton.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://b7oncobnacxmt"]
 
-[ext_resource type="Script" path="res://src/LocaleButton.gd" id="1_ganev"]
+[ext_resource type="Script" path="res://src/Game/LocaleButton.gd" id="1_ganev"]
 
 [node name="LocaleButton" type="OptionButton"]
 custom_minimum_size = Vector2(150, 0)
diff --git a/game/src/CreditsMenu/CreditsMenu.gd b/game/src/Game/Menu/CreditsMenu/CreditsMenu.gd
index 0db4d7d..0db4d7d 100644
--- a/game/src/CreditsMenu/CreditsMenu.gd
+++ b/game/src/Game/Menu/CreditsMenu/CreditsMenu.gd
diff --git a/game/src/CreditsMenu/CreditsMenu.tscn b/game/src/Game/Menu/CreditsMenu/CreditsMenu.tscn
index 2d10d2e..df9d0b2 100644
--- a/game/src/CreditsMenu/CreditsMenu.tscn
+++ b/game/src/Game/Menu/CreditsMenu/CreditsMenu.tscn
@@ -1,8 +1,8 @@
 [gd_scene load_steps=4 format=3 uid="uid://c8knthxkwj1uj"]
 
 [ext_resource type="Theme" uid="uid://stfxt4hpsify" path="res://theme/credits_menu.tres" id="1_7y4l8"]
-[ext_resource type="Script" path="res://src/CreditsMenu/CreditsMenu.gd" id="1_csd7i"]
-[ext_resource type="PackedScene" uid="uid://ddjbee5gj6bkv" path="res://src/CreditsMenu/GodotEngineButton.tscn" id="3_fl02a"]
+[ext_resource type="Script" path="res://src/Game/Menu/CreditsMenu/CreditsMenu.gd" id="1_csd7i"]
+[ext_resource type="PackedScene" uid="uid://ddjbee5gj6bkv" path="res://src/Game/Menu/CreditsMenu/GodotEngineButton.tscn" id="3_fl02a"]
 
 [node name="CreditsMenu" type="Control" node_paths=PackedStringArray("credits_list")]
 editor_description = "UI-34"
diff --git a/game/src/CreditsMenu/GodotEngineButton.gd b/game/src/Game/Menu/CreditsMenu/GodotEngineButton.gd
index ca3a958..ca3a958 100644
--- a/game/src/CreditsMenu/GodotEngineButton.gd
+++ b/game/src/Game/Menu/CreditsMenu/GodotEngineButton.gd
diff --git a/game/src/CreditsMenu/GodotEngineButton.tscn b/game/src/Game/Menu/CreditsMenu/GodotEngineButton.tscn
index 8b0c46b..c613553 100644
--- a/game/src/CreditsMenu/GodotEngineButton.tscn
+++ b/game/src/Game/Menu/CreditsMenu/GodotEngineButton.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=3 uid="uid://ddjbee5gj6bkv"]
 
-[ext_resource type="Texture2D" uid="uid://rh7l4xuh4ali" path="res://src/CreditsMenu/logo_vertical_color_dark.svg" id="1_b0brk"]
-[ext_resource type="Script" path="res://src/CreditsMenu/GodotEngineButton.gd" id="3_gi8fv"]
+[ext_resource type="Texture2D" uid="uid://rh7l4xuh4ali" path="res://src/Game/Menu/CreditsMenu/logo_vertical_color_dark.svg" id="1_b0brk"]
+[ext_resource type="Script" path="res://src/Game/Menu/CreditsMenu/GodotEngineButton.gd" id="3_gi8fv"]
 
 [node name="GodotEngineButton" type="Button"]
 custom_minimum_size = Vector2(0, 200)
diff --git a/game/src/CreditsMenu/logo_vertical_color_dark.svg b/game/src/Game/Menu/CreditsMenu/logo_vertical_color_dark.svg
index 00e50cd..00e50cd 100644
--- a/game/src/CreditsMenu/logo_vertical_color_dark.svg
+++ b/game/src/Game/Menu/CreditsMenu/logo_vertical_color_dark.svg
diff --git a/game/src/CreditsMenu/logo_vertical_color_dark.svg.import b/game/src/Game/Menu/CreditsMenu/logo_vertical_color_dark.svg.import
index a4fb09a..10681d4 100644
--- a/game/src/CreditsMenu/logo_vertical_color_dark.svg.import
+++ b/game/src/Game/Menu/CreditsMenu/logo_vertical_color_dark.svg.import
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://rh7l4xuh4ali"
-path="res://.godot/imported/logo_vertical_color_dark.svg-1167b3ce62f0747c0e76b17bdbb9f218.ctex"
+path="res://.godot/imported/logo_vertical_color_dark.svg-c63a0d0871169a4a2f8b57a5b904d732.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://src/CreditsMenu/logo_vertical_color_dark.svg"
-dest_files=["res://.godot/imported/logo_vertical_color_dark.svg-1167b3ce62f0747c0e76b17bdbb9f218.ctex"]
+source_file="res://src/Game/Menu/CreditsMenu/logo_vertical_color_dark.svg"
+dest_files=["res://.godot/imported/logo_vertical_color_dark.svg-c63a0d0871169a4a2f8b57a5b904d732.ctex"]
 
 [params]
 
diff --git a/game/src/LobbyMenu/LobbyMenu.gd b/game/src/Game/Menu/LobbyMenu/LobbyMenu.gd
index db4f2ce..3c857fe 100644
--- a/game/src/LobbyMenu/LobbyMenu.gd
+++ b/game/src/Game/Menu/LobbyMenu/LobbyMenu.gd
@@ -116,7 +116,7 @@ func _on_session_tag_edit_text_submitted(new_text):
 	_on_start_button_pressed()
 
 func _on_session_tag_dialog_confirmed():
-	get_tree().change_scene_to_file("res://src/GameSession/GameSession.tscn")
+	get_tree().change_scene_to_file("res://src/Game/GameSession/GameSession.tscn")
 
 var _requested_node_to_delete : Control
 func _on_save_node_delete_requested(node : Control) -> void:
diff --git a/game/src/LobbyMenu/LobbyMenu.tscn b/game/src/Game/Menu/LobbyMenu/LobbyMenu.tscn
index 3b5796e..081beda 100644
--- a/game/src/LobbyMenu/LobbyMenu.tscn
+++ b/game/src/Game/Menu/LobbyMenu/LobbyMenu.tscn
@@ -1,8 +1,8 @@
 [gd_scene load_steps=4 format=3 uid="uid://do60kx0d3nrh4"]
 
-[ext_resource type="Script" path="res://src/LobbyMenu/LobbyMenu.gd" id="1_cvwum"]
-[ext_resource type="PackedScene" uid="uid://k71f5gibwmtc" path="res://src/LobbyMenu/LobbyPanelButton.tscn" id="2_exh17"]
-[ext_resource type="PackedScene" uid="uid://d2s7roinx2or7" path="res://src/SaveLoadMenu/SavePanelButton.tscn" id="3_4otj7"]
+[ext_resource type="Script" path="res://src/Game/Menu/LobbyMenu/LobbyMenu.gd" id="1_cvwum"]
+[ext_resource type="PackedScene" uid="uid://k71f5gibwmtc" path="res://src/Game/Menu/LobbyMenu/LobbyPanelButton.tscn" id="2_exh17"]
+[ext_resource type="PackedScene" uid="uid://d2s7roinx2or7" path="res://src/Game/Menu/SaveLoadMenu/SavePanelButton.tscn" id="3_4otj7"]
 
 [node name="LobbyMenu" type="HBoxContainer" node_paths=PackedStringArray("game_select_start_date", "game_select_save_tab", "game_select_save_list", "start_button", "session_tag_line_edit", "session_tag_dialog", "delete_dialog")]
 editor_description = "UI-36"
diff --git a/game/src/LobbyMenu/LobbyPanelButton.gd b/game/src/Game/Menu/LobbyMenu/LobbyPanelButton.gd
index 5f3ea46..5f3ea46 100644
--- a/game/src/LobbyMenu/LobbyPanelButton.gd
+++ b/game/src/Game/Menu/LobbyMenu/LobbyPanelButton.gd
diff --git a/game/src/LobbyMenu/LobbyPanelButton.tscn b/game/src/Game/Menu/LobbyMenu/LobbyPanelButton.tscn
index f409a2e..f27ddac 100644
--- a/game/src/LobbyMenu/LobbyPanelButton.tscn
+++ b/game/src/Game/Menu/LobbyMenu/LobbyPanelButton.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://k71f5gibwmtc"]
 
-[ext_resource type="Script" path="res://src/LobbyMenu/LobbyPanelButton.gd" id="1_327u2"]
+[ext_resource type="Script" path="res://src/Game/Menu/LobbyMenu/LobbyPanelButton.gd" id="1_327u2"]
 
 [node name="LobbyPanelButton" type="Container" node_paths=PackedStringArray("background_button", "name_label")]
 editor_description = "UI-41"
diff --git a/game/src/MainMenu/MainMenu.gd b/game/src/Game/Menu/MainMenu/MainMenu.gd
index 9d0edc6..9d0edc6 100644
--- a/game/src/MainMenu/MainMenu.gd
+++ b/game/src/Game/Menu/MainMenu/MainMenu.gd
diff --git a/game/src/MainMenu/MainMenu.tscn b/game/src/Game/Menu/MainMenu/MainMenu.tscn
index 0618fe8..71d020a 100644
--- a/game/src/MainMenu/MainMenu.tscn
+++ b/game/src/Game/Menu/MainMenu/MainMenu.tscn
@@ -1,10 +1,10 @@
 [gd_scene load_steps=6 format=3 uid="uid://bp5n3mlu45ygw"]
 
 [ext_resource type="Theme" uid="uid://qoi3oec48jp0" path="res://theme/main_menu.tres" id="1_1yri4"]
-[ext_resource type="Script" path="res://src/MainMenu/MainMenu.gd" id="2_nm1fq"]
+[ext_resource type="Script" path="res://src/Game/Menu/MainMenu/MainMenu.gd" id="2_nm1fq"]
 [ext_resource type="Texture2D" uid="uid://dxys0wg0f0ic5" path="res://theme/assets/OpenVicFINALREALTRANS.png" id="3_58ess"]
-[ext_resource type="PackedScene" uid="uid://b7oncobnacxmt" path="res://src/LocaleButton.tscn" id="3_amonp"]
-[ext_resource type="PackedScene" uid="uid://cen7wkmn6og66" path="res://src/MainMenu/ReleaseInfoBox.tscn" id="3_km0er"]
+[ext_resource type="PackedScene" uid="uid://b7oncobnacxmt" path="res://src/Game/LocaleButton.tscn" id="3_amonp"]
+[ext_resource type="PackedScene" uid="uid://cen7wkmn6og66" path="res://src/Game/Menu/MainMenu/ReleaseInfoBox.tscn" id="3_km0er"]
 
 [node name="MainMenu" type="Control" node_paths=PackedStringArray("_new_game_button")]
 editor_description = "UI-13"
diff --git a/game/src/MainMenu/ReleaseInfoBox.gd b/game/src/Game/Menu/MainMenu/ReleaseInfoBox.gd
index e363162..e363162 100644
--- a/game/src/MainMenu/ReleaseInfoBox.gd
+++ b/game/src/Game/Menu/MainMenu/ReleaseInfoBox.gd
diff --git a/game/src/MainMenu/ReleaseInfoBox.tscn b/game/src/Game/Menu/MainMenu/ReleaseInfoBox.tscn
index 821982b..a10232e 100644
--- a/game/src/MainMenu/ReleaseInfoBox.tscn
+++ b/game/src/Game/Menu/MainMenu/ReleaseInfoBox.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://cen7wkmn6og66"]
 
-[ext_resource type="Script" path="res://src/MainMenu/ReleaseInfoBox.gd" id="1_y2djw"]
+[ext_resource type="Script" path="res://src/Game/Menu/MainMenu/ReleaseInfoBox.gd" id="1_y2djw"]
 
 [node name="ReleaseInfoBox" type="HBoxContainer" node_paths=PackedStringArray("_version_label", "_commit_label", "_checksum_label")]
 editor_description = "UI-31"
diff --git a/game/src/OptionMenu/AutosaveIntervalSelector.gd b/game/src/Game/Menu/OptionMenu/AutosaveIntervalSelector.gd
index 2c55862..2c55862 100644
--- a/game/src/OptionMenu/AutosaveIntervalSelector.gd
+++ b/game/src/Game/Menu/OptionMenu/AutosaveIntervalSelector.gd
diff --git a/game/src/OptionMenu/ControlsTab.tscn b/game/src/Game/Menu/OptionMenu/ControlsTab.tscn
index b84dc85..b84dc85 100644
--- a/game/src/OptionMenu/ControlsTab.tscn
+++ b/game/src/Game/Menu/OptionMenu/ControlsTab.tscn
diff --git a/game/src/OptionMenu/GeneralTab.gd b/game/src/Game/Menu/OptionMenu/GeneralTab.gd
index 3d98678..3d98678 100644
--- a/game/src/OptionMenu/GeneralTab.gd
+++ b/game/src/Game/Menu/OptionMenu/GeneralTab.gd
diff --git a/game/src/OptionMenu/GeneralTab.tscn b/game/src/Game/Menu/OptionMenu/GeneralTab.tscn
index 4e9ff6a..1c49326 100644
--- a/game/src/OptionMenu/GeneralTab.tscn
+++ b/game/src/Game/Menu/OptionMenu/GeneralTab.tscn
@@ -1,9 +1,9 @@
 [gd_scene load_steps=5 format=3 uid="uid://duwjal7sd7p6w"]
 
-[ext_resource type="Script" path="res://src/OptionMenu/GeneralTab.gd" id="1_gbutn"]
-[ext_resource type="PackedScene" uid="uid://b7oncobnacxmt" path="res://src/LocaleButton.tscn" id="2_5cfd7"]
-[ext_resource type="Script" path="res://src/OptionMenu/SettingNodes/SettingOptionButton.gd" id="2_msx2u"]
-[ext_resource type="Script" path="res://src/OptionMenu/AutosaveIntervalSelector.gd" id="2_t06tb"]
+[ext_resource type="Script" path="res://src/Game/Menu/OptionMenu/GeneralTab.gd" id="1_gbutn"]
+[ext_resource type="PackedScene" uid="uid://b7oncobnacxmt" path="res://src/Game/LocaleButton.tscn" id="2_5cfd7"]
+[ext_resource type="Script" path="res://src/Game/Menu/OptionMenu/SettingNodes/SettingOptionButton.gd" id="2_msx2u"]
+[ext_resource type="Script" path="res://src/Game/Menu/OptionMenu/AutosaveIntervalSelector.gd" id="2_t06tb"]
 
 [node name="GeneralTab" type="HBoxContainer" node_paths=PackedStringArray("initial_focus")]
 editor_description = "UI-48, UIFUN-45"
diff --git a/game/src/OptionMenu/GuiScaleSelector.gd b/game/src/Game/Menu/OptionMenu/GuiScaleSelector.gd
index 4dd86e1..4dd86e1 100644
--- a/game/src/OptionMenu/GuiScaleSelector.gd
+++ b/game/src/Game/Menu/OptionMenu/GuiScaleSelector.gd
diff --git a/game/src/OptionMenu/MonitorDisplaySelector.gd b/game/src/Game/Menu/OptionMenu/MonitorDisplaySelector.gd
index 7de033a..7de033a 100644
--- a/game/src/OptionMenu/MonitorDisplaySelector.gd
+++ b/game/src/Game/Menu/OptionMenu/MonitorDisplaySelector.gd
diff --git a/game/src/OptionMenu/OptionsMenu.gd b/game/src/Game/Menu/OptionMenu/OptionsMenu.gd
index 5f6a088..5f6a088 100644
--- a/game/src/OptionMenu/OptionsMenu.gd
+++ b/game/src/Game/Menu/OptionMenu/OptionsMenu.gd
diff --git a/game/src/OptionMenu/OptionsMenu.tscn b/game/src/Game/Menu/OptionMenu/OptionsMenu.tscn
index 3156e33..017629a 100644
--- a/game/src/OptionMenu/OptionsMenu.tscn
+++ b/game/src/Game/Menu/OptionMenu/OptionsMenu.tscn
@@ -1,12 +1,12 @@
 [gd_scene load_steps=8 format=3 uid="uid://cnbfxjy1m6wja"]
 
 [ext_resource type="Theme" uid="uid://fbxssqcg1s0m" path="res://theme/options_menu.tres" id="1_0up1d"]
-[ext_resource type="Script" path="res://src/OptionMenu/OptionsMenu.gd" id="1_tlein"]
-[ext_resource type="PackedScene" uid="uid://bq3awxxjn1tuw" path="res://src/OptionMenu/VideoTab.tscn" id="2_ji8xr"]
-[ext_resource type="PackedScene" uid="uid://cbtgwpx2wxi33" path="res://src/OptionMenu/SoundTab.tscn" id="3_4w35t"]
-[ext_resource type="PackedScene" uid="uid://duwjal7sd7p6w" path="res://src/OptionMenu/GeneralTab.tscn" id="3_6gvf6"]
+[ext_resource type="Script" path="res://src/Game/Menu/OptionMenu/OptionsMenu.gd" id="1_tlein"]
+[ext_resource type="PackedScene" uid="uid://bq3awxxjn1tuw" path="res://src/Game/Menu/OptionMenu/VideoTab.tscn" id="2_ji8xr"]
+[ext_resource type="PackedScene" uid="uid://cbtgwpx2wxi33" path="res://src/Game/Menu/OptionMenu/SoundTab.tscn" id="3_4w35t"]
+[ext_resource type="PackedScene" uid="uid://duwjal7sd7p6w" path="res://src/Game/Menu/OptionMenu/GeneralTab.tscn" id="3_6gvf6"]
 [ext_resource type="PackedScene" uid="uid://bq7ibhm0txl5p" path="res://addons/keychain/ShortcutEdit.tscn" id="4_vdhjp"]
-[ext_resource type="PackedScene" uid="uid://dp2grvybtecqu" path="res://src/OptionMenu/OtherTab.tscn" id="5_ahefp"]
+[ext_resource type="PackedScene" uid="uid://dp2grvybtecqu" path="res://src/Game/Menu/OptionMenu/OtherTab.tscn" id="5_ahefp"]
 
 [node name="OptionsMenu" type="PanelContainer"]
 editor_description = "UI-25"
diff --git a/game/src/OptionMenu/OtherTab.tscn b/game/src/Game/Menu/OptionMenu/OtherTab.tscn
index 0ffc92d..0ffc92d 100644
--- a/game/src/OptionMenu/OtherTab.tscn
+++ b/game/src/Game/Menu/OptionMenu/OtherTab.tscn
diff --git a/game/src/OptionMenu/QualityPresetSelector.gd b/game/src/Game/Menu/OptionMenu/QualityPresetSelector.gd
index 57ba4ab..57ba4ab 100644
--- a/game/src/OptionMenu/QualityPresetSelector.gd
+++ b/game/src/Game/Menu/OptionMenu/QualityPresetSelector.gd
diff --git a/game/src/OptionMenu/RefreshRateSelector.gd b/game/src/Game/Menu/OptionMenu/RefreshRateSelector.gd
index 31b115b..31b115b 100644
--- a/game/src/OptionMenu/RefreshRateSelector.gd
+++ b/game/src/Game/Menu/OptionMenu/RefreshRateSelector.gd
diff --git a/game/src/OptionMenu/ResolutionRevertDialog.gd b/game/src/Game/Menu/OptionMenu/ResolutionRevertDialog.gd
index 4d2b8f2..4d2b8f2 100644
--- a/game/src/OptionMenu/ResolutionRevertDialog.gd
+++ b/game/src/Game/Menu/OptionMenu/ResolutionRevertDialog.gd
diff --git a/game/src/OptionMenu/ResolutionSelector.gd b/game/src/Game/Menu/OptionMenu/ResolutionSelector.gd
index ebdf718..ebdf718 100644
--- a/game/src/OptionMenu/ResolutionSelector.gd
+++ b/game/src/Game/Menu/OptionMenu/ResolutionSelector.gd
diff --git a/game/src/OptionMenu/ScreenModeSelector.gd b/game/src/Game/Menu/OptionMenu/ScreenModeSelector.gd
index af95901..af95901 100644
--- a/game/src/OptionMenu/ScreenModeSelector.gd
+++ b/game/src/Game/Menu/OptionMenu/ScreenModeSelector.gd
diff --git a/game/src/OptionMenu/SettingNodes/SettingHSlider.gd b/game/src/Game/Menu/OptionMenu/SettingNodes/SettingHSlider.gd
index 6fa30ed..6fa30ed 100644
--- a/game/src/OptionMenu/SettingNodes/SettingHSlider.gd
+++ b/game/src/Game/Menu/OptionMenu/SettingNodes/SettingHSlider.gd
diff --git a/game/src/OptionMenu/SettingNodes/SettingOptionButton.gd b/game/src/Game/Menu/OptionMenu/SettingNodes/SettingOptionButton.gd
index c5a805e..c5a805e 100644
--- a/game/src/OptionMenu/SettingNodes/SettingOptionButton.gd
+++ b/game/src/Game/Menu/OptionMenu/SettingNodes/SettingOptionButton.gd
diff --git a/game/src/OptionMenu/SettingNodes/SettingRevertButton.gd b/game/src/Game/Menu/OptionMenu/SettingNodes/SettingRevertButton.gd
index 945d35b..945d35b 100644
--- a/game/src/OptionMenu/SettingNodes/SettingRevertButton.gd
+++ b/game/src/Game/Menu/OptionMenu/SettingNodes/SettingRevertButton.gd
diff --git a/game/src/OptionMenu/SoundTab.gd b/game/src/Game/Menu/OptionMenu/SoundTab.gd
index c707605..c707605 100644
--- a/game/src/OptionMenu/SoundTab.gd
+++ b/game/src/Game/Menu/OptionMenu/SoundTab.gd
diff --git a/game/src/OptionMenu/SoundTab.tscn b/game/src/Game/Menu/OptionMenu/SoundTab.tscn
index 10d7f10..4bb6948 100644
--- a/game/src/OptionMenu/SoundTab.tscn
+++ b/game/src/Game/Menu/OptionMenu/SoundTab.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=3 uid="uid://cbtgwpx2wxi33"]
 
-[ext_resource type="Script" path="res://src/OptionMenu/SoundTab.gd" id="1_a7k0s"]
-[ext_resource type="PackedScene" uid="uid://dy4si8comamnv" path="res://src/OptionMenu/VolumeGrid.tscn" id="1_okpft"]
+[ext_resource type="Script" path="res://src/Game/Menu/OptionMenu/SoundTab.gd" id="1_a7k0s"]
+[ext_resource type="PackedScene" uid="uid://dy4si8comamnv" path="res://src/Game/Menu/OptionMenu/VolumeGrid.tscn" id="1_okpft"]
 
 [node name="Sound" type="HBoxContainer"]
 alignment = 1
diff --git a/game/src/OptionMenu/VideoTab.gd b/game/src/Game/Menu/OptionMenu/VideoTab.gd
index 3d98678..3d98678 100644
--- a/game/src/OptionMenu/VideoTab.gd
+++ b/game/src/Game/Menu/OptionMenu/VideoTab.gd
diff --git a/game/src/OptionMenu/VideoTab.tscn b/game/src/Game/Menu/OptionMenu/VideoTab.tscn
index 244f481..4f5151c 100644
--- a/game/src/OptionMenu/VideoTab.tscn
+++ b/game/src/Game/Menu/OptionMenu/VideoTab.tscn
@@ -1,13 +1,13 @@
 [gd_scene load_steps=9 format=3 uid="uid://bq3awxxjn1tuw"]
 
-[ext_resource type="Script" path="res://src/OptionMenu/ResolutionSelector.gd" id="1_i8nro"]
-[ext_resource type="Script" path="res://src/OptionMenu/VideoTab.gd" id="1_jvv62"]
-[ext_resource type="Script" path="res://src/OptionMenu/ScreenModeSelector.gd" id="2_wa7vw"]
-[ext_resource type="Script" path="res://src/OptionMenu/GuiScaleSelector.gd" id="3_pgc5d"]
-[ext_resource type="Script" path="res://src/OptionMenu/MonitorDisplaySelector.gd" id="3_y6lyb"]
-[ext_resource type="Script" path="res://src/OptionMenu/RefreshRateSelector.gd" id="4_381mg"]
-[ext_resource type="Script" path="res://src/OptionMenu/QualityPresetSelector.gd" id="5_srg4v"]
-[ext_resource type="Script" path="res://src/OptionMenu/ResolutionRevertDialog.gd" id="8_802cr"]
+[ext_resource type="Script" path="res://src/Game/Menu/OptionMenu/ResolutionSelector.gd" id="1_i8nro"]
+[ext_resource type="Script" path="res://src/Game/Menu/OptionMenu/VideoTab.gd" id="1_jvv62"]
+[ext_resource type="Script" path="res://src/Game/Menu/OptionMenu/ScreenModeSelector.gd" id="2_wa7vw"]
+[ext_resource type="Script" path="res://src/Game/Menu/OptionMenu/GuiScaleSelector.gd" id="3_pgc5d"]
+[ext_resource type="Script" path="res://src/Game/Menu/OptionMenu/MonitorDisplaySelector.gd" id="3_y6lyb"]
+[ext_resource type="Script" path="res://src/Game/Menu/OptionMenu/RefreshRateSelector.gd" id="4_381mg"]
+[ext_resource type="Script" path="res://src/Game/Menu/OptionMenu/QualityPresetSelector.gd" id="5_srg4v"]
+[ext_resource type="Script" path="res://src/Game/Menu/OptionMenu/ResolutionRevertDialog.gd" id="8_802cr"]
 
 [node name="Video" type="HBoxContainer" node_paths=PackedStringArray("initial_focus")]
 editor_description = "UI-46"
diff --git a/game/src/OptionMenu/VolumeGrid.gd b/game/src/Game/Menu/OptionMenu/VolumeGrid.gd
index 46613b4..46613b4 100644
--- a/game/src/OptionMenu/VolumeGrid.gd
+++ b/game/src/Game/Menu/OptionMenu/VolumeGrid.gd
diff --git a/game/src/OptionMenu/VolumeGrid.tscn b/game/src/Game/Menu/OptionMenu/VolumeGrid.tscn
index 6d4de3c..5dd3c1e 100644
--- a/game/src/OptionMenu/VolumeGrid.tscn
+++ b/game/src/Game/Menu/OptionMenu/VolumeGrid.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://dy4si8comamnv"]
 
-[ext_resource type="Script" path="res://src/OptionMenu/VolumeGrid.gd" id="1_wb64h"]
+[ext_resource type="Script" path="res://src/Game/Menu/OptionMenu/VolumeGrid.gd" id="1_wb64h"]
 
 [node name="VolumeGrid" type="GridContainer"]
 size_flags_vertical = 0
diff --git a/game/src/SaveLoadMenu/SaveLoadMenu.gd b/game/src/Game/Menu/SaveLoadMenu/SaveLoadMenu.gd
index bff0bb5..bff0bb5 100644
--- a/game/src/SaveLoadMenu/SaveLoadMenu.gd
+++ b/game/src/Game/Menu/SaveLoadMenu/SaveLoadMenu.gd
diff --git a/game/src/SaveLoadMenu/SaveLoadMenu.tscn b/game/src/Game/Menu/SaveLoadMenu/SaveLoadMenu.tscn
index e9f068e..adc9bdc 100644
--- a/game/src/SaveLoadMenu/SaveLoadMenu.tscn
+++ b/game/src/Game/Menu/SaveLoadMenu/SaveLoadMenu.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=5 format=3 uid="uid://d3g6wbvwflmyk"]
 
-[ext_resource type="Script" path="res://src/SaveLoadMenu/SaveLoadMenu.gd" id="1_3jkds"]
-[ext_resource type="PackedScene" uid="uid://d2s7roinx2or7" path="res://src/SaveLoadMenu/SavePanelButton.tscn" id="2_fc6r3"]
+[ext_resource type="Script" path="res://src/Game/Menu/SaveLoadMenu/SaveLoadMenu.gd" id="1_3jkds"]
+[ext_resource type="PackedScene" uid="uid://d2s7roinx2or7" path="res://src/Game/Menu/SaveLoadMenu/SavePanelButton.tscn" id="2_fc6r3"]
 
 [sub_resource type="InputEventAction" id="InputEventAction_8vo2t"]
 action = &"ui_accept"
diff --git a/game/src/SaveLoadMenu/SavePanelButton.gd b/game/src/Game/Menu/SaveLoadMenu/SavePanelButton.gd
index 5fe4917..5fe4917 100644
--- a/game/src/SaveLoadMenu/SavePanelButton.gd
+++ b/game/src/Game/Menu/SaveLoadMenu/SavePanelButton.gd
diff --git a/game/src/SaveLoadMenu/SavePanelButton.tscn b/game/src/Game/Menu/SaveLoadMenu/SavePanelButton.tscn
index d2d0a41..94dc8a3 100644
--- a/game/src/SaveLoadMenu/SavePanelButton.tscn
+++ b/game/src/Game/Menu/SaveLoadMenu/SavePanelButton.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://d2s7roinx2or7"]
 
-[ext_resource type="Script" path="res://src/SaveLoadMenu/SavePanelButton.gd" id="1_rtuo6"]
+[ext_resource type="Script" path="res://src/Game/Menu/SaveLoadMenu/SavePanelButton.gd" id="1_rtuo6"]
 
 [node name="SavePanelButton" type="Container" node_paths=PackedStringArray("country_flag", "date_label", "delete_button", "background_button", "name_label")]
 editor_description = "SS-18, UI-40, UI-84, UI-86, UI-91, UI-93"
diff --git a/game/src/SaveLoadMenu/SaveResource.gd b/game/src/Game/Menu/SaveLoadMenu/SaveResource.gd
index 5e7faa6..5e7faa6 100644
--- a/game/src/SaveLoadMenu/SaveResource.gd
+++ b/game/src/Game/Menu/SaveLoadMenu/SaveResource.gd
diff --git a/game/src/MusicConductor/MusicConductor.gd b/game/src/Game/MusicConductor/MusicConductor.gd
index 98dd0eb..98dd0eb 100644
--- a/game/src/MusicConductor/MusicConductor.gd
+++ b/game/src/Game/MusicConductor/MusicConductor.gd
diff --git a/game/src/MusicConductor/MusicConductor.tscn b/game/src/Game/MusicConductor/MusicConductor.tscn
index 182de99..3c288be 100644
--- a/game/src/MusicConductor/MusicConductor.tscn
+++ b/game/src/Game/MusicConductor/MusicConductor.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://b1h31mnn8n2nu"]
 
-[ext_resource type="Script" path="res://src/MusicConductor/MusicConductor.gd" id="1_56t1b"]
+[ext_resource type="Script" path="res://src/Game/MusicConductor/MusicConductor.gd" id="1_56t1b"]
 
 [node name="MusicConductor" type="Node"]
 script = ExtResource("1_56t1b")
diff --git a/game/src/MusicConductor/MusicPlayer.gd b/game/src/Game/MusicConductor/MusicPlayer.gd
index 47be158..47be158 100644
--- a/game/src/MusicConductor/MusicPlayer.gd
+++ b/game/src/Game/MusicConductor/MusicPlayer.gd
diff --git a/game/src/MusicConductor/MusicPlayer.tscn b/game/src/Game/MusicConductor/MusicPlayer.tscn
index 80ad641..8d47ba0 100644
--- a/game/src/MusicConductor/MusicPlayer.tscn
+++ b/game/src/Game/MusicConductor/MusicPlayer.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://cvl76duuym1wq"]
 
-[ext_resource type="Script" path="res://src/MusicConductor/MusicPlayer.gd" id="1_gcm4m"]
+[ext_resource type="Script" path="res://src/Game/MusicConductor/MusicPlayer.gd" id="1_gcm4m"]
 
 [node name="MusicPlayer" type="BoxContainer" node_paths=PackedStringArray("_song_selector_button", "_progress_slider", "_previous_song_button", "_play_pause_button", "_next_song_button", "_visbility_button")]
 editor_description = "UI-104"
diff --git a/game/src/MusicConductor/SongInfo.gd b/game/src/Game/MusicConductor/SongInfo.gd
index 1ee9adc..1ee9adc 100644
--- a/game/src/MusicConductor/SongInfo.gd
+++ b/game/src/Game/MusicConductor/SongInfo.gd
diff --git a/game/src/SplashContainer.gd b/game/src/Game/SplashContainer.gd
index 524d314..524d314 100644
--- a/game/src/SplashContainer.gd
+++ b/game/src/Game/SplashContainer.gd
diff --git a/game/src/Utility/StyleBoxCombinedTexture.gd b/game/src/Game/Theme/StyleBoxCombinedTexture.gd
index db54da4..db54da4 100644
--- a/game/src/Utility/StyleBoxCombinedTexture.gd
+++ b/game/src/Game/Theme/StyleBoxCombinedTexture.gd
diff --git a/game/src/Utility/StyleBoxWithSound.gd b/game/src/Game/Theme/StyleBoxWithSound.gd
index 8c29b34..8c29b34 100644
--- a/game/src/Utility/StyleBoxWithSound.gd
+++ b/game/src/Game/Theme/StyleBoxWithSound.gd
diff --git a/game/src/Utility/TextureSetting.gd b/game/src/Game/Theme/TextureSetting.gd
index da9b185..da9b185 100644
--- a/game/src/Utility/TextureSetting.gd
+++ b/game/src/Game/Theme/TextureSetting.gd
diff --git a/game/theme/game_session_menu.tres b/game/theme/game_session_menu.tres
index 0cab476..68847d4 100644
--- a/game/theme/game_session_menu.tres
+++ b/game/theme/game_session_menu.tres
@@ -1,7 +1,7 @@
 [gd_resource type="Theme" load_steps=11 format=3 uid="uid://cqrfmjt5yeti7"]
 
 [ext_resource type="StyleBox" uid="uid://blwilunhmyvpq" path="res://theme/assets/main_menu_button_normal.tres" id="1_7med2"]
-[ext_resource type="Script" path="res://src/Utility/StyleBoxWithSound.gd" id="2_oj3dv"]
+[ext_resource type="Script" path="res://src/Game/Theme/StyleBoxWithSound.gd" id="2_oj3dv"]
 [ext_resource type="AudioStream" uid="uid://bsldcs3l8s7ug" path="res://addons/kenney_ui_audio/click3.wav" id="3_j823n"]
 [ext_resource type="Texture2D" uid="uid://c0p34i3d3b0pw" path="res://theme/assets/main_menu_button.png" id="4_lno5s"]
 
diff --git a/game/theme/main_menu.tres b/game/theme/main_menu.tres
index 0518cd8..e25da4d 100644
--- a/game/theme/main_menu.tres
+++ b/game/theme/main_menu.tres
@@ -1,12 +1,12 @@
 [gd_resource type="Theme" load_steps=32 format=3 uid="uid://qoi3oec48jp0"]
 
-[ext_resource type="Script" path="res://src/Utility/StyleBoxCombinedTexture.gd" id="1_axke7"]
-[ext_resource type="Script" path="res://src/Utility/TextureSetting.gd" id="2_7bwl2"]
+[ext_resource type="Script" path="res://src/Game/Theme/StyleBoxCombinedTexture.gd" id="1_axke7"]
+[ext_resource type="Script" path="res://src/Game/Theme/TextureSetting.gd" id="2_7bwl2"]
 [ext_resource type="Texture2D" uid="uid://dapuqgpjs56bs" path="res://theme/assets/main_menu_background.png" id="3_cpatd"]
 [ext_resource type="Texture2D" uid="uid://q25s41oavuxw" path="res://theme/assets/main_menu_border_paper.png" id="4_sl60o"]
 [ext_resource type="Texture2D" uid="uid://c0p34i3d3b0pw" path="res://theme/assets/main_menu_button.png" id="5_xj7ql"]
 [ext_resource type="StyleBox" uid="uid://blwilunhmyvpq" path="res://theme/assets/main_menu_button_normal.tres" id="6_dx0aj"]
-[ext_resource type="Script" path="res://src/Utility/StyleBoxWithSound.gd" id="7_qo00e"]
+[ext_resource type="Script" path="res://src/Game/Theme/StyleBoxWithSound.gd" id="7_qo00e"]
 [ext_resource type="AudioStream" uid="uid://bsldcs3l8s7ug" path="res://addons/kenney_ui_audio/click3.wav" id="8_etuft"]
 
 [sub_resource type="Resource" id="Resource_hxpog"]
diff --git a/game/theme/options_menu.tres b/game/theme/options_menu.tres
index 04bcb96..58c12ab 100644
--- a/game/theme/options_menu.tres
+++ b/game/theme/options_menu.tres
@@ -1,7 +1,7 @@
 [gd_resource type="Theme" load_steps=8 format=3 uid="uid://fbxssqcg1s0m"]
 
-[ext_resource type="Script" path="res://src/Utility/StyleBoxCombinedTexture.gd" id="1_6eqg5"]
-[ext_resource type="Script" path="res://src/Utility/TextureSetting.gd" id="2_d0e1t"]
+[ext_resource type="Script" path="res://src/Game/Theme/StyleBoxCombinedTexture.gd" id="1_6eqg5"]
+[ext_resource type="Script" path="res://src/Game/Theme/TextureSetting.gd" id="2_d0e1t"]
 [ext_resource type="Texture2D" uid="uid://dapuqgpjs56bs" path="res://theme/assets/main_menu_background.png" id="3_t863y"]
 [ext_resource type="Texture2D" uid="uid://q25s41oavuxw" path="res://theme/assets/main_menu_border_paper.png" id="4_ljte1"]