diff --git a/.gitignore b/.gitignore
index 6178079..3124628 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-b
+b/
+imgui.ini
+compile_commands.json
diff --git a/.gitmodules b/.gitmodules
index 0753f15..74c9de9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "vendor/compilecommands"]
 	path = vendor/compilecommands
 	url = https://github.com/danielbarter/mini_compile_commands
+[submodule "vendor/imgui"]
+	path = vendor/imgui
+	url = https://github.com/ocornut/imgui
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 13566b8..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 431ff2f..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DiscordProjectSettings">
-    <option name="show" value="ASK" />
-    <option name="description" value="" />
-  </component>
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="MakefileSettings">
-    <option name="linkedExternalProjectsSettings">
-      <MakefileProjectSettings>
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="version" value="2" />
-      </MakefileProjectSettings>
-    </option>
-  </component>
-  <component name="MakefileWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
-</project>
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 2814be2..0000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "Lua.runtime.version": "LuaJIT",
-    "Lua.runtime.special": {
-        "love.filesystem.load": "loadfile"
-    },
-    "Lua.workspace.library": [
-        "${3rd}/love2d/library",
-        "/home/interfiber/.vscode/extensions/sumneko.lua-3.6.20-linux-x64/server/meta/423b747a"
-    ]
-}
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a895b0d..44ea6e9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,10 +8,10 @@ find_package(SDL2_image REQUIRED)
 include_directories(${SDL2_INCLUDE_DIRS})
 include_directories(${SDL2_image_INCLUDE_DIRS})
 include_directories("include")
-include_directories("imgui")
-include_directories("imgui/backends")
+include_directories("vendor/imgui")
+include_directories("vendor/imgui/backends")
 
 file(GLOB_RECURSE source_files "src/*.cpp" "src/*.hpp")
 
-add_executable(PhoenixGame ${source_files} imgui/imgui.cpp imgui/imgui_draw.cpp imgui/imgui_widgets.cpp imgui/imgui_demo.cpp imgui/imgui_tables.cpp imgui/backends/imgui_impl_sdl2.cpp imgui/backends/imgui_impl_sdlrenderer.cpp imgui/misc/cpp/imgui_stdlib.cpp)
-target_link_libraries(PhoenixGame ${SDL2_LIBRARIES} SDL2_image)
\ No newline at end of file
+add_executable(PhoenixGame ${source_files} vendor/imgui/imgui.cpp vendor/imgui/imgui_draw.cpp vendor/imgui/imgui_widgets.cpp vendor/imgui/imgui_demo.cpp vendor/imgui/imgui_tables.cpp vendor/imgui/backends/imgui_impl_sdl2.cpp vendor/imgui/backends/imgui_impl_sdlrenderer.cpp vendor/imgui/misc/cpp/imgui_stdlib.cpp)
+target_link_libraries(PhoenixGame ${SDL2_LIBRARIES} SDL2_image)
diff --git a/imgui.ini b/imgui.ini
index 02ad72f..2a86ce0 100644
--- a/imgui.ini
+++ b/imgui.ini
@@ -4,7 +4,7 @@ Size=400,400
 Collapsed=0
 
 [Window][Phoenix Map Editor]
-Pos=1347,1144
+Pos=852,577
 Size=521,71
 Collapsed=0
 
diff --git a/imgui b/vendor/imgui
similarity index 100%
rename from imgui
rename to vendor/imgui