diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
index d5e96b5..eb92aa2 100644
--- a/engine/CMakeLists.txt
+++ b/engine/CMakeLists.txt
@@ -14,4 +14,3 @@ if (NB_CORE_INCLUDE OR NB_EVENTS_INCLUDE OR NB_GRAPHICS_INCLUDE)
     list(APPEND NB_INCLUDE_FILES ${NB_CORE_INCLUDE} ${NB_GRAPHICS_INCLUDE} ${NB_EVENTS_INCLUDE})
     set(NB_INCLUDE_FILES ${NB_INCLUDE_FILES} PARENT_SCOPE)
 endif()
-message("${NB_INCLUDE_FILES}")
diff --git a/engine/NBCore/CMakeLists.txt b/engine/NBCore/CMakeLists.txt
index d9d8436..206443d 100644
--- a/engine/NBCore/CMakeLists.txt
+++ b/engine/NBCore/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(./.)
+include_directories(./include)
 
 toAbsolutePath(NB_CORE_SOURCE 
     ./src/Errors.cpp
@@ -7,14 +7,14 @@ toAbsolutePath(NB_CORE_SOURCE
 )
 
 toAbsolutePath(NB_CORE_INCLUDE
-    ANSITerm.hpp
-    DataSink.hpp
-    Errors.hpp
-    Logger.hpp
-    Processes.hpp
-    ThreadsafeQueue.hpp
-    Types.hpp
-    TypeTraits.hpp
+    ./include/ANSITerm.hpp
+    ./include/DataSink.hpp
+    ./include/Errors.hpp
+    ./include/Logger.hpp
+    ./include/Processes.hpp
+    ./include/ThreadsafeQueue.hpp
+    ./include/Types.hpp
+    ./include/TypeTraits.hpp
 )
 
 set(NB_CORE_SOURCE ${NB_CORE_SOURCE} PARENT_SCOPE)
diff --git a/engine/NBCore/ANSITerm.hpp b/engine/NBCore/include/ANSITerm.hpp
similarity index 100%
rename from engine/NBCore/ANSITerm.hpp
rename to engine/NBCore/include/ANSITerm.hpp
diff --git a/engine/NBCore/DataSink.hpp b/engine/NBCore/include/DataSink.hpp
similarity index 100%
rename from engine/NBCore/DataSink.hpp
rename to engine/NBCore/include/DataSink.hpp
diff --git a/engine/NBCore/Errors.hpp b/engine/NBCore/include/Errors.hpp
similarity index 100%
rename from engine/NBCore/Errors.hpp
rename to engine/NBCore/include/Errors.hpp
diff --git a/engine/NBCore/Logger.hpp b/engine/NBCore/include/Logger.hpp
similarity index 100%
rename from engine/NBCore/Logger.hpp
rename to engine/NBCore/include/Logger.hpp
diff --git a/engine/NBCore/Processes.hpp b/engine/NBCore/include/Processes.hpp
similarity index 100%
rename from engine/NBCore/Processes.hpp
rename to engine/NBCore/include/Processes.hpp
diff --git a/engine/NBCore/ThreadsafeQueue.hpp b/engine/NBCore/include/ThreadsafeQueue.hpp
similarity index 100%
rename from engine/NBCore/ThreadsafeQueue.hpp
rename to engine/NBCore/include/ThreadsafeQueue.hpp
diff --git a/engine/NBCore/TypeTraits.hpp b/engine/NBCore/include/TypeTraits.hpp
similarity index 100%
rename from engine/NBCore/TypeTraits.hpp
rename to engine/NBCore/include/TypeTraits.hpp
diff --git a/engine/NBCore/Types.hpp b/engine/NBCore/include/Types.hpp
similarity index 100%
rename from engine/NBCore/Types.hpp
rename to engine/NBCore/include/Types.hpp
diff --git a/engine/NBCore/src/Errors.cpp b/engine/NBCore/src/Errors.cpp
index 544346a..66ae09b 100644
--- a/engine/NBCore/src/Errors.cpp
+++ b/engine/NBCore/src/Errors.cpp
@@ -1,4 +1,5 @@
 #include "Errors.hpp"
+#gay
 
 namespace nb {
 
diff --git a/engine/NBEvents/CMakeLists.txt b/engine/NBEvents/CMakeLists.txt
index 9c3b781..7e8c820 100644
--- a/engine/NBEvents/CMakeLists.txt
+++ b/engine/NBEvents/CMakeLists.txt
@@ -5,7 +5,7 @@ toAbsolutePath(NB_EVENTS_SOURCE
 )
 
 toAbsolutePath(NB_EVENTS_INCLUDE
-    ./Events.hpp
+    ./include/Events.hpp
 )
 
 set(NB_EVENTS_SOURCE ${NB_EVENTS_SOURCE} PARENT_SCOPE)
diff --git a/engine/NBEvents/Events.h b/engine/NBEvents/include/Events.hpp
similarity index 100%
rename from engine/NBEvents/Events.h
rename to engine/NBEvents/include/Events.hpp
diff --git a/engine/NBEvents/src/Events.cpp b/engine/NBEvents/src/Events.cpp
index 0ebabd1..16e3354 100644
--- a/engine/NBEvents/src/Events.cpp
+++ b/engine/NBEvents/src/Events.cpp
@@ -1,4 +1,4 @@
-#include "Events.h"
+#include "Events.hpp"
 
 namespace NB {
 
diff --git a/engine/NBGraphics/CMakeLists.txt b/engine/NBGraphics/CMakeLists.txt
index f7ded22..8d8459d 100644
--- a/engine/NBGraphics/CMakeLists.txt
+++ b/engine/NBGraphics/CMakeLists.txt
@@ -16,13 +16,13 @@ toAbsolutePath(NB_GRAPHICS_SOURCE
 )
 
 toAbsolutePath(NB_GRAPHICS_INCLUDE
-    ./Buffers.hpp
-    ./Camera.hpp
-    ./Draw.hpp
-    ./GLLoad.hpp
-    ./shader.hpp
-    ./VAOManager.hpp
-    ./Window.hpp
+    ./include/Buffers.hpp
+    ./include/Camera.hpp
+    ./include/Draw.hpp
+    ./include/GLLoad.hpp
+    ./include/shader.hpp
+    ./include/VAOManager.hpp
+    ./include/Window.hpp
 )
 
 set(NB_GRAPHICS_SOURCE ${NB_GRAPHICS_SOURCE} PARENT_SCOPE)
diff --git a/engine/NBGraphics/Buffers.hpp b/engine/NBGraphics/include/Buffers.hpp
similarity index 100%
rename from engine/NBGraphics/Buffers.hpp
rename to engine/NBGraphics/include/Buffers.hpp
diff --git a/engine/NBGraphics/Camera.hpp b/engine/NBGraphics/include/Camera.hpp
similarity index 100%
rename from engine/NBGraphics/Camera.hpp
rename to engine/NBGraphics/include/Camera.hpp
diff --git a/engine/NBGraphics/Draw.hpp b/engine/NBGraphics/include/Draw.hpp
similarity index 100%
rename from engine/NBGraphics/Draw.hpp
rename to engine/NBGraphics/include/Draw.hpp
diff --git a/engine/NBGraphics/GLLoad.hpp b/engine/NBGraphics/include/GLLoad.hpp
similarity index 100%
rename from engine/NBGraphics/GLLoad.hpp
rename to engine/NBGraphics/include/GLLoad.hpp
diff --git a/engine/NBGraphics/VAOManager.hpp b/engine/NBGraphics/include/VAOManager.hpp
similarity index 100%
rename from engine/NBGraphics/VAOManager.hpp
rename to engine/NBGraphics/include/VAOManager.hpp
diff --git a/engine/NBGraphics/Window.hpp b/engine/NBGraphics/include/Window.hpp
similarity index 100%
rename from engine/NBGraphics/Window.hpp
rename to engine/NBGraphics/include/Window.hpp
diff --git a/engine/NBGraphics/shader.hpp b/engine/NBGraphics/include/shader.hpp
similarity index 100%
rename from engine/NBGraphics/shader.hpp
rename to engine/NBGraphics/include/shader.hpp