diff --git a/source/audio.cpp b/source/core/audio/audio.cpp
similarity index 100%
rename from source/audio.cpp
rename to source/core/audio/audio.cpp
diff --git a/source/audio.hpp b/source/core/audio/audio.hpp
similarity index 100%
rename from source/audio.hpp
rename to source/core/audio/audio.hpp
diff --git a/source/external/jail_audio.hpp b/source/core/audio/jail_audio.hpp
similarity index 100%
rename from source/external/jail_audio.hpp
rename to source/core/audio/jail_audio.hpp
diff --git a/source/define_buttons.cpp b/source/core/input/define_buttons.cpp
similarity index 100%
rename from source/define_buttons.cpp
rename to source/core/input/define_buttons.cpp
diff --git a/source/define_buttons.hpp b/source/core/input/define_buttons.hpp
similarity index 100%
rename from source/define_buttons.hpp
rename to source/core/input/define_buttons.hpp
diff --git a/source/gamepad_config_manager.hpp b/source/core/input/gamepad_config_manager.hpp
similarity index 100%
rename from source/gamepad_config_manager.hpp
rename to source/core/input/gamepad_config_manager.hpp
diff --git a/source/global_inputs.cpp b/source/core/input/global_inputs.cpp
similarity index 100%
rename from source/global_inputs.cpp
rename to source/core/input/global_inputs.cpp
diff --git a/source/global_inputs.hpp b/source/core/input/global_inputs.hpp
similarity index 100%
rename from source/global_inputs.hpp
rename to source/core/input/global_inputs.hpp
diff --git a/source/input.cpp b/source/core/input/input.cpp
similarity index 100%
rename from source/input.cpp
rename to source/core/input/input.cpp
diff --git a/source/input.hpp b/source/core/input/input.hpp
similarity index 100%
rename from source/input.hpp
rename to source/core/input/input.hpp
diff --git a/source/input_types.cpp b/source/core/input/input_types.cpp
similarity index 100%
rename from source/input_types.cpp
rename to source/core/input/input_types.cpp
diff --git a/source/input_types.hpp b/source/core/input/input_types.hpp
similarity index 100%
rename from source/input_types.hpp
rename to source/core/input/input_types.hpp
diff --git a/source/mouse.cpp b/source/core/input/mouse.cpp
similarity index 100%
rename from source/mouse.cpp
rename to source/core/input/mouse.cpp
diff --git a/source/mouse.hpp b/source/core/input/mouse.hpp
similarity index 100%
rename from source/mouse.hpp
rename to source/core/input/mouse.hpp
diff --git a/source/pause_manager.hpp b/source/core/input/pause_manager.hpp
similarity index 100%
rename from source/pause_manager.hpp
rename to source/core/input/pause_manager.hpp
diff --git a/source/lang.cpp b/source/core/locale/lang.cpp
similarity index 100%
rename from source/lang.cpp
rename to source/core/locale/lang.cpp
diff --git a/source/lang.hpp b/source/core/locale/lang.hpp
similarity index 100%
rename from source/lang.hpp
rename to source/core/locale/lang.hpp
diff --git a/source/background.cpp b/source/core/rendering/background.cpp
similarity index 100%
rename from source/background.cpp
rename to source/core/rendering/background.cpp
diff --git a/source/background.hpp b/source/core/rendering/background.hpp
similarity index 100%
rename from source/background.hpp
rename to source/core/rendering/background.hpp
diff --git a/source/fade.cpp b/source/core/rendering/fade.cpp
similarity index 100%
rename from source/fade.cpp
rename to source/core/rendering/fade.cpp
diff --git a/source/fade.hpp b/source/core/rendering/fade.hpp
similarity index 100%
rename from source/fade.hpp
rename to source/core/rendering/fade.hpp
diff --git a/source/external/gif.cpp b/source/core/rendering/gif.cpp
similarity index 100%
rename from source/external/gif.cpp
rename to source/core/rendering/gif.cpp
diff --git a/source/external/gif.hpp b/source/core/rendering/gif.hpp
similarity index 100%
rename from source/external/gif.hpp
rename to source/core/rendering/gif.hpp
diff --git a/source/screen.cpp b/source/core/rendering/screen.cpp
similarity index 100%
rename from source/screen.cpp
rename to source/core/rendering/screen.cpp
diff --git a/source/screen.hpp b/source/core/rendering/screen.hpp
similarity index 100%
rename from source/screen.hpp
rename to source/core/rendering/screen.hpp
diff --git a/source/rendering/sdl3gpu/crtpi_frag_spv.h b/source/core/rendering/sdl3gpu/crtpi_frag_spv.h
similarity index 100%
rename from source/rendering/sdl3gpu/crtpi_frag_spv.h
rename to source/core/rendering/sdl3gpu/crtpi_frag_spv.h
diff --git a/source/rendering/sdl3gpu/downscale_frag_spv.h b/source/core/rendering/sdl3gpu/downscale_frag_spv.h
similarity index 100%
rename from source/rendering/sdl3gpu/downscale_frag_spv.h
rename to source/core/rendering/sdl3gpu/downscale_frag_spv.h
diff --git a/source/rendering/sdl3gpu/postfx_frag_spv.h b/source/core/rendering/sdl3gpu/postfx_frag_spv.h
similarity index 100%
rename from source/rendering/sdl3gpu/postfx_frag_spv.h
rename to source/core/rendering/sdl3gpu/postfx_frag_spv.h
diff --git a/source/rendering/sdl3gpu/postfx_vert_spv.h b/source/core/rendering/sdl3gpu/postfx_vert_spv.h
similarity index 100%
rename from source/rendering/sdl3gpu/postfx_vert_spv.h
rename to source/core/rendering/sdl3gpu/postfx_vert_spv.h
diff --git a/source/rendering/sdl3gpu/sdl3gpu_shader.cpp b/source/core/rendering/sdl3gpu/sdl3gpu_shader.cpp
similarity index 100%
rename from source/rendering/sdl3gpu/sdl3gpu_shader.cpp
rename to source/core/rendering/sdl3gpu/sdl3gpu_shader.cpp
diff --git a/source/rendering/sdl3gpu/sdl3gpu_shader.hpp b/source/core/rendering/sdl3gpu/sdl3gpu_shader.hpp
similarity index 100%
rename from source/rendering/sdl3gpu/sdl3gpu_shader.hpp
rename to source/core/rendering/sdl3gpu/sdl3gpu_shader.hpp
diff --git a/source/rendering/sdl3gpu/upscale_frag_spv.h b/source/core/rendering/sdl3gpu/upscale_frag_spv.h
similarity index 100%
rename from source/rendering/sdl3gpu/upscale_frag_spv.h
rename to source/core/rendering/sdl3gpu/upscale_frag_spv.h
diff --git a/source/rendering/shader_backend.hpp b/source/core/rendering/shader_backend.hpp
similarity index 100%
rename from source/rendering/shader_backend.hpp
rename to source/core/rendering/shader_backend.hpp
diff --git a/source/animated_sprite.cpp b/source/core/rendering/sprite/animated_sprite.cpp
similarity index 100%
rename from source/animated_sprite.cpp
rename to source/core/rendering/sprite/animated_sprite.cpp
diff --git a/source/animated_sprite.hpp b/source/core/rendering/sprite/animated_sprite.hpp
similarity index 100%
rename from source/animated_sprite.hpp
rename to source/core/rendering/sprite/animated_sprite.hpp
diff --git a/source/card_sprite.cpp b/source/core/rendering/sprite/card_sprite.cpp
similarity index 100%
rename from source/card_sprite.cpp
rename to source/core/rendering/sprite/card_sprite.cpp
diff --git a/source/card_sprite.hpp b/source/core/rendering/sprite/card_sprite.hpp
similarity index 100%
rename from source/card_sprite.hpp
rename to source/core/rendering/sprite/card_sprite.hpp
diff --git a/source/moving_sprite.cpp b/source/core/rendering/sprite/moving_sprite.cpp
similarity index 100%
rename from source/moving_sprite.cpp
rename to source/core/rendering/sprite/moving_sprite.cpp
diff --git a/source/moving_sprite.hpp b/source/core/rendering/sprite/moving_sprite.hpp
similarity index 100%
rename from source/moving_sprite.hpp
rename to source/core/rendering/sprite/moving_sprite.hpp
diff --git a/source/path_sprite.cpp b/source/core/rendering/sprite/path_sprite.cpp
similarity index 100%
rename from source/path_sprite.cpp
rename to source/core/rendering/sprite/path_sprite.cpp
diff --git a/source/path_sprite.hpp b/source/core/rendering/sprite/path_sprite.hpp
similarity index 100%
rename from source/path_sprite.hpp
rename to source/core/rendering/sprite/path_sprite.hpp
diff --git a/source/smart_sprite.cpp b/source/core/rendering/sprite/smart_sprite.cpp
similarity index 100%
rename from source/smart_sprite.cpp
rename to source/core/rendering/sprite/smart_sprite.cpp
diff --git a/source/smart_sprite.hpp b/source/core/rendering/sprite/smart_sprite.hpp
similarity index 100%
rename from source/smart_sprite.hpp
rename to source/core/rendering/sprite/smart_sprite.hpp
diff --git a/source/sprite.cpp b/source/core/rendering/sprite/sprite.cpp
similarity index 100%
rename from source/sprite.cpp
rename to source/core/rendering/sprite/sprite.cpp
diff --git a/source/sprite.hpp b/source/core/rendering/sprite/sprite.hpp
similarity index 100%
rename from source/sprite.hpp
rename to source/core/rendering/sprite/sprite.hpp
diff --git a/source/text.cpp b/source/core/rendering/text.cpp
similarity index 100%
rename from source/text.cpp
rename to source/core/rendering/text.cpp
diff --git a/source/text.hpp b/source/core/rendering/text.hpp
similarity index 100%
rename from source/text.hpp
rename to source/core/rendering/text.hpp
diff --git a/source/texture.cpp b/source/core/rendering/texture.cpp
similarity index 100%
rename from source/texture.cpp
rename to source/core/rendering/texture.cpp
diff --git a/source/texture.hpp b/source/core/rendering/texture.hpp
similarity index 100%
rename from source/texture.hpp
rename to source/core/rendering/texture.hpp
diff --git a/source/tiled_bg.cpp b/source/core/rendering/tiled_bg.cpp
similarity index 100%
rename from source/tiled_bg.cpp
rename to source/core/rendering/tiled_bg.cpp
diff --git a/source/tiled_bg.hpp b/source/core/rendering/tiled_bg.hpp
similarity index 100%
rename from source/tiled_bg.hpp
rename to source/core/rendering/tiled_bg.hpp
diff --git a/source/writer.cpp b/source/core/rendering/writer.cpp
similarity index 100%
rename from source/writer.cpp
rename to source/core/rendering/writer.cpp
diff --git a/source/writer.hpp b/source/core/rendering/writer.hpp
similarity index 100%
rename from source/writer.hpp
rename to source/core/rendering/writer.hpp
diff --git a/source/asset.cpp b/source/core/resources/asset.cpp
similarity index 100%
rename from source/asset.cpp
rename to source/core/resources/asset.cpp
diff --git a/source/asset.hpp b/source/core/resources/asset.hpp
similarity index 100%
rename from source/asset.hpp
rename to source/core/resources/asset.hpp
diff --git a/source/asset_integrated.cpp b/source/core/resources/asset_integrated.cpp
similarity index 100%
rename from source/asset_integrated.cpp
rename to source/core/resources/asset_integrated.cpp
diff --git a/source/asset_integrated.hpp b/source/core/resources/asset_integrated.hpp
similarity index 100%
rename from source/asset_integrated.hpp
rename to source/core/resources/asset_integrated.hpp
diff --git a/source/resource.cpp b/source/core/resources/resource.cpp
similarity index 100%
rename from source/resource.cpp
rename to source/core/resources/resource.cpp
diff --git a/source/resource.hpp b/source/core/resources/resource.hpp
similarity index 100%
rename from source/resource.hpp
rename to source/core/resources/resource.hpp
diff --git a/source/resource_helper.cpp b/source/core/resources/resource_helper.cpp
similarity index 100%
rename from source/resource_helper.cpp
rename to source/core/resources/resource_helper.cpp
diff --git a/source/resource_helper.hpp b/source/core/resources/resource_helper.hpp
similarity index 100%
rename from source/resource_helper.hpp
rename to source/core/resources/resource_helper.hpp
diff --git a/source/resource_loader.cpp b/source/core/resources/resource_loader.cpp
similarity index 100%
rename from source/resource_loader.cpp
rename to source/core/resources/resource_loader.cpp
diff --git a/source/resource_loader.hpp b/source/core/resources/resource_loader.hpp
similarity index 100%
rename from source/resource_loader.hpp
rename to source/core/resources/resource_loader.hpp
diff --git a/source/resource_pack.cpp b/source/core/resources/resource_pack.cpp
similarity index 100%
rename from source/resource_pack.cpp
rename to source/core/resources/resource_pack.cpp
diff --git a/source/resource_pack.hpp b/source/core/resources/resource_pack.hpp
similarity index 100%
rename from source/resource_pack.hpp
rename to source/core/resources/resource_pack.hpp
diff --git a/source/defaults.hpp b/source/core/system/defaults.hpp
similarity index 100%
rename from source/defaults.hpp
rename to source/core/system/defaults.hpp
diff --git a/source/demo.cpp b/source/core/system/demo.cpp
similarity index 100%
rename from source/demo.cpp
rename to source/core/system/demo.cpp
diff --git a/source/demo.hpp b/source/core/system/demo.hpp
similarity index 100%
rename from source/demo.hpp
rename to source/core/system/demo.hpp
diff --git a/source/director.cpp b/source/core/system/director.cpp
similarity index 100%
rename from source/director.cpp
rename to source/core/system/director.cpp
diff --git a/source/director.hpp b/source/core/system/director.hpp
similarity index 100%
rename from source/director.hpp
rename to source/core/system/director.hpp
diff --git a/source/global_events.cpp b/source/core/system/global_events.cpp
similarity index 100%
rename from source/global_events.cpp
rename to source/core/system/global_events.cpp
diff --git a/source/global_events.hpp b/source/core/system/global_events.hpp
similarity index 100%
rename from source/global_events.hpp
rename to source/core/system/global_events.hpp
diff --git a/source/section.hpp b/source/core/system/section.hpp
similarity index 100%
rename from source/section.hpp
rename to source/core/system/section.hpp
diff --git a/source/shutdown.cpp b/source/core/system/shutdown.cpp
similarity index 100%
rename from source/shutdown.cpp
rename to source/core/system/shutdown.cpp
diff --git a/source/shutdown.hpp b/source/core/system/shutdown.hpp
similarity index 100%
rename from source/shutdown.hpp
rename to source/core/system/shutdown.hpp
diff --git a/source/stage_interface.hpp b/source/core/system/stage_interface.hpp
similarity index 100%
rename from source/stage_interface.hpp
rename to source/core/system/stage_interface.hpp
diff --git a/source/system_utils.cpp b/source/core/system/system_utils.cpp
similarity index 100%
rename from source/system_utils.cpp
rename to source/core/system/system_utils.cpp
diff --git a/source/system_utils.hpp b/source/core/system/system_utils.hpp
similarity index 100%
rename from source/system_utils.hpp
rename to source/core/system/system_utils.hpp
diff --git a/source/balloon.cpp b/source/game/entities/balloon.cpp
similarity index 100%
rename from source/balloon.cpp
rename to source/game/entities/balloon.cpp
diff --git a/source/balloon.hpp b/source/game/entities/balloon.hpp
similarity index 100%
rename from source/balloon.hpp
rename to source/game/entities/balloon.hpp
diff --git a/source/bullet.cpp b/source/game/entities/bullet.cpp
similarity index 100%
rename from source/bullet.cpp
rename to source/game/entities/bullet.cpp
diff --git a/source/bullet.hpp b/source/game/entities/bullet.hpp
similarity index 100%
rename from source/bullet.hpp
rename to source/game/entities/bullet.hpp
diff --git a/source/explosions.cpp b/source/game/entities/explosions.cpp
similarity index 100%
rename from source/explosions.cpp
rename to source/game/entities/explosions.cpp
diff --git a/source/explosions.hpp b/source/game/entities/explosions.hpp
similarity index 100%
rename from source/explosions.hpp
rename to source/game/entities/explosions.hpp
diff --git a/source/item.cpp b/source/game/entities/item.cpp
similarity index 100%
rename from source/item.cpp
rename to source/game/entities/item.cpp
diff --git a/source/item.hpp b/source/game/entities/item.hpp
similarity index 100%
rename from source/item.hpp
rename to source/game/entities/item.hpp
diff --git a/source/player.cpp b/source/game/entities/player.cpp
similarity index 100%
rename from source/player.cpp
rename to source/game/entities/player.cpp
diff --git a/source/player.hpp b/source/game/entities/player.hpp
similarity index 100%
rename from source/player.hpp
rename to source/game/entities/player.hpp
diff --git a/source/tabe.cpp b/source/game/entities/tabe.cpp
similarity index 100%
rename from source/tabe.cpp
rename to source/game/entities/tabe.cpp
diff --git a/source/tabe.hpp b/source/game/entities/tabe.hpp
similarity index 100%
rename from source/tabe.hpp
rename to source/game/entities/tabe.hpp
diff --git a/source/balloon_formations.cpp b/source/game/gameplay/balloon_formations.cpp
similarity index 100%
rename from source/balloon_formations.cpp
rename to source/game/gameplay/balloon_formations.cpp
diff --git a/source/balloon_formations.hpp b/source/game/gameplay/balloon_formations.hpp
similarity index 100%
rename from source/balloon_formations.hpp
rename to source/game/gameplay/balloon_formations.hpp
diff --git a/source/balloon_manager.cpp b/source/game/gameplay/balloon_manager.cpp
similarity index 100%
rename from source/balloon_manager.cpp
rename to source/game/gameplay/balloon_manager.cpp
diff --git a/source/balloon_manager.hpp b/source/game/gameplay/balloon_manager.hpp
similarity index 100%
rename from source/balloon_manager.hpp
rename to source/game/gameplay/balloon_manager.hpp
diff --git a/source/bullet_manager.cpp b/source/game/gameplay/bullet_manager.cpp
similarity index 100%
rename from source/bullet_manager.cpp
rename to source/game/gameplay/bullet_manager.cpp
diff --git a/source/bullet_manager.hpp b/source/game/gameplay/bullet_manager.hpp
similarity index 100%
rename from source/bullet_manager.hpp
rename to source/game/gameplay/bullet_manager.hpp
diff --git a/source/cooldown.hpp b/source/game/gameplay/cooldown.hpp
similarity index 100%
rename from source/cooldown.hpp
rename to source/game/gameplay/cooldown.hpp
diff --git a/source/difficulty.cpp b/source/game/gameplay/difficulty.cpp
similarity index 100%
rename from source/difficulty.cpp
rename to source/game/gameplay/difficulty.cpp
diff --git a/source/difficulty.hpp b/source/game/gameplay/difficulty.hpp
similarity index 100%
rename from source/difficulty.hpp
rename to source/game/gameplay/difficulty.hpp
diff --git a/source/enter_name.cpp b/source/game/gameplay/enter_name.cpp
similarity index 100%
rename from source/enter_name.cpp
rename to source/game/gameplay/enter_name.cpp
diff --git a/source/enter_name.hpp b/source/game/gameplay/enter_name.hpp
similarity index 100%
rename from source/enter_name.hpp
rename to source/game/gameplay/enter_name.hpp
diff --git a/source/game_logo.cpp b/source/game/gameplay/game_logo.cpp
similarity index 100%
rename from source/game_logo.cpp
rename to source/game/gameplay/game_logo.cpp
diff --git a/source/game_logo.hpp b/source/game/gameplay/game_logo.hpp
similarity index 100%
rename from source/game_logo.hpp
rename to source/game/gameplay/game_logo.hpp
diff --git a/source/manage_hiscore_table.cpp b/source/game/gameplay/manage_hiscore_table.cpp
similarity index 100%
rename from source/manage_hiscore_table.cpp
rename to source/game/gameplay/manage_hiscore_table.cpp
diff --git a/source/manage_hiscore_table.hpp b/source/game/gameplay/manage_hiscore_table.hpp
similarity index 100%
rename from source/manage_hiscore_table.hpp
rename to source/game/gameplay/manage_hiscore_table.hpp
diff --git a/source/scoreboard.cpp b/source/game/gameplay/scoreboard.cpp
similarity index 100%
rename from source/scoreboard.cpp
rename to source/game/gameplay/scoreboard.cpp
diff --git a/source/scoreboard.hpp b/source/game/gameplay/scoreboard.hpp
similarity index 100%
rename from source/scoreboard.hpp
rename to source/game/gameplay/scoreboard.hpp
diff --git a/source/stage.cpp b/source/game/gameplay/stage.cpp
similarity index 100%
rename from source/stage.cpp
rename to source/game/gameplay/stage.cpp
diff --git a/source/stage.hpp b/source/game/gameplay/stage.hpp
similarity index 100%
rename from source/stage.hpp
rename to source/game/gameplay/stage.hpp
diff --git a/source/options.cpp b/source/game/options.cpp
similarity index 100%
rename from source/options.cpp
rename to source/game/options.cpp
diff --git a/source/options.hpp b/source/game/options.hpp
similarity index 100%
rename from source/options.hpp
rename to source/game/options.hpp
diff --git a/source/sections/credits.cpp b/source/game/scenes/credits.cpp
similarity index 100%
rename from source/sections/credits.cpp
rename to source/game/scenes/credits.cpp
diff --git a/source/sections/credits.hpp b/source/game/scenes/credits.hpp
similarity index 100%
rename from source/sections/credits.hpp
rename to source/game/scenes/credits.hpp
diff --git a/source/sections/game.cpp b/source/game/scenes/game.cpp
similarity index 100%
rename from source/sections/game.cpp
rename to source/game/scenes/game.cpp
diff --git a/source/sections/game.hpp b/source/game/scenes/game.hpp
similarity index 100%
rename from source/sections/game.hpp
rename to source/game/scenes/game.hpp
diff --git a/source/sections/hiscore_table.cpp b/source/game/scenes/hiscore_table.cpp
similarity index 100%
rename from source/sections/hiscore_table.cpp
rename to source/game/scenes/hiscore_table.cpp
diff --git a/source/sections/hiscore_table.hpp b/source/game/scenes/hiscore_table.hpp
similarity index 100%
rename from source/sections/hiscore_table.hpp
rename to source/game/scenes/hiscore_table.hpp
diff --git a/source/sections/instructions.cpp b/source/game/scenes/instructions.cpp
similarity index 100%
rename from source/sections/instructions.cpp
rename to source/game/scenes/instructions.cpp
diff --git a/source/sections/instructions.hpp b/source/game/scenes/instructions.hpp
similarity index 100%
rename from source/sections/instructions.hpp
rename to source/game/scenes/instructions.hpp
diff --git a/source/sections/intro.cpp b/source/game/scenes/intro.cpp
similarity index 100%
rename from source/sections/intro.cpp
rename to source/game/scenes/intro.cpp
diff --git a/source/sections/intro.hpp b/source/game/scenes/intro.hpp
similarity index 100%
rename from source/sections/intro.hpp
rename to source/game/scenes/intro.hpp
diff --git a/source/sections/logo.cpp b/source/game/scenes/logo.cpp
similarity index 100%
rename from source/sections/logo.cpp
rename to source/game/scenes/logo.cpp
diff --git a/source/sections/logo.hpp b/source/game/scenes/logo.hpp
similarity index 100%
rename from source/sections/logo.hpp
rename to source/game/scenes/logo.hpp
diff --git a/source/sections/title.cpp b/source/game/scenes/title.cpp
similarity index 100%
rename from source/sections/title.cpp
rename to source/game/scenes/title.cpp
diff --git a/source/sections/title.hpp b/source/game/scenes/title.hpp
similarity index 100%
rename from source/sections/title.hpp
rename to source/game/scenes/title.hpp
diff --git a/source/ui/menu_option.cpp b/source/game/ui/menu_option.cpp
similarity index 100%
rename from source/ui/menu_option.cpp
rename to source/game/ui/menu_option.cpp
diff --git a/source/ui/menu_option.hpp b/source/game/ui/menu_option.hpp
similarity index 100%
rename from source/ui/menu_option.hpp
rename to source/game/ui/menu_option.hpp
diff --git a/source/ui/menu_renderer.cpp b/source/game/ui/menu_renderer.cpp
similarity index 100%
rename from source/ui/menu_renderer.cpp
rename to source/game/ui/menu_renderer.cpp
diff --git a/source/ui/menu_renderer.hpp b/source/game/ui/menu_renderer.hpp
similarity index 100%
rename from source/ui/menu_renderer.hpp
rename to source/game/ui/menu_renderer.hpp
diff --git a/source/ui/notifier.cpp b/source/game/ui/notifier.cpp
similarity index 100%
rename from source/ui/notifier.cpp
rename to source/game/ui/notifier.cpp
diff --git a/source/ui/notifier.hpp b/source/game/ui/notifier.hpp
similarity index 100%
rename from source/ui/notifier.hpp
rename to source/game/ui/notifier.hpp
diff --git a/source/ui/service_menu.cpp b/source/game/ui/service_menu.cpp
similarity index 100%
rename from source/ui/service_menu.cpp
rename to source/game/ui/service_menu.cpp
diff --git a/source/ui/service_menu.hpp b/source/game/ui/service_menu.hpp
similarity index 100%
rename from source/ui/service_menu.hpp
rename to source/game/ui/service_menu.hpp
diff --git a/source/ui/ui_message.cpp b/source/game/ui/ui_message.cpp
similarity index 100%
rename from source/ui/ui_message.cpp
rename to source/game/ui/ui_message.cpp
diff --git a/source/ui/ui_message.hpp b/source/game/ui/ui_message.hpp
similarity index 100%
rename from source/ui/ui_message.hpp
rename to source/game/ui/ui_message.hpp
diff --git a/source/ui/window_message.cpp b/source/game/ui/window_message.cpp
similarity index 100%
rename from source/ui/window_message.cpp
rename to source/game/ui/window_message.cpp
diff --git a/source/ui/window_message.hpp b/source/game/ui/window_message.hpp
similarity index 100%
rename from source/ui/window_message.hpp
rename to source/game/ui/window_message.hpp
diff --git a/source/color.cpp b/source/utils/color.cpp
similarity index 100%
rename from source/color.cpp
rename to source/utils/color.cpp
diff --git a/source/color.hpp b/source/utils/color.hpp
similarity index 100%
rename from source/color.hpp
rename to source/utils/color.hpp
diff --git a/source/param.cpp b/source/utils/param.cpp
similarity index 100%
rename from source/param.cpp
rename to source/utils/param.cpp
diff --git a/source/param.hpp b/source/utils/param.hpp
similarity index 100%
rename from source/param.hpp
rename to source/utils/param.hpp
diff --git a/source/utils.cpp b/source/utils/utils.cpp
similarity index 100%
rename from source/utils.cpp
rename to source/utils/utils.cpp
diff --git a/source/utils.hpp b/source/utils/utils.hpp
similarity index 100%
rename from source/utils.hpp
rename to source/utils/utils.hpp