diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0444e79..a29f9a6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ project(lsfg-vk
     LANGUAGES CXX)
 
 file(GLOB SOURCES
-    "src/loader/*.cpp"
+    "src/utils/*.cpp"
     "src/mini/*.cpp"
     "src/*.cpp"
 )
diff --git a/include/log.hpp b/include/utils/log.hpp
similarity index 100%
rename from include/log.hpp
rename to include/utils/log.hpp
diff --git a/include/utils.hpp b/include/utils/utils.hpp
similarity index 100%
rename from include/utils.hpp
rename to include/utils/utils.hpp
index 136d50f..0989e2d 100644
--- a/include/utils.hpp
+++ b/include/utils/utils.hpp
@@ -1,9 +1,9 @@
 #ifndef UTILS_HPP
 #define UTILS_HPP
 
-#include <vector>
 #include <vulkan/vulkan_core.h>
 
+#include <vector>
 #include <utility>
 
 namespace Utils {
diff --git a/lsfg-vk-gen/CMakeLists.txt b/lsfg-vk-gen/CMakeLists.txt
index 580c36b..592d809 100644
--- a/lsfg-vk-gen/CMakeLists.txt
+++ b/lsfg-vk-gen/CMakeLists.txt
@@ -4,6 +4,7 @@ file(GLOB BACKEND_SOURCES
     "src/core/*.cpp"
     "src/pool/*.cpp"
     "src/shaderchains/*.cpp"
+    "src/utils/*.cpp"
     "src/*.cpp"
 )
 
diff --git a/lsfg-vk-gen/include/utils.hpp b/lsfg-vk-gen/include/utils/utils.hpp
similarity index 100%
rename from lsfg-vk-gen/include/utils.hpp
rename to lsfg-vk-gen/include/utils/utils.hpp
diff --git a/lsfg-vk-gen/src/lsfg.cpp b/lsfg-vk-gen/src/lsfg.cpp
index f3fcab9..5f39ea4 100644
--- a/lsfg-vk-gen/src/lsfg.cpp
+++ b/lsfg-vk-gen/src/lsfg.cpp
@@ -3,7 +3,7 @@
 #include "core/instance.hpp"
 #include "context.hpp"
 #include "pool/shaderpool.hpp"
-#include "utils.hpp"
+#include "utils/utils.hpp"
 
 #include <cstdlib>
 #include <ctime>
diff --git a/lsfg-vk-gen/src/shaderchains/alpha.cpp b/lsfg-vk-gen/src/shaderchains/alpha.cpp
index 8f525ca..61f75d3 100644
--- a/lsfg-vk-gen/src/shaderchains/alpha.cpp
+++ b/lsfg-vk-gen/src/shaderchains/alpha.cpp
@@ -1,5 +1,5 @@
 #include "shaderchains/alpha.hpp"
-#include "utils.hpp"
+#include "utils/utils.hpp"
 
 using namespace LSFG::Shaderchains;
 
diff --git a/lsfg-vk-gen/src/shaderchains/beta.cpp b/lsfg-vk-gen/src/shaderchains/beta.cpp
index 48294df..a9e012f 100644
--- a/lsfg-vk-gen/src/shaderchains/beta.cpp
+++ b/lsfg-vk-gen/src/shaderchains/beta.cpp
@@ -1,5 +1,5 @@
 #include "shaderchains/beta.hpp"
-#include "utils.hpp"
+#include "utils/utils.hpp"
 
 using namespace LSFG::Shaderchains;
 
diff --git a/lsfg-vk-gen/src/shaderchains/delta.cpp b/lsfg-vk-gen/src/shaderchains/delta.cpp
index efceb6d..333492d 100644
--- a/lsfg-vk-gen/src/shaderchains/delta.cpp
+++ b/lsfg-vk-gen/src/shaderchains/delta.cpp
@@ -1,5 +1,5 @@
 #include "shaderchains/delta.hpp"
-#include "utils.hpp"
+#include "utils/utils.hpp"
 
 using namespace LSFG::Shaderchains;
 
diff --git a/lsfg-vk-gen/src/shaderchains/downsample.cpp b/lsfg-vk-gen/src/shaderchains/downsample.cpp
index acd028d..7af81fe 100644
--- a/lsfg-vk-gen/src/shaderchains/downsample.cpp
+++ b/lsfg-vk-gen/src/shaderchains/downsample.cpp
@@ -1,5 +1,5 @@
 #include "shaderchains/downsample.hpp"
-#include "utils.hpp"
+#include "utils/utils.hpp"
 
 using namespace LSFG::Shaderchains;
 
diff --git a/lsfg-vk-gen/src/shaderchains/epsilon.cpp b/lsfg-vk-gen/src/shaderchains/epsilon.cpp
index 461d0e1..59c87d7 100644
--- a/lsfg-vk-gen/src/shaderchains/epsilon.cpp
+++ b/lsfg-vk-gen/src/shaderchains/epsilon.cpp
@@ -1,5 +1,5 @@
 #include "shaderchains/epsilon.hpp"
-#include "utils.hpp"
+#include "utils/utils.hpp"
 
 using namespace LSFG::Shaderchains;
 
diff --git a/lsfg-vk-gen/src/shaderchains/extract.cpp b/lsfg-vk-gen/src/shaderchains/extract.cpp
index 56c7e0b..8251bd8 100644
--- a/lsfg-vk-gen/src/shaderchains/extract.cpp
+++ b/lsfg-vk-gen/src/shaderchains/extract.cpp
@@ -1,5 +1,5 @@
 #include "shaderchains/extract.hpp"
-#include "utils.hpp"
+#include "utils/utils.hpp"
 
 using namespace LSFG::Shaderchains;
 
diff --git a/lsfg-vk-gen/src/shaderchains/gamma.cpp b/lsfg-vk-gen/src/shaderchains/gamma.cpp
index b60ed43..66ba284 100644
--- a/lsfg-vk-gen/src/shaderchains/gamma.cpp
+++ b/lsfg-vk-gen/src/shaderchains/gamma.cpp
@@ -1,5 +1,5 @@
 #include "shaderchains/gamma.hpp"
-#include "utils.hpp"
+#include "utils/utils.hpp"
 
 using namespace LSFG::Shaderchains;
 
diff --git a/lsfg-vk-gen/src/shaderchains/magic.cpp b/lsfg-vk-gen/src/shaderchains/magic.cpp
index f3ccd00..1b74a35 100644
--- a/lsfg-vk-gen/src/shaderchains/magic.cpp
+++ b/lsfg-vk-gen/src/shaderchains/magic.cpp
@@ -1,5 +1,5 @@
 #include "shaderchains/magic.hpp"
-#include "utils.hpp"
+#include "utils/utils.hpp"
 
 using namespace LSFG::Shaderchains;
 
diff --git a/lsfg-vk-gen/src/shaderchains/merge.cpp b/lsfg-vk-gen/src/shaderchains/merge.cpp
index 10c9208..6b17bdb 100644
--- a/lsfg-vk-gen/src/shaderchains/merge.cpp
+++ b/lsfg-vk-gen/src/shaderchains/merge.cpp
@@ -1,5 +1,5 @@
 #include "shaderchains/merge.hpp"
-#include "utils.hpp"
+#include "utils/utils.hpp"
 
 using namespace LSFG::Shaderchains;
 
diff --git a/lsfg-vk-gen/src/shaderchains/zeta.cpp b/lsfg-vk-gen/src/shaderchains/zeta.cpp
index f33b85f..a5350a8 100644
--- a/lsfg-vk-gen/src/shaderchains/zeta.cpp
+++ b/lsfg-vk-gen/src/shaderchains/zeta.cpp
@@ -1,5 +1,5 @@
 #include "shaderchains/zeta.hpp"
-#include "utils.hpp"
+#include "utils/utils.hpp"
 
 using namespace LSFG::Shaderchains;
 
diff --git a/lsfg-vk-gen/src/utils.cpp b/lsfg-vk-gen/src/utils/utils.cpp
similarity index 99%
rename from lsfg-vk-gen/src/utils.cpp
rename to lsfg-vk-gen/src/utils/utils.cpp
index 60a4274..5765ea5 100644
--- a/lsfg-vk-gen/src/utils.cpp
+++ b/lsfg-vk-gen/src/utils/utils.cpp
@@ -1,4 +1,4 @@
-#include "utils.hpp"
+#include "utils/utils.hpp"
 #include "core/buffer.hpp"
 #include "lsfg.hpp"
 
diff --git a/src/utils.cpp b/src/utils/utils.cpp
similarity index 98%
rename from src/utils.cpp
rename to src/utils/utils.cpp
index 45e8b0e..ed5acad 100644
--- a/src/utils.cpp
+++ b/src/utils/utils.cpp
@@ -1,4 +1,4 @@
-#include "utils.hpp"
+#include "utils/utils.hpp"
 
 #include <lsfg.hpp>
 
@@ -15,7 +15,8 @@ std::pair<uint32_t, VkQueue> Utils::findQueue(VkDevice device, VkPhysicalDevice
     uint32_t familyCount{};
     vkGetPhysicalDeviceQueueFamilyProperties(physicalDevice, &familyCount, nullptr);
     std::vector<VkQueueFamilyProperties> families(familyCount);
-    vkGetPhysicalDeviceQueueFamilyProperties(physicalDevice, &familyCount, families.data());
+    vkGetPhysicalDeviceQueueFamilyProperties(physicalDevice, &familyCount,
+        families.data());
 
     std::optional<uint32_t> idx;
     for (const auto& queueInfo : enabledQueues) {