idem

source/game/gameplay/balloon_formations.cpp

@@ -1,4 +1,4 @@
-#include "balloon_formations.hpp"
+#include "game/gameplay/balloon_formations.hpp"
 
 #include <algorithm>  // Para max, min, copy
 #include <array>      // Para array
@@ -12,10 +12,10 @@
 #include <string>     // Para string, char_traits, allocator, operator==, stoi, getline, operator<=>, basic_string
 #include <utility>    // Para std::cmp_less
 
-#include "asset.hpp"    // Para Asset
-#include "balloon.hpp"  // Para Balloon
-#include "param.hpp"    // Para Param, ParamGame, param
-#include "utils.hpp"    // Para Zone, BLOCK
+#include "core/resources/asset.hpp"   // Para Asset
+#include "game/entities/balloon.hpp"  // Para Balloon
+#include "utils/param.hpp"            // Para Param, ParamGame, param
+#include "utils/utils.hpp"            // Para Zone, BLOCK
 
 void BalloonFormations::initFormations() {
     // Calcular posiciones base

source/game/gameplay/balloon_formations.hpp

@@ -8,7 +8,7 @@
 #include <utility>   // Para pair
 #include <vector>    // Para vector
 
-#include "balloon.hpp"  // for Balloon
+#include "game/entities/balloon.hpp"  // for Balloon
 
 // --- Clase BalloonFormations ---
 class BalloonFormations {

source/game/gameplay/balloon_manager.cpp

@@ -1,19 +1,19 @@
-#include "balloon_manager.hpp"
+#include "game/gameplay/balloon_manager.hpp"
 
 #include <algorithm>  // Para remove_if
 #include <array>
 #include <cstdlib>  // Para rand
 #include <numeric>  // Para accumulate
 
-#include "balloon.hpp"             // Para Balloon, Balloon::SCORE.at( )ALLOON_VELX...
-#include "balloon_formations.hpp"  // Para BalloonFormationParams, BalloonForma...
-#include "color.hpp"               // Para Zone, Color, flash_color
-#include "explosions.hpp"          // Para Explosions
-#include "param.hpp"               // Para Param, ParamGame, param
-#include "resource.hpp"            // Para Resource
-#include "screen.hpp"              // Para Screen
-#include "stage_interface.hpp"     // Para IStageInfo
-#include "utils.hpp"
+#include "core/rendering/screen.hpp"             // Para Screen
+#include "core/resources/resource.hpp"           // Para Resource
+#include "core/system/stage_interface.hpp"       // Para IStageInfo
+#include "game/entities/balloon.hpp"             // Para Balloon, Balloon::SCORE.at( )ALLOON_VELX...
+#include "game/entities/explosions.hpp"          // Para Explosions
+#include "game/gameplay/balloon_formations.hpp"  // Para BalloonFormationParams, BalloonForma...
+#include "utils/color.hpp"                       // Para Zone, Color, flash_color
+#include "utils/param.hpp"                       // Para Param, ParamGame, param
+#include "utils/utils.hpp"
 
 // Constructor
 BalloonManager::BalloonManager(IStageInfo* stage_info)

source/game/gameplay/balloon_manager.hpp

@@ -8,11 +8,11 @@
 #include <string>  // Para basic_string, string
 #include <vector>  // Para vector
 
-#include "balloon.hpp"             // for Balloon
-#include "balloon_formations.hpp"  // for BalloonFormations
-#include "explosions.hpp"          // for Explosions
-#include "param.hpp"               // for Param, ParamGame, param
-#include "utils.hpp"               // for Zone
+#include "game/entities/balloon.hpp"             // for Balloon
+#include "game/entities/explosions.hpp"          // for Explosions
+#include "game/gameplay/balloon_formations.hpp"  // for BalloonFormations
+#include "utils/param.hpp"                       // for Param, ParamGame, param
+#include "utils/utils.hpp"                       // for Zone
 
 class IStageInfo;
 class Texture;

source/game/gameplay/bullet_manager.cpp

@@ -1,11 +1,11 @@
-#include "bullet_manager.hpp"
+#include "game/gameplay/bullet_manager.hpp"
 
 #include <algorithm>  // Para remove_if
 #include <utility>
 
-#include "bullet.hpp"  // Para Bullet
-#include "param.hpp"   // Para Param, ParamGame, param
-#include "utils.hpp"   // Para Circle, Zone
+#include "game/entities/bullet.hpp"  // Para Bullet
+#include "utils/param.hpp"           // Para Param, ParamGame, param
+#include "utils/utils.hpp"           // Para Circle, Zone
 
 // Constructor
 BulletManager::BulletManager()

source/game/gameplay/bullet_manager.hpp

@@ -7,7 +7,7 @@
 #include <memory>      // Para shared_ptr
 #include <vector>      // Para vector
 
-#include "bullet.hpp"  // for Bullet
+#include "game/entities/bullet.hpp"  // for Bullet
 
 // --- Types ---
 using Bullets = std::list<std::shared_ptr<Bullet>>;

source/game/gameplay/difficulty.cpp

@@ -1,4 +1,4 @@
-#include "difficulty.hpp"
+#include "game/gameplay/difficulty.hpp"
 
 #include <vector>  // Para vector
 

source/game/gameplay/enter_name.cpp

@@ -1,4 +1,4 @@
-#include "enter_name.hpp"
+#include "game/gameplay/enter_name.hpp"
 
 #include <array>        // Para array
 #include <cstdlib>      // Para rand

source/game/gameplay/game_logo.cpp

@@ -1,19 +1,19 @@
-#include "game_logo.hpp"
+#include "game/gameplay/game_logo.hpp"
 
 #include <SDL3/SDL.h>  // Para SDL_SetTextureScaleMode, SDL_FlipMode, SDL_ScaleMode
 
 #include <algorithm>  // Para max
 #include <string>     // Para basic_string
 
-#include "animated_sprite.hpp"  // Para AnimatedSprite
-#include "audio.hpp"            // Para Audio
-#include "color.hpp"            // Para Color
-#include "param.hpp"            // Para Param, param, ParamGame, ParamTitle
-#include "resource.hpp"         // Para Resource
-#include "screen.hpp"           // Para Screen
-#include "smart_sprite.hpp"     // Para SmartSprite
-#include "sprite.hpp"           // Para Sprite
-#include "texture.hpp"          // Para Texture
+#include "core/audio/audio.hpp"                       // Para Audio
+#include "core/rendering/screen.hpp"                  // Para Screen
+#include "core/rendering/sprite/animated_sprite.hpp"  // Para AnimatedSprite
+#include "core/rendering/sprite/smart_sprite.hpp"     // Para SmartSprite
+#include "core/rendering/sprite/sprite.hpp"           // Para Sprite
+#include "core/rendering/texture.hpp"                 // Para Texture
+#include "core/resources/resource.hpp"                // Para Resource
+#include "utils/color.hpp"                            // Para Color
+#include "utils/param.hpp"                            // Para Param, param, ParamGame, ParamTitle
 
 constexpr int ZOOM_FACTOR = 5;
 constexpr float FLASH_DELAY_S = 0.05F;                  // 3 frames → 0.05s

source/game/gameplay/game_logo.hpp

@@ -2,9 +2,9 @@
 
 #include <memory>  // Para unique_ptr, shared_ptr
 
-#include "animated_sprite.hpp"  // Para AnimatedSprite
-#include "smart_sprite.hpp"     // Para SmartSprite
-#include "sprite.hpp"           // Para Sprite
+#include "core/rendering/sprite/animated_sprite.hpp"  // Para AnimatedSprite
+#include "core/rendering/sprite/smart_sprite.hpp"     // Para SmartSprite
+#include "core/rendering/sprite/sprite.hpp"           // Para Sprite
 
 class Texture;
 

source/game/gameplay/manage_hiscore_table.cpp

@@ -1,4 +1,4 @@
-#include "manage_hiscore_table.hpp"
+#include "game/gameplay/manage_hiscore_table.hpp"
 
 #include <SDL3/SDL.h>  // Para SDL_ReadIO, SDL_WriteIO, SDL_CloseIO, SDL_GetError, SDL_IOFromFile, SDL_LogError, SDL_LogCategory, SDL_LogInfo
 
@@ -11,7 +11,7 @@
 #include <ranges>      // Para __find_if_fn, find_if
 #include <utility>     // Para move
 
-#include "utils.hpp"  // Para getFileName
+#include "utils/utils.hpp"  // Para getFileName
 
 // Resetea la tabla a los valores por defecto
 void ManageHiScoreTable::clear() {

source/game/gameplay/scoreboard.cpp

@@ -1,4 +1,4 @@
-#include "scoreboard.hpp"
+#include "game/gameplay/scoreboard.hpp"
 
 #include <SDL3/SDL.h>  // Para SDL_DestroyTexture, SDL_SetRenderDrawColor, SDL_SetRenderTarget, SDL_CreateTexture, SDL_GetRenderTarget, SDL_GetTicks, SDL_RenderClear, SDL_RenderLine, SDL_RenderTexture, SDL_SetTextureBlendMode, SDL_FRect, SDL_BLENDMODE_BLEND, SDL_PixelFormat, SDL_Texture, SDL_TextureAccess
 
@@ -8,16 +8,16 @@
 #include <iostream>
 #include <sstream>  // Para basic_ostream, basic_ostringstream, basic_ostream::operator<<, ostringstream
 
-#include "color.hpp"
-#include "enter_name.hpp"  // Para NAME_SIZE
-#include "lang.hpp"        // Para getText
-#include "param.hpp"       // Para Param, ParamScoreboard, param
-#include "resource.hpp"    // Para Resource
-#include "screen.hpp"      // Para Screen
-#include "sprite.hpp"      // Para Sprite
-#include "text.hpp"        // Para Text, Text::CENTER, Text::COLOR
-#include "texture.hpp"     // Para Texture
-#include "utils.hpp"       // Para easeOutCubic
+#include "core/locale/lang.hpp"              // Para getText
+#include "core/rendering/screen.hpp"         // Para Screen
+#include "core/rendering/sprite/sprite.hpp"  // Para Sprite
+#include "core/rendering/text.hpp"           // Para Text, Text::CENTER, Text::COLOR
+#include "core/rendering/texture.hpp"        // Para Texture
+#include "core/resources/resource.hpp"       // Para Resource
+#include "game/gameplay/enter_name.hpp"      // Para NAME_SIZE
+#include "utils/color.hpp"
+#include "utils/param.hpp"  // Para Param, ParamScoreboard, param
+#include "utils/utils.hpp"  // Para easeOutCubic
 
 // .at(SINGLETON) Hay que definir las variables estáticas, desde el .h sólo la hemos declarado
 Scoreboard* Scoreboard::instance = nullptr;

source/game/gameplay/scoreboard.hpp

@@ -11,7 +11,7 @@
 // Forward declarations
 class EnterName;
 
-#include "color.hpp"  // Para Color
+#include "utils/color.hpp"  // Para Color
 
 class Sprite;
 class Text;

source/game/gameplay/stage.cpp

@@ -1,4 +1,4 @@
-#include "stage.hpp"
+#include "game/gameplay/stage.hpp"
 
 #include <algorithm>  // Para max, min
 #include <exception>  // Para exception

source/game/gameplay/stage.hpp

@@ -6,7 +6,7 @@
 #include <string>      // Para basic_string, string
 #include <vector>      // Para vector
 
-#include "stage_interface.hpp"  // for IStageInfo
+#include "core/system/stage_interface.hpp"  // for IStageInfo
 
 // --- Enums ---
 enum class PowerCollectionState {