diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bd7b2ee1..502d057d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -89,7 +89,7 @@ set(
 
 add_executable(
   yaze
-  yaze.cc
+  app/yaze.cc
   app/rom.cc
   ${YAZE_APP_ASM_SRC}
   ${YAZE_APP_CORE_SRC}
diff --git a/src/yaze.cc b/src/app/yaze.cc
similarity index 92%
rename from src/yaze.cc
rename to src/app/yaze.cc
index 5c780550..a6b7e20b 100644
--- a/src/yaze.cc
+++ b/src/app/yaze.cc
@@ -1,4 +1,6 @@
-#include "yaze.h"
+#if defined(_WIN32)
+#define main SDL_main
+#endif
 
 #include "absl/debugging/failure_signal_handler.h"
 #include "absl/debugging/symbolize.h"
diff --git a/src/yaze.h b/src/yaze.h
deleted file mode 100644
index 2969582e..00000000
--- a/src/yaze.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef YAZE_H
-#define YAZE_H
-
-#if defined(_WIN32)
-#define main SDL_main
-#endif
-
-#include "absl/debugging/failure_signal_handler.h"
-#include "absl/debugging/symbolize.h"
-#include "app/core/controller.h"
-
-#endif /* YAZE_H */
\ No newline at end of file