diff --git a/CMakeLists.txt b/CMakeLists.txt
index 042f0ebd6672883505759bc59dba74c6459566d1..401ce51dca32ea4f29846dbd886b590f88124806 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -326,8 +326,8 @@ set(IMGUI_FILES
 source_group("imgui Files" FILES ${IMGUI_FILES})
 
 set(APP_SHADERS
-        res/tool/imgui/imgui.frag
-        res/tool/imgui/imgui.vert
+        res/imgui/imgui.frag
+        res/imgui/imgui.vert
         )
 
 source_group("Shader Files" FILES ${APP_SHADERS})
diff --git a/doc/Demo.md b/doc/Demo.md
index 72b1fb82ead18e3d06ab66d687627fda1ffc4623..d355bb6fca03cc21630a0a70a67555d48186279a 100644
--- a/doc/Demo.md
+++ b/doc/Demo.md
@@ -14,7 +14,7 @@ You can find the demonstration projects in the `liblava-demo` folder
 
 *Apache License, Version 2.0* / [GitHub](https://github.com/google/fonts/tree/master/apache/roboto) / [Website](https://fonts.google.com/specimen/Roboto)
 
-* [Roboto-Regular.ttf](../res/font/imgui/Roboto-Regular.ttf)
+* [Roboto-Regular.ttf](../res/font/Roboto-Regular.ttf)
 
 ## Font Awesome
 
diff --git a/liblava/app/app.cpp b/liblava/app/app.cpp
index 7c4c73f103d4b79ed4ae6459e64c1c282592449c..adab17e6190aefef63af47c3e6e4a1a4ae0515f1 100644
--- a/liblava/app/app.cpp
+++ b/liblava/app/app.cpp
@@ -159,9 +159,9 @@ namespace lava {
 
     bool app::create_imgui() {
         if (config.imgui_font.file.empty()) {
-            auto font_files = file_system::enumerate_files(_imgui_font_path_);
+            auto font_files = file_system::enumerate_files(_font_path_);
             if (!font_files.empty())
-                config.imgui_font.file = fmt::format("{}{}", _imgui_font_path_, str(font_files.front()));
+                config.imgui_font.file = fmt::format("{}{}", _font_path_, str(font_files.front()));
         }
 
         setup_imgui_font(imgui_config, config.imgui_font);
diff --git a/liblava/app/def.hpp b/liblava/app/def.hpp
index b4a0228c5c036c324219b01bb929c6c42404f102..89f8a93558449e5436a2b49f14948b898bdcfd94 100644
--- a/liblava/app/def.hpp
+++ b/liblava/app/def.hpp
@@ -26,6 +26,7 @@ namespace lava {
     constexpr name _lava_texture_staging_ = "lava texture staging";
 
     // res folder
+    constexpr name _font_path_ = "font/";
     constexpr name _font_icon_path_ = "font/icon/";
 
 } // namespace lava
diff --git a/liblava/app/imgui.cpp b/liblava/app/imgui.cpp
index 2742e23fe1759e678fd47478919e96ae0f8e70c5..12756aeb891ef2546f412491c9e21e413c57c2a3 100644
--- a/liblava/app/imgui.cpp
+++ b/liblava/app/imgui.cpp
@@ -280,11 +280,11 @@ namespace lava {
 #undef MAP_ANALOG
 
     static ui32 imgui_vert_shader[] = {
-#include "res/tool/imgui/imgui.vert.u32"
+#include "res/imgui/imgui.vert.u32"
     };
 
     static ui32 imgui_frag_shader[] = {
-#include "res/tool/imgui/imgui.frag.u32"
+#include "res/imgui/imgui.frag.u32"
     };
 
     bool imgui::create(graphics_pipeline::ptr p, index mf) {
diff --git a/liblava/app/imgui.hpp b/liblava/app/imgui.hpp
index c516babf6394ea87746ace7fad2fa216391397af..181ba32236a5de0bb838ced53937a809ae4286c1 100644
--- a/liblava/app/imgui.hpp
+++ b/liblava/app/imgui.hpp
@@ -157,8 +157,6 @@ namespace lava {
         bool active = true;
     };
 
-    constexpr name _imgui_font_path_ = "font/imgui/";
-
     void setup_imgui_font(imgui::config& config, imgui::font::ref font);
 
 } // namespace lava
diff --git a/res/font/imgui/Roboto-Regular.ttf b/res/font/Roboto-Regular.ttf
similarity index 100%
rename from res/font/imgui/Roboto-Regular.ttf
rename to res/font/Roboto-Regular.ttf
diff --git a/res/tool/imgui/gen_spirv.bat b/res/imgui/gen_spirv.bat
similarity index 100%
rename from res/tool/imgui/gen_spirv.bat
rename to res/imgui/gen_spirv.bat
diff --git a/res/tool/imgui/gen_spirv.sh b/res/imgui/gen_spirv.sh
similarity index 100%
rename from res/tool/imgui/gen_spirv.sh
rename to res/imgui/gen_spirv.sh
diff --git a/res/tool/imgui/imgui.frag b/res/imgui/imgui.frag
similarity index 100%
rename from res/tool/imgui/imgui.frag
rename to res/imgui/imgui.frag
diff --git a/res/tool/imgui/imgui.frag.u32 b/res/imgui/imgui.frag.u32
similarity index 100%
rename from res/tool/imgui/imgui.frag.u32
rename to res/imgui/imgui.frag.u32
diff --git a/res/tool/imgui/imgui.vert b/res/imgui/imgui.vert
similarity index 100%
rename from res/tool/imgui/imgui.vert
rename to res/imgui/imgui.vert
diff --git a/res/tool/imgui/imgui.vert.u32 b/res/imgui/imgui.vert.u32
similarity index 100%
rename from res/tool/imgui/imgui.vert.u32
rename to res/imgui/imgui.vert.u32