idem

source/core/input/define_buttons.cpp

@@ -1,16 +1,16 @@
-#include "define_buttons.hpp"
+#include "core/input/define_buttons.hpp"
 
 #include <algorithm>  // Para __all_of_fn, all_of
 #include <memory>     // Para unique_ptr, allocator, shared_ptr, operator==, make_unique
 
-#include "input.hpp"              // Para Input
-#include "input_types.hpp"        // Para InputAction
-#include "lang.hpp"               // Para getText
-#include "options.hpp"            // Para Gamepad
-#include "param.hpp"              // Para Param, param, ParamGame, ParamServiceMenu
-#include "resource.hpp"           // Para Resource
-#include "ui/window_message.hpp"  // Para WindowMessage
-#include "utils.hpp"              // Para Zone
+#include "core/input/input.hpp"         // Para Input
+#include "core/input/input_types.hpp"   // Para InputAction
+#include "core/locale/lang.hpp"         // Para getText
+#include "core/resources/resource.hpp"  // Para Resource
+#include "game/options.hpp"             // Para Gamepad
+#include "game/ui/window_message.hpp"   // Para WindowMessage
+#include "utils/param.hpp"              // Para Param, param, ParamGame, ParamServiceMenu
+#include "utils/utils.hpp"              // Para Zone
 
 DefineButtons::DefineButtons()
     : input_(Input::get()) {

source/core/input/define_buttons.hpp

@@ -8,8 +8,8 @@
 #include <utility>
 #include <vector>
 
-#include "input.hpp"
-#include "ui/window_message.hpp"
+#include "core/input/input.hpp"
+#include "game/ui/window_message.hpp"
 
 namespace Options {
     struct Gamepad;

source/core/input/gamepad_config_manager.hpp

@@ -5,8 +5,8 @@
 #include <utility>
 #include <vector>
 
+#include "core/input/input_types.hpp"  // Solo incluimos los tipos compartidos
 #include "external/json.hpp"
-#include "input_types.hpp"  // Solo incluimos los tipos compartidos
 
 // --- Estructuras ---
 struct GamepadConfig {

source/core/input/global_inputs.cpp

@@ -1,4 +1,4 @@
-#include "global_inputs.hpp"
+#include "core/input/global_inputs.hpp"
 
 #include <algorithm>   // Para __any_of_fn, any_of
 #include <functional>  // Para function
@@ -7,16 +7,16 @@
 #include <utility>     // Para pair
 #include <vector>      // Para vector
 
-#include "audio.hpp"            // Para Audio
-#include "input.hpp"            // Para Input
-#include "input_types.hpp"      // Para InputAction
-#include "lang.hpp"             // Para getText, getLangFile, getLangName, getNextLangCode, loadFromFile
-#include "options.hpp"          // Para Video, video, Settings, settings, Audio, audio, Window, window
-#include "screen.hpp"           // Para Screen
-#include "section.hpp"          // Para Name, name, Options, options, AttractMode, attract_mode
-#include "ui/notifier.hpp"      // Para Notifier
-#include "ui/service_menu.hpp"  // Para ServiceMenu
-#include "utils.hpp"            // Para boolToOnOff
+#include "core/audio/audio.hpp"        // Para Audio
+#include "core/input/input.hpp"        // Para Input
+#include "core/input/input_types.hpp"  // Para InputAction
+#include "core/locale/lang.hpp"        // Para getText, getLangFile, getLangName, getNextLangCode, loadFromFile
+#include "core/rendering/screen.hpp"   // Para Screen
+#include "core/system/section.hpp"     // Para Name, name, Options, options, AttractMode, attract_mode
+#include "game/options.hpp"            // Para Video, video, Settings, settings, Audio, audio, Window, window
+#include "game/ui/notifier.hpp"        // Para Notifier
+#include "game/ui/service_menu.hpp"    // Para ServiceMenu
+#include "utils/utils.hpp"             // Para boolToOnOff
 
 namespace GlobalInputs {
     // Termina

source/core/input/input.cpp

@@ -1,4 +1,4 @@
-#include "input.hpp"
+#include "core/input/input.hpp"
 
 #include <SDL3/SDL.h>  // Para SDL_GetGamepadAxis, SDL_GamepadAxis, SDL_GamepadButton, SDL_GetError, SDL_JoystickID, SDL_AddGamepadMappingsFromFile, SDL_Event, SDL_EventType, SDL_GetGamepadButton, SDL_GetKeyboardState, SDL_INIT_GAMEPAD, SDL_InitSubSystem, SDL_LogError, SDL_OpenGamepad, SDL_PollEvent, SDL_WasInit, Sint16, SDL_Gamepad, SDL_LogCategory, SDL_Scancode
 

source/core/input/input.hpp

@@ -9,8 +9,8 @@
 #include <utility>        // Para pair
 #include <vector>         // Para vector
 
-#include "gamepad_config_manager.hpp"  // for GamepadConfig (ptr only), GamepadConfigs
-#include "input_types.hpp"             // for InputAction
+#include "core/input/gamepad_config_manager.hpp"  // for GamepadConfig (ptr only), GamepadConfigs
+#include "core/input/input_types.hpp"             // for InputAction
 
 // --- Clase Input: gestiona la entrada de teclado y mandos (singleton) ---
 class Input {

source/core/input/input_types.cpp

@@ -1,4 +1,4 @@
-#include "input_types.hpp"
+#include "core/input/input_types.hpp"
 
 #include <utility>  // Para pair
 

source/core/input/mouse.cpp

@@ -1,4 +1,4 @@
-#include "mouse.hpp"
+#include "core/input/mouse.hpp"
 
 #include <SDL3/SDL.h>  // Para SDL_GetTicks, Uint32, SDL_HideCursor, SDL_Show...