diff --git a/.gitignore b/.gitignore
index f0064bbb..64ee3913 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,13 @@ build/
 .vscode/
 src/Library/SDL2
 src/Library/cmake
-src/Library/GL
\ No newline at end of file
+src/Library/GL
+src/Library/libGLEW.2.2.0.dylib
+src/Library/libGLEW.2.2.dylib
+src/Library/libGLEW.a
+src/Library/libGLEW.dylib
+src/Library/libSDL2_test.a
+src/Library/libSDL2-2.0.0.dylib
+src/Library/libSDL2.a
+src/Library/libSDL2.dylib
+src/Library/libSDL2main.a
\ No newline at end of file
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4c7a4b41..8735e988 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,3 +1,6 @@
+include_directories(Library/cmake)
+include_directories(/usr/local/Cellar/libpng/1.6.37/include/libpng16/)
+
 # find libraries --------------------------------------------------------------------------------------------------
 find_package(SDL2 REQUIRED)
 find_package(PNG REQUIRED)
@@ -27,6 +30,7 @@ target_compile_definitions(ImGuiColorTextEdit PUBLIC IMGUI_IMPL_OPENGL_LOADER_CU
 set(SNESHACKING_PATH "Library/sneshacking/src")
 file(GLOB SNESHACKING_SOURCES ${SNESHACKING_PATH}/*.c)
 add_library("NintendoCompression" STATIC ${SNESHACKING_SOURCES})
+target_include_directories(NintendoCompression PUBLIC "/usr/local/Cellar/libpng/1.6.37/include/libpng16")
 
 # Executable Linkage --------------------------------------------------------------------------------------
 add_executable(
@@ -34,8 +38,8 @@ add_executable(
     yaze.cc
     gui/input.cc
     gui/style.cc
-    gui/editor/editor.cc
-    gui/editor/overworld_editor.cc
+    app/editor/editor.cc
+    app/editor/overworld_editor.cc
     app/rom.cc
     app/core/constants.cc
     app/core/controller.cc
@@ -65,7 +69,7 @@ add_executable(
 
 target_include_directories(
   yaze PUBLIC
-  /
+  ${CMAKE_SOURCE_DIR}/src/
   Library/
   app/
   "C:/msys64/mingw64/include/libpng16"
@@ -79,7 +83,6 @@ target_include_directories(
 
 target_link_libraries(
   yaze
-  libstdc++ 
   SDL2main
   ${PNG_LIBRARIES}
   ${SDL2_LIBRARIES} 
diff --git a/src/Library/ImGuiFileDialog b/src/Library/ImGuiFileDialog
index cd23fd9d..25780cf7 160000
--- a/src/Library/ImGuiFileDialog
+++ b/src/Library/ImGuiFileDialog
@@ -1 +1 @@
-Subproject commit cd23fd9d8b1694ddf18bebe3667a07ba2ccbf916
+Subproject commit 25780cf76e9899c0f5a43d274ca0b0639ab7c9f6
diff --git a/src/Library/imgui b/src/Library/imgui
index 0b1bcfcc..9aae45eb 160000
--- a/src/Library/imgui
+++ b/src/Library/imgui
@@ -1 +1 @@
-Subproject commit 0b1bcfcc205077d31493ec851f87ca4b54b4eab5
+Subproject commit 9aae45eb4a05a5a1f96be1ef37eb503a12ceb889