idem

source/game/entities/balloon.cpp

@@ -1,14 +1,14 @@
-#include "balloon.hpp"
+#include "game/entities/balloon.hpp"
 
 #include <algorithm>  // Para clamp
 #include <array>      // Para array
 #include <cmath>      // Para fabs
 
-#include "animated_sprite.hpp"  // Para AnimatedSprite
-#include "audio.hpp"            // Para Audio
-#include "param.hpp"            // Para Param, ParamBalloon, param
-#include "sprite.hpp"           // Para Sprite
-#include "texture.hpp"          // Para Texture
+#include "core/audio/audio.hpp"                       // Para Audio
+#include "core/rendering/sprite/animated_sprite.hpp"  // Para AnimatedSprite
+#include "core/rendering/sprite/sprite.hpp"           // Para Sprite
+#include "core/rendering/texture.hpp"                 // Para Texture
+#include "utils/param.hpp"                            // Para Param, ParamBalloon, param
 
 // Constructor
 Balloon::Balloon(const Config& config)

source/game/entities/balloon.hpp

@@ -8,8 +8,8 @@
 #include <string_view>  // Para string_view
 #include <vector>       // Para vector
 
-#include "animated_sprite.hpp"  // Para AnimatedSprite
-#include "utils.hpp"            // Para Circle
+#include "core/rendering/sprite/animated_sprite.hpp"  // Para AnimatedSprite
+#include "utils/utils.hpp"                            // Para Circle
 
 class Texture;
 

source/game/entities/bullet.cpp

@@ -1,10 +1,10 @@
-#include "bullet.hpp"
+#include "game/entities/bullet.hpp"
 
 #include <memory>  // Para unique_ptr, make_unique
 #include <string>  // Para basic_string, string
 
-#include "param.hpp"     // Para Param, ParamGame, param
-#include "resource.hpp"  // Para Resource
+#include "core/resources/resource.hpp"  // Para Resource
+#include "utils/param.hpp"              // Para Param, ParamGame, param
 
 // Constructor
 Bullet::Bullet(float x, float y, Type type, Color color, int owner)

source/game/entities/bullet.hpp

@@ -5,8 +5,8 @@
 #include <memory>  // Para unique_ptr
 #include <string>  // Para string
 
