diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
index eb92aa2..401f9c9 100644
--- a/engine/CMakeLists.txt
+++ b/engine/CMakeLists.txt
@@ -1,3 +1,5 @@
+include_directories(./.)
+
 add_subdirectory(./NBCore)
 add_subdirectory(./NBEvents)
 add_subdirectory(./NBGraphics)
diff --git a/engine/NBCore/include/ANSITerm.hpp b/engine/NBCore/ANSITerm.hpp
similarity index 100%
rename from engine/NBCore/include/ANSITerm.hpp
rename to engine/NBCore/ANSITerm.hpp
diff --git a/engine/NBCore/CMakeLists.txt b/engine/NBCore/CMakeLists.txt
index 206443d..6b105df 100644
--- a/engine/NBCore/CMakeLists.txt
+++ b/engine/NBCore/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(./include)
+include_directories(./.)
 
 toAbsolutePath(NB_CORE_SOURCE 
     ./src/Errors.cpp
@@ -7,14 +7,14 @@ toAbsolutePath(NB_CORE_SOURCE
 )
 
 toAbsolutePath(NB_CORE_INCLUDE
-    ./include/ANSITerm.hpp
-    ./include/DataSink.hpp
-    ./include/Errors.hpp
-    ./include/Logger.hpp
-    ./include/Processes.hpp
-    ./include/ThreadsafeQueue.hpp
-    ./include/Types.hpp
-    ./include/TypeTraits.hpp
+    ./ANSITerm.hpp
+    ./DataSink.hpp
+    ./Errors.hpp
+    ./Logger.hpp
+    ./Processes.hpp
+    ./ThreadsafeQueue.hpp
+    ./Types.hpp
+    ./TypeTraits.hpp
 )
 
 set(NB_CORE_SOURCE ${NB_CORE_SOURCE} PARENT_SCOPE)
diff --git a/engine/NBCore/include/DataSink.hpp b/engine/NBCore/DataSink.hpp
similarity index 100%
rename from engine/NBCore/include/DataSink.hpp
rename to engine/NBCore/DataSink.hpp
diff --git a/engine/NBCore/include/Errors.hpp b/engine/NBCore/Errors.hpp
similarity index 100%
rename from engine/NBCore/include/Errors.hpp
rename to engine/NBCore/Errors.hpp
diff --git a/engine/NBCore/include/Logger.hpp b/engine/NBCore/Logger.hpp
similarity index 100%
rename from engine/NBCore/include/Logger.hpp
rename to engine/NBCore/Logger.hpp
diff --git a/engine/NBCore/include/Processes.hpp b/engine/NBCore/Processes.hpp
similarity index 100%
rename from engine/NBCore/include/Processes.hpp
rename to engine/NBCore/Processes.hpp
diff --git a/engine/NBCore/include/ThreadsafeQueue.hpp b/engine/NBCore/ThreadsafeQueue.hpp
similarity index 100%
rename from engine/NBCore/include/ThreadsafeQueue.hpp
rename to engine/NBCore/ThreadsafeQueue.hpp
diff --git a/engine/NBCore/include/TypeTraits.hpp b/engine/NBCore/TypeTraits.hpp
similarity index 100%
rename from engine/NBCore/include/TypeTraits.hpp
rename to engine/NBCore/TypeTraits.hpp
diff --git a/engine/NBCore/include/Types.hpp b/engine/NBCore/Types.hpp
similarity index 100%
rename from engine/NBCore/include/Types.hpp
rename to engine/NBCore/Types.hpp
diff --git a/engine/NBCore/src/Errors.cpp b/engine/NBCore/src/Errors.cpp
index 66ae09b..544346a 100644
--- a/engine/NBCore/src/Errors.cpp
+++ b/engine/NBCore/src/Errors.cpp
@@ -1,5 +1,4 @@
 #include "Errors.hpp"
-#gay
 
 namespace nb {
 
diff --git a/engine/NBEvents/CMakeLists.txt b/engine/NBEvents/CMakeLists.txt
index 247407c..9c3b781 100644
--- a/engine/NBEvents/CMakeLists.txt
+++ b/engine/NBEvents/CMakeLists.txt
@@ -1,11 +1,11 @@
-include_directories(./include)
+include_directories(./.)
 
 toAbsolutePath(NB_EVENTS_SOURCE
     ./src/Events.cpp
 )
 
 toAbsolutePath(NB_EVENTS_INCLUDE
-    ./include/Events.hpp
+    ./Events.hpp
 )
 
 set(NB_EVENTS_SOURCE ${NB_EVENTS_SOURCE} PARENT_SCOPE)
diff --git a/engine/NBEvents/include/Events.hpp b/engine/NBEvents/Events.hpp
similarity index 100%
rename from engine/NBEvents/include/Events.hpp
rename to engine/NBEvents/Events.hpp
diff --git a/engine/NBGraphics/include/Buffers.hpp b/engine/NBGraphics/Buffers.hpp
similarity index 99%
rename from engine/NBGraphics/include/Buffers.hpp
rename to engine/NBGraphics/Buffers.hpp
index c02867a..d7ea472 100644
--- a/engine/NBGraphics/include/Buffers.hpp
+++ b/engine/NBGraphics/Buffers.hpp
@@ -9,8 +9,8 @@
 #include <string>
 #include <vector>
 
-#include "NBCore/Errors.hpp"
-#include "NBCore/Types.hpp"
+#include <NBCore/Errors.hpp>
+#include <NBCore/Types.hpp>
 
 namespace nb {
     
diff --git a/engine/NBGraphics/CMakeLists.txt b/engine/NBGraphics/CMakeLists.txt
index 177b913..6a22f25 100644
--- a/engine/NBGraphics/CMakeLists.txt
+++ b/engine/NBGraphics/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(./include)
+include_directories(./.)
 
 find_package(OpenGL)
 add_subdirectory(${GLFW_PATH} ${GLFW_PATH}/build)
@@ -15,13 +15,13 @@ toAbsolutePath(NB_GRAPHICS_SOURCE
 )
 
 toAbsolutePath(NB_GRAPHICS_INCLUDE
-    ./include/Buffers.hpp
-    ./include/Camera.hpp
-    ./include/Draw.hpp
-    ./include/GLLoad.hpp
-    ./include/shader.hpp
-    ./include/VAOManager.hpp
-    ./include/Window.hpp
+    ./Buffers.hpp
+    ./Camera.hpp
+    ./Draw.hpp
+    ./GLLoad.hpp
+    ./shader.hpp
+    ./VAOManager.hpp
+    ./Window.hpp
 )
 
 set(NB_GRAPHICS_SOURCE ${NB_GRAPHICS_SOURCE} PARENT_SCOPE)
diff --git a/engine/NBGraphics/include/Camera.hpp b/engine/NBGraphics/Camera.hpp
similarity index 100%
rename from engine/NBGraphics/include/Camera.hpp
rename to engine/NBGraphics/Camera.hpp
diff --git a/engine/NBGraphics/include/Draw.hpp b/engine/NBGraphics/Draw.hpp
similarity index 100%
rename from engine/NBGraphics/include/Draw.hpp
rename to engine/NBGraphics/Draw.hpp
diff --git a/engine/NBGraphics/include/GLLoad.hpp b/engine/NBGraphics/GLLoad.hpp
similarity index 100%
rename from engine/NBGraphics/include/GLLoad.hpp
rename to engine/NBGraphics/GLLoad.hpp
diff --git a/engine/NBGraphics/include/VAOManager.hpp b/engine/NBGraphics/VAOManager.hpp
similarity index 100%
rename from engine/NBGraphics/include/VAOManager.hpp
rename to engine/NBGraphics/VAOManager.hpp
diff --git a/engine/NBGraphics/include/Window.hpp b/engine/NBGraphics/Window.hpp
similarity index 97%
rename from engine/NBGraphics/include/Window.hpp
rename to engine/NBGraphics/Window.hpp
index 4cc787d..22a82f8 100644
--- a/engine/NBGraphics/include/Window.hpp
+++ b/engine/NBGraphics/Window.hpp
@@ -6,12 +6,11 @@
 
 #include <atomic>
 #include <array>
-#include <iostream>
 #include <map>
 #include <stdexcept>
 #include <string>
 
-namespace NB {
+namespace nb {
 
 class GLError : public std::runtime_error {
 public:
diff --git a/engine/NBGraphics/include/shader.hpp b/engine/NBGraphics/shader.hpp
similarity index 100%
rename from engine/NBGraphics/include/shader.hpp
rename to engine/NBGraphics/shader.hpp
diff --git a/engine/NBGraphics/src/Window.cpp b/engine/NBGraphics/src/Window.cpp
index a1c7dbf..adceaf7 100644
--- a/engine/NBGraphics/src/Window.cpp
+++ b/engine/NBGraphics/src/Window.cpp
@@ -1,5 +1,6 @@
 #include "Window.hpp"
-namespace NB {
+
+namespace nb {
 
 std::map<GLFWwindow*, Window*> Window::WindowContexts = {};
 std::map<int, int> Window::GLFWHints = {};