diff --git a/Makefile b/Makefile
index ded46c6..a820dc2 100644
--- a/Makefile
+++ b/Makefile
@@ -89,6 +89,11 @@ APP_SOURCES := \
     source/game/entities/enemy.cpp \
     source/game/entities/item.cpp \
     source/game/gameplay/room.cpp \
+    source/game/gameplay/collision_map.cpp \
+    source/game/gameplay/enemy_manager.cpp \
+    source/game/gameplay/item_manager.cpp \
+    source/game/gameplay/room_loader.cpp \
+    source/game/gameplay/tilemap_renderer.cpp \
     source/game/gameplay/scoreboard.cpp \
     source/game/gameplay/cheevos.cpp \
     source/game/gameplay/item_tracker.cpp \
diff --git a/release/icon.icns b/release/icon.icns
index 1d6e777..4438408 100644
Binary files a/release/icon.icns and b/release/icon.icns differ
diff --git a/release/icon.ico b/release/icon.ico
index 690edcc..c3908da 100644
Binary files a/release/icon.ico and b/release/icon.ico differ
diff --git a/release/icon.png b/release/icon.png
index 818156c..892cc11 100644
Binary files a/release/icon.png and b/release/icon.png differ
diff --git a/source/core/system/debug.cpp b/source/core/system/debug.cpp
index 0ac6256..37739d0 100644
--- a/source/core/system/debug.cpp
+++ b/source/core/system/debug.cpp
@@ -1,5 +1,7 @@
 #include "core/system/debug.hpp"
 
+#ifdef _DEBUG
+
 #include <algorithm>  // Para max
 #include <memory>     // Para __shared_ptr_access, shared_ptr
 
@@ -52,4 +54,6 @@ void Debug::render() {
 void Debug::setPos(SDL_FPoint p) {
     x_ = p.x;
     y_ = p.y;
-}
\ No newline at end of file
+}
+
+#endif  // _DEBUG
\ No newline at end of file
diff --git a/source/core/system/director.cpp b/source/core/system/director.cpp
index 4ae4b6f..30aba0e 100644
--- a/source/core/system/director.cpp
+++ b/source/core/system/director.cpp
@@ -78,14 +78,14 @@ Director::Director(std::vector<std::string> const& args) {
 
     // 2. Validate pack integrity
     std::cout << "Validating pack integrity..." << '\n';
-    if (!jdd::ResourceLoader::get().validatePack()) {
+    if (!Resource::Loader::get().validatePack()) {
         std::cerr << "ERROR: Pack validation failed\n";
         exit(EXIT_FAILURE);
     }
 
     // 3. Load assets.txt from pack
     std::cout << "Loading assets configuration from pack..." << '\n';
-    std::string assets_config = jdd::ResourceLoader::get().loadAssetsConfig();
+    std::string assets_config = Resource::Loader::get().loadAssetsConfig();
     if (assets_config.empty()) {
         std::cerr << "ERROR: Failed to load assets.txt from pack\n";
         exit(EXIT_FAILURE);