diff --git a/Include/Hallocy/Allocator.h b/Include/Hallocy/Core/Allocator.h
similarity index 97%
rename from Include/Hallocy/Allocator.h
rename to Include/Hallocy/Core/Allocator.h
index a8f0805..ed2fc87 100644
--- a/Include/Hallocy/Allocator.h
+++ b/Include/Hallocy/Core/Allocator.h
@@ -26,7 +26,7 @@
 #include <stddef.h>
 #include <stdbool.h>
 
-#include "Error.h"
+#include "../Utils/Error.h"
 
 void *hallocy_malloc(size_t size);
 HallocyError hallocy_free(void *pointer);
diff --git a/Include/Hallocy/Error.h b/Include/Hallocy/Utils/Error.h
similarity index 100%
rename from Include/Hallocy/Error.h
rename to Include/Hallocy/Utils/Error.h
diff --git a/Src/Allocator.c b/Src/Core/Allocator.c
similarity index 99%
rename from Src/Allocator.c
rename to Src/Core/Allocator.c
index 5471122..89bd271 100644
--- a/Src/Allocator.c
+++ b/Src/Core/Allocator.c
@@ -20,7 +20,7 @@
  * Author: Mineplay
  * -----------------------------------------------------------------------------
  */
-#include "../Include/Hallocy/Allocator.h"
+#include "../../Include/Hallocy/Core/Allocator.h"
 
 #if defined(_WIN32)
 #include <windows.h>
diff --git a/Tests/Main.c b/Tests/Main.c
index 3b13990..2978a7d 100644
--- a/Tests/Main.c
+++ b/Tests/Main.c
@@ -20,7 +20,7 @@
  * -----------------------------------------------------------------------------
  */
  #include <stdio.h>
- #include <Hallocy/Allocator.h>
+ #include <Hallocy/Core/Allocator.h>
  
  int main() {
      char *memory = (char *)hallocy_malloc(12288);