diff --git a/src/main.cpp b/src/main.cpp
index 7f9b0fe..57ab1c7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,5 +1,5 @@
-#include "ConfigUtils.h"
 #include "globals.h"
+#include "utils/ConfigUtils.h"
 #include "utils/logger.h"
 #include <coreinit/debug.h>
 #include <coreinit/mcp.h>
diff --git a/src/ConfigUtils.cpp b/src/utils/ConfigUtils.cpp
similarity index 100%
rename from src/ConfigUtils.cpp
rename to src/utils/ConfigUtils.cpp
diff --git a/src/ConfigUtils.h b/src/utils/ConfigUtils.h
similarity index 100%
rename from src/ConfigUtils.h
rename to src/utils/ConfigUtils.h
diff --git a/src/DrawUtils.cpp b/src/utils/DrawUtils.cpp
similarity index 99%
rename from src/DrawUtils.cpp
rename to src/utils/DrawUtils.cpp
index 535a07f..6322524 100644
--- a/src/DrawUtils.cpp
+++ b/src/utils/DrawUtils.cpp
@@ -1,14 +1,12 @@
 #include "DrawUtils.h"
-
-#include "utils/logger.h"
-#include "utils/utils.h"
+#include "logger.h"
+#include "utils.h"
 #include <coreinit/cache.h>
 #include <coreinit/memory.h>
 #include <coreinit/screen.h>
 #include <cstdlib>
 #include <png.h>
 
-
 // buffer width
 #define TV_WIDTH  0x500
 #define DRC_WIDTH 0x380
diff --git a/src/DrawUtils.h b/src/utils/DrawUtils.h
similarity index 100%
rename from src/DrawUtils.h
rename to src/utils/DrawUtils.h
diff --git a/src/schrift.c b/src/utils/schrift.c
similarity index 100%
rename from src/schrift.c
rename to src/utils/schrift.c
diff --git a/src/schrift.h b/src/utils/schrift.h
similarity index 100%
rename from src/schrift.h
rename to src/utils/schrift.h