diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 107e8b9f..58c2a023 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -44,7 +44,7 @@ if (YAZE_BUILD_Z3ED)
   include(cli/z3ed.cmake)
 endif()
 if (YAZE_BUILD_PYTHON)
-  include(py/yaze_py.cmake)
+  include(cli/python/yaze_py.cmake)
 endif()
 if (YAZE_BUILD_TESTS)
   include(test/CMakeLists.txt)
@@ -53,13 +53,13 @@ endif()
 if(MACOS)
   set(MACOSX_BUNDLE_ICON_FILE ${CMAKE_SOURCE_DIR}/win32/yaze.ico)
   set_target_properties(yaze
-      PROPERTIES
-      BUNDLE True
-      ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
-      LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
-      RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
-      MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/cmake/yaze.plist.in
-      RESOURCE ${YAZE_RESOURCE_FILES}
+    PROPERTIES
+    BUNDLE True
+    ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
+    LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
+    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+    MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/cmake/yaze.plist.in
+    RESOURCE ${YAZE_RESOURCE_FILES}
   )
 elseif(UNIX)
   set_target_properties(yaze
@@ -72,13 +72,13 @@ elseif(UNIX)
   target_compile_definitions(yaze PRIVATE "linux")
   target_compile_definitions(yaze PRIVATE "stricmp=strcasecmp")
 else()
-set_target_properties(yaze
+  set_target_properties(yaze
     PROPERTIES
     ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
     LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
     RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
     LINK_FLAGS "${CMAKE_CURRENT_SOURCE_DIR}/win32/yaze.res"
-)
+  )
 endif()
 
 # Yaze C API
@@ -101,6 +101,7 @@ if (YAZE_BUILD_LIB)
     yaze_c PUBLIC
     lib/
     app/
+    ${CMAKE_SOURCE_DIR}/incl/
     ${CMAKE_SOURCE_DIR}/src/
     ${PNG_INCLUDE_DIRS}
     ${SDL2_INCLUDE_DIR}
diff --git a/src/py/yaze_py.cc b/src/cli/python/yaze_py.cc
similarity index 100%
rename from src/py/yaze_py.cc
rename to src/cli/python/yaze_py.cc
diff --git a/src/py/yaze_py.cmake b/src/cli/python/yaze_py.cmake
similarity index 100%
rename from src/py/yaze_py.cmake
rename to src/cli/python/yaze_py.cmake
diff --git a/src/cli/z3ed.cmake b/src/cli/z3ed.cmake
index 2c179068..f5138fd3 100644
--- a/src/cli/z3ed.cmake
+++ b/src/cli/z3ed.cmake
@@ -22,6 +22,7 @@ target_include_directories(
   lib/
   app/
   ${ASAR_INCLUDE_DIR}
+  ${CMAKE_SOURCE_DIR}/incl/
   ${CMAKE_SOURCE_DIR}/src/
   ${PNG_INCLUDE_DIRS}
   ${SDL2_INCLUDE_DIR}
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 42662524..c0397354 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -27,6 +27,7 @@ target_include_directories(
   yaze_test PUBLIC
   app/
   lib/
+  ${CMAKE_SOURCE_DIR}/incl/
   ${CMAKE_SOURCE_DIR}/src/
   ${CMAKE_SOURCE_DIR}/src/lib/imgui_test_engine
   ${ASAR_INCLUDE_DIR}
diff --git a/src/test/integration/test_editor.cc b/src/test/integration/test_editor.cc
index da19d975..53411800 100644
--- a/src/test/integration/test_editor.cc
+++ b/src/test/integration/test_editor.cc
@@ -48,7 +48,7 @@ int RunIntegrationTest() {
   yaze::app::core::Controller controller;
   controller.init_test_editor(&test_editor);
 
-  if (!controller.CreateSDL_Window().ok()) {
+  if (!controller.CreateWindow().ok()) {
     return EXIT_FAILURE;
   }
   if (!controller.CreateRenderer().ok()) {