idem

source/game/ui/menu_option.cpp

@@ -1,10 +1,10 @@
-#include "menu_option.hpp"
+#include "game/ui/menu_option.hpp"
 
 #include <algorithm>  // Para max
 #include <iterator>   // Para distance
 #include <ranges>     // Para __find_fn, find
 
-#include "text.hpp"  // Para Text
+#include "core/rendering/text.hpp"  // Para Text
 
 auto ActionListOption::getValueAsString() const -> std::string {
     if (value_getter_) {

source/game/ui/menu_option.hpp

@@ -7,9 +7,9 @@
 #include <utility>     // Para move
 #include <vector>      // Para vector
 
-#include "lang.hpp"             // Para getText
-#include "text.hpp"             // Para Text
-#include "ui/service_menu.hpp"  // Para ServiceMenu
+#include "core/locale/lang.hpp"      // Para getText
+#include "core/rendering/text.hpp"   // Para Text
+#include "game/ui/service_menu.hpp"  // Para ServiceMenu
 
 // --- Clase MenuOption: interfaz base para todas las opciones del menú ---
 class MenuOption {

source/game/ui/menu_renderer.cpp

@@ -1,14 +1,14 @@
-#include "menu_renderer.hpp"
+#include "game/ui/menu_renderer.hpp"
 
 #include <algorithm>
 #include <utility>
 
-#include "color.hpp"
-#include "menu_option.hpp"
-#include "param.hpp"
-#include "screen.hpp"
-#include "text.hpp"
-#include "utils.hpp"
+#include "core/rendering/screen.hpp"
+#include "core/rendering/text.hpp"
+#include "game/ui/menu_option.hpp"
+#include "utils/color.hpp"
+#include "utils/param.hpp"
+#include "utils/utils.hpp"
 
 // --- Implementación de las estructuras de animación ---
 

source/game/ui/menu_renderer.hpp

@@ -8,8 +8,8 @@
 #include <string>
 #include <vector>
 
-#include "color.hpp"
-#include "ui/service_menu.hpp"
+#include "game/ui/service_menu.hpp"
+#include "utils/color.hpp"
 
 class MenuOption;
 class Text;

source/game/ui/notifier.cpp

@@ -1,4 +1,4 @@
-#include "notifier.hpp"
+#include "game/ui/notifier.hpp"
 
 #include <SDL3/SDL.h>  // Para SDL_RenderFillRect, SDL_FRect, SDL_RenderClear
 
@@ -7,12 +7,12 @@
 #include <utility>
 #include <vector>  // Para vector
 
-#include "audio.hpp"    // Para Audio
-#include "param.hpp"    // Para Param, param, ParamNotification, ParamGame
-#include "screen.hpp"   // Para Screen
-#include "sprite.hpp"   // Para Sprite
-#include "text.hpp"     // Para Text
-#include "texture.hpp"  // Para Texture
+#include "core/audio/audio.hpp"              // Para Audio
+#include "core/rendering/screen.hpp"         // Para Screen
+#include "core/rendering/sprite/sprite.hpp"  // Para Sprite
+#include "core/rendering/text.hpp"           // Para Text
+#include "core/rendering/texture.hpp"        // Para Texture
+#include "utils/param.hpp"                   // Para Param, param, ParamNotification, ParamGame
 
 // Singleton
 Notifier* Notifier::instance = nullptr;

source/game/ui/notifier.hpp

@@ -6,8 +6,8 @@
 #include <string>  // Para basic_string, string
 #include <vector>  // Para vector
 
-#include "color.hpp"  // Para stringInVector, Color
-#include "utils.hpp"
+#include "utils/color.hpp"  // Para stringInVector, Color
+#include "utils/utils.hpp"
 
 class Sprite;
 class Text;

source/game/ui/service_menu.cpp

@@ -1,23 +1,23 @@
-#include "ui/service_menu.hpp"
+#include "game/ui/service_menu.hpp"
 
 #include <utility>
 
-#include "audio.hpp"           // Para Audio
-#include "define_buttons.hpp"  // Para DefineButtons
-#include "difficulty.hpp"      // Para getCodeFromName, getNameFromCode
-#include "input.hpp"           // Para Input
-#include "input_types.hpp"     // Para InputAction
-#include "lang.hpp"            // Para getText, getCodeFromName, getNameFromCode
-#include "menu_option.hpp"     // Para MenuOption, ActionOption, BoolOption, ListOption, FolderOption, IntOption, ActionListOption
-#include "menu_renderer.hpp"   // Para MenuRenderer
-#include "options.hpp"         // Para GamepadManager, gamepad_manager, PendingChanges, Video, pending_changes, video, Audio, Gamepad, Settings, audio, checkPendingChanges, settings, Window, getPlayerWhoUsesKeyboard, playerIdToString, stringToPlayerId, window, Keyboard, Music, Sound, keyboard
-#include "param.hpp"           // Para Param, param, ParamGame, ParamServiceMenu
-#include "player.hpp"          // Para Player
-#include "resource.hpp"        // Para Resource
-#include "screen.hpp"          // Para Screen
-#include "section.hpp"         // Para Name, name, Options, options
-#include "ui/ui_message.hpp"   // Para UIMessage
-#include "utils.hpp"           // Para Zone
+#include "core/audio/audio.hpp"           // Para Audio
+#include "core/input/define_buttons.hpp"  // Para DefineButtons
+#include "core/input/input.hpp"           // Para Input
+#include "core/input/input_types.hpp"     // Para InputAction
+#include "core/locale/lang.hpp"           // Para getText, getCodeFromName, getNameFromCode
+#include "core/rendering/screen.hpp"      // Para Screen
+#include "core/resources/resource.hpp"    // Para Resource
+#include "core/system/section.hpp"        // Para Name, name, Options, options
+#include "game/entities/player.hpp"       // Para Player
+#include "game/gameplay/difficulty.hpp"   // Para getCodeFromName, getNameFromCode
+#include "game/options.hpp"               // Para GamepadManager, gamepad_manager, PendingChanges, Video, pending_changes, video, Audio, Gamepad, Settings, audio, checkPendingChanges, settings, Window, getPlayerWhoUsesKeyboard, playerIdToString, stringToPlayerId, window, Keyboard, Music, Sound, keyboard
+#include "game/ui/menu_option.hpp"        // Para MenuOption, ActionOption, BoolOption, ListOption, FolderOption, IntOption, ActionListOption
+#include "game/ui/menu_renderer.hpp"      // Para MenuRenderer
+#include "game/ui/ui_message.hpp"         // Para UIMessage
+#include "utils/param.hpp"                // Para Param, param, ParamGame, ParamServiceMenu
+#include "utils/utils.hpp"                // Para Zone
 
 // Singleton
 ServiceMenu* ServiceMenu::instance = nullptr;

source/game/ui/service_menu.hpp

@@ -11,8 +11,8 @@
 #include <utility>     // Para pair
 #include <vector>      // Para vector
 
-#include "define_buttons.hpp"  // for DefineButtons
-#include "ui_message.hpp"      // for UIMessage
+#include "core/input/define_buttons.hpp"  // for DefineButtons
+#include "game/ui/ui_message.hpp"         // for UIMessage
 
 class MenuOption;
 class MenuRenderer;

source/game/ui/ui_message.cpp

@@ -1,10 +1,10 @@
-#include "ui_message.hpp"
+#include "game/ui/ui_message.hpp"
 
 #include <algorithm>
 #include <cmath>  // Para pow
 #include <utility>
 
-#include "text.hpp"  // Para Text::CENTER, Text::COLOR, Text
+#include "core/rendering/text.hpp"  // Para Text::CENTER, Text::COLOR, Text
 
 // Constructor: inicializa el renderizador, el texto y el color del mensaje
 UIMessage::UIMessage(std::shared_ptr<Text> text_renderer, std::string message_text, const Color& color)

source/game/ui/ui_message.hpp

@@ -3,7 +3,7 @@
 #include <memory>  // Para shared_ptr
 #include <string>  // Para string
 
-#include "color.hpp"  // Para Color
+#include "utils/color.hpp"  // Para Color
 
 class Text;
 

source/game/ui/window_message.cpp

@@ -1,11 +1,11 @@
-#include "window_message.hpp"
+#include "game/ui/window_message.hpp"
 
 #include <algorithm>
 #include <utility>
 
-#include "param.hpp"
-#include "screen.hpp"
-#include "text.hpp"
+#include "core/rendering/screen.hpp"
+#include "core/rendering/text.hpp"
+#include "utils/param.hpp"
 
 WindowMessage::WindowMessage(
     std::shared_ptr<Text> text_renderer,

source/game/ui/window_message.hpp

@@ -8,9 +8,9 @@
 #include <string>     // Para string
 #include <vector>     // Para vector
 
-#include "color.hpp"  // Para Color
-#include "param.hpp"  // Para param
-#include "text.hpp"   // Para Text
+#include "core/rendering/text.hpp"  // Para Text
+#include "utils/color.hpp"          // Para Color
+#include "utils/param.hpp"          // Para param
 
 class WindowMessage {
    public: