diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d8bad67c..f86ceab8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -34,10 +34,10 @@ add_executable(
     yaze.cc
     gui/input.cc
     gui/style.cc
-    application/Core/controller.cc
-    application/Data/rom.cc
-    application/Data/OW/overworld.cc
-    application/Data/OW/overworld_map.cc
+    application/rom.cc
+    application/core/controller.cc
+    application/zelda3/overworld.cc
+    application/zelda3/overworld_map.cc
     application/gfx/bitmap.cc
     application/gfx/tile.cc
     application/gfx/palette.cc
diff --git a/src/application/Editor/editor.cc b/src/application/Editor/editor.cc
index 4ba9e27b..7bef43ef 100644
--- a/src/application/Editor/editor.cc
+++ b/src/application/Editor/editor.cc
@@ -7,12 +7,12 @@
 #include <imgui/misc/cpp/imgui_stdlib.h>
 
 #include "Core/constants.h"
-#include "Data/rom.h"
 #include "Editor/overworld_editor.h"
 #include "gfx/palette.h"
 #include "gfx/tile.h"
 #include "gui/icons.h"
 #include "gui/input.h"
+#include "rom.h"
 
 namespace yaze {
 namespace application {
diff --git a/src/application/Editor/editor.h b/src/application/Editor/editor.h
index 5c1e2349..6b4b5a9a 100644
--- a/src/application/Editor/editor.h
+++ b/src/application/Editor/editor.h
@@ -8,11 +8,11 @@
 #include <imgui/misc/cpp/imgui_stdlib.h>
 
 #include "Core/constants.h"
-#include "Data/rom.h"
 #include "Editor/overworld_editor.h"
 #include "gfx/tile.h"
 #include "gui/icons.h"
 #include "gui/input.h"
+#include "rom.h"
 
 namespace yaze {
 namespace application {
diff --git a/src/application/Editor/overworld_editor.h b/src/application/Editor/overworld_editor.h
index 73864f56..6f52b647 100644
--- a/src/application/Editor/overworld_editor.h
+++ b/src/application/Editor/overworld_editor.h
@@ -3,7 +3,7 @@
 
 #include <imgui/imgui.h>
 
-#include "Data/OW/overworld.h"
+#include "zelda3/overworld.h"
 #include "gfx/palette.h"
 #include "gfx/tile.h"
 #include "gui/icons.h"
diff --git a/src/application/gfx/bitmap.cc b/src/application/gfx/bitmap.cc
index 3cdb6196..bbb82bdb 100644
--- a/src/application/gfx/bitmap.cc
+++ b/src/application/gfx/bitmap.cc
@@ -2,7 +2,7 @@
 
 #include <rommapping.h>
 
-#include "Data/rom.h"
+#include "rom.h"
 
 namespace yaze {
 namespace application {
diff --git a/src/application/Data/rom.cc b/src/application/rom.cc
similarity index 100%
rename from src/application/Data/rom.cc
rename to src/application/rom.cc
diff --git a/src/application/Data/rom.h b/src/application/rom.h
similarity index 100%
rename from src/application/Data/rom.h
rename to src/application/rom.h
diff --git a/src/application/Data/OW/overworld.cc b/src/application/zelda3/overworld.cc
similarity index 99%
rename from src/application/Data/OW/overworld.cc
rename to src/application/zelda3/overworld.cc
index 0c047463..557ac6f7 100644
--- a/src/application/Data/OW/overworld.cc
+++ b/src/application/zelda3/overworld.cc
@@ -1,6 +1,7 @@
 #include "overworld.h"
 
 #include "gfx/tile.h"
+#include "rom.h"
 
 namespace yaze {
 namespace application {
@@ -40,7 +41,7 @@ static TileInfo GetTilesInfo(ushort tile) {
   return TileInfo(tid, p, v, h, o);
 }
 
-void Overworld::Load(Data::ROM & rom) {
+void Overworld::Load(Data::ROM& rom) {
   rom_ = rom;
   for (int i = 0; i < 0x2B; i++) {
     tileLeftEntrance.push_back(Constants::overworldEntranceAllowedTilesLeft +
diff --git a/src/application/Data/OW/overworld.h b/src/application/zelda3/overworld.h
similarity index 96%
rename from src/application/Data/OW/overworld.h
rename to src/application/zelda3/overworld.h
index 8185e549..68cb7831 100644
--- a/src/application/Data/OW/overworld.h
+++ b/src/application/zelda3/overworld.h
@@ -7,10 +7,10 @@
 #include <vector>
 
 #include "Core/constants.h"
-#include "Data/rom.h"
 #include "gfx/bitmap.h"
 #include "gfx/tile.h"
 #include "overworld_map.h"
+#include "rom.h"
 
 namespace yaze {
 namespace application {
@@ -21,7 +21,7 @@ class Overworld {
   Overworld() = default;
   ~Overworld();
 
-  void Load(Data::ROM & rom);
+  void Load(Data::ROM& rom);
 
   char* overworldMapPointer = new char[0x40000];
   gfx::Bitmap* overworldMapBitmap;
diff --git a/src/application/Data/OW/overworld_map.cc b/src/application/zelda3/overworld_map.cc
similarity index 96%
rename from src/application/Data/OW/overworld_map.cc
rename to src/application/zelda3/overworld_map.cc
index 4aa1ebd9..6f01c273 100644
--- a/src/application/Data/OW/overworld_map.cc
+++ b/src/application/zelda3/overworld_map.cc
@@ -1,6 +1,6 @@
 #include "overworld_map.h"
 
-#include "Data/rom.h"
+#include "rom.h"
 #include "gfx/tile.h"
 
 namespace yaze {
diff --git a/src/application/Data/OW/overworld_map.h b/src/application/zelda3/overworld_map.h
similarity index 95%
rename from src/application/Data/OW/overworld_map.h
rename to src/application/zelda3/overworld_map.h
index 5fe27f52..8eac04c2 100644
--- a/src/application/Data/OW/overworld_map.h
+++ b/src/application/zelda3/overworld_map.h
@@ -3,7 +3,7 @@
 #include <cstddef>
 #include <memory>
 
-#include "Data/rom.h"
+#include "rom.h"
 #include "gfx/bitmap.h"
 #include "gfx/tile.h"
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e0061b74..bdce6c02 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -16,7 +16,7 @@ set(SNESHACKING_PATH "../src/Library/sneshacking/src")
 add_executable(
   yaze_test
   yaze_test.cc
-  ../src/application/Data/rom.cc
+  ../src/application/rom.cc
   ../src/application/gfx/tile.cc
   ../src/application/gfx/tile.cc
   ../src/application/gfx/palette.cc