-#include "animated_sprite.hpp"  // Para AnimatedSprite
-#include "utils.hpp"            // Para Circle
+#include "core/rendering/sprite/animated_sprite.hpp"  // Para AnimatedSprite
+#include "utils/utils.hpp"                            // Para Circle
 
 // --- Clase Bullet: representa una bala del jugador ---
 class Bullet {

source/game/entities/explosions.cpp

@@ -1,8 +1,8 @@
-#include "explosions.hpp"
+#include "game/entities/explosions.hpp"
 
 #include <utility>  // Para std::cmp_less
 
-#include "animated_sprite.hpp"  // Para AnimatedSprite
+#include "core/rendering/sprite/animated_sprite.hpp"  // Para AnimatedSprite
 
 class Texture;  // lines 4-4
 

source/game/entities/explosions.hpp

@@ -5,7 +5,7 @@
 #include <utility>  // Para move
 #include <vector>   // Para vector
 
-#include "animated_sprite.hpp"  // Para AnimatedSprite
+#include "core/rendering/sprite/animated_sprite.hpp"  // Para AnimatedSprite
 
 class Texture;
 

source/game/entities/item.cpp

@@ -1,11 +1,11 @@
-#include "item.hpp"
+#include "game/entities/item.hpp"
 
 #include <algorithm>  // Para clamp
 #include <cmath>      // Para fmod
 #include <cstdlib>    // Para rand
 
-#include "animated_sprite.hpp"  // Para AnimatedSprite
-#include "param.hpp"            // Para Param, ParamGame, param
+#include "core/rendering/sprite/animated_sprite.hpp"  // Para AnimatedSprite
+#include "utils/param.hpp"                            // Para Param, ParamGame, param
 
 class Texture;  // lines 6-6
 

source/game/entities/item.hpp

@@ -6,8 +6,8 @@
 #include <string>  // Para string
 #include <vector>  // Para vector
 
-#include "animated_sprite.hpp"  // Para AnimatedSprite
-#include "utils.hpp"            // Para Circle
+#include "core/rendering/sprite/animated_sprite.hpp"  // Para AnimatedSprite
+#include "utils/utils.hpp"                            // Para Circle
 
 class Texture;
 

source/game/entities/player.cpp

@@ -1,4 +1,4 @@
-#include "player.hpp"
+#include "game/entities/player.hpp"
 
 #include <SDL3/SDL.h>  // Para SDL_FlipMode
 
@@ -6,17 +6,17 @@
 #include <cmath>      // Para fmod
 #include <cstdlib>    // Para rand
 
-#include "animated_sprite.hpp"       // Para AnimatedSprite
-#include "asset.hpp"                 // Para Asset
-#include "audio.hpp"                 // Para Audio
-#include "cooldown.hpp"              // Para Cooldown
-#include "input.hpp"                 // Para Input
-#include "input_types.hpp"           // Para InputAction
-#include "manage_hiscore_table.hpp"  // Para ManageHiScoreTable, HiScoreEntry
-#include "param.hpp"                 // Para Param, ParamGame, param
-#include "scoreboard.hpp"            // Para Scoreboard
-#include "stage_interface.hpp"       // Para IStageInfo
-#include "texture.hpp"               // Para Texture
+#include "core/audio/audio.hpp"                       // Para Audio
+#include "core/input/input.hpp"                       // Para Input
+#include "core/input/input_types.hpp"                 // Para InputAction
+#include "core/rendering/sprite/animated_sprite.hpp"  // Para AnimatedSprite
+#include "core/rendering/texture.hpp"                 // Para Texture
+#include "core/resources/asset.hpp"                   // Para Asset
+#include "core/system/stage_interface.hpp"            // Para IStageInfo
+#include "game/gameplay/cooldown.hpp"                 // Para Cooldown
+#include "game/gameplay/manage_hiscore_table.hpp"     // Para ManageHiScoreTable, HiScoreEntry
+#include "game/gameplay/scoreboard.hpp"               // Para Scoreboard
+#include "utils/param.hpp"                            // Para Param, ParamGame, param
 
 // Constructor
 Player::Player(const Config& config)

source/game/entities/player.hpp

@@ -9,14 +9,14 @@
 #include <utility>   // Para move, pair
 #include <vector>    // Para vector
 
-#include "animated_sprite.hpp"  // for AnimatedSprite
-#include "bullet.hpp"           // for Bullet
-#include "cooldown.hpp"
-#include "enter_name.hpp"            // for EnterName
-#include "input.hpp"                 // for Input
-#include "manage_hiscore_table.hpp"  // for Table
-#include "scoreboard.hpp"            // for Scoreboard
-#include "utils.hpp"                 // for Circle
+#include "core/input/input.hpp"                       // for Input
+#include "core/rendering/sprite/animated_sprite.hpp"  // for AnimatedSprite
+#include "game/entities/bullet.hpp"                   // for Bullet
+#include "game/gameplay/cooldown.hpp"
+#include "game/gameplay/enter_name.hpp"            // for EnterName
+#include "game/gameplay/manage_hiscore_table.hpp"  // for Table
+#include "game/gameplay/scoreboard.hpp"            // for Scoreboard
+#include "utils/utils.hpp"                         // for Circle
 
 class IStageInfo;
 class Texture;

source/game/entities/tabe.cpp

@@ -1,5 +1,5 @@
 // IWYU pragma: no_include <bits/std_abs.h>
-#include "tabe.hpp"
+#include "game/entities/tabe.hpp"
 
 #include <SDL3/SDL.h>  // Para SDL_FlipMode, SDL_GetTicks
 
@@ -8,10 +8,10 @@
 #include <cstdlib>    // Para rand, abs
 #include <string>     // Para basic_string
 
-#include "audio.hpp"     // Para Audio
-#include "param.hpp"     // Para Param, param, ParamGame, ParamTabe
-#include "resource.hpp"  // Para Resource
-#include "utils.hpp"     // Para Zone
+#include "core/audio/audio.hpp"         // Para Audio
+#include "core/resources/resource.hpp"  // Para Resource
+#include "utils/param.hpp"              // Para Param, param, ParamGame, ParamTabe
+#include "utils/utils.hpp"              // Para Zone
 
 // Constructor
 Tabe::Tabe()

source/game/entities/tabe.hpp

@@ -5,7 +5,7 @@
 #include <cstdlib>  // Para rand
 #include <memory>   // Para unique_ptr
 
-#include "animated_sprite.hpp"  // Para AnimatedSprite
+#include "core/rendering/sprite/animated_sprite.hpp"  // Para AnimatedSprite
 
 // --- Clase Tabe ---
 class Tabe {