diff --git a/Navigator/src/Navigator.h b/Navigator/src/Navigator.h
index 3e439be..dda4930 100644
--- a/Navigator/src/Navigator.h
+++ b/Navigator/src/Navigator.h
@@ -24,13 +24,13 @@
 
 #include <cstdint>
 
-#include "Navigator/Logger.h"
-#include "Navigator/Application.h"
+#include "Navigator/Core/Logger.h"
+#include "Navigator/Core/Application.h"
 #include "Navigator/Physics/PhysicsLayer.h"
 #include "Navigator/Physics/AnalysisStage.h"
-#include "Navigator/Parameter.h"
-#include "Navigator/SpectrumManager.h"
-#include "Navigator/Layer.h"
+#include "Navigator/Core/Parameter.h"
+#include "Navigator/Core/SpectrumManager.h"
+#include "Navigator/Core/Layer.h"
 #include "Navigator/Events/Event.h"
 
 #endif
diff --git a/Navigator/src/Navigator/Application.cpp b/Navigator/src/Navigator/Core/Application.cpp
similarity index 96%
rename from Navigator/src/Navigator/Application.cpp
rename to Navigator/src/Navigator/Core/Application.cpp
index d0d0adc..31daa8f 100644
--- a/Navigator/src/Navigator/Application.cpp
+++ b/Navigator/src/Navigator/Core/Application.cpp
@@ -9,8 +9,8 @@
 	GWM -- Feb 2022
 */
 #include "Application.h"
-#include "Renderer/RenderCommand.h"
-#include "Editor/EditorLayer.h"
+#include "Navigator/Renderer/RenderCommand.h"
+#include "Navigator/Editor/EditorLayer.h"
 
 namespace Navigator {
 
diff --git a/Navigator/src/Navigator/Application.h b/Navigator/src/Navigator/Core/Application.h
similarity index 90%
rename from Navigator/src/Navigator/Application.h
rename to Navigator/src/Navigator/Core/Application.h
index 9e1baf8..9b64f9b 100644
--- a/Navigator/src/Navigator/Application.h
+++ b/Navigator/src/Navigator/Core/Application.h
@@ -11,13 +11,13 @@
 #ifndef APPLICATION_H
 #define APPLICATION_H
 
-#include "Navigator/NavCore.h"
-#include "Events/Event.h"
+#include "Navigator/Core/NavCore.h"
+#include "Navigator/Events/Event.h"
 #include "Navigator/Events/AppEvent.h"
 #include "Navigator/Events/PhysicsEvent.h"
-#include "Navigator/LayerStack.h"
-#include "Navigator/Layer.h"
-#include "Navigator/Window.h"
+#include "Navigator/Core/LayerStack.h"
+#include "Navigator/Core/Layer.h"
+#include "Navigator/Core/Window.h"
 #include "Navigator/ImGui/ImGuiLayer.h"
 #include "Navigator/Physics/PhysicsLayer.h"
 #include "glm/vec4.hpp"
diff --git a/Navigator/src/Navigator/Cut.cpp b/Navigator/src/Navigator/Core/Cut.cpp
similarity index 100%
rename from Navigator/src/Navigator/Cut.cpp
rename to Navigator/src/Navigator/Core/Cut.cpp
diff --git a/Navigator/src/Navigator/Cut.h b/Navigator/src/Navigator/Core/Cut.h
similarity index 100%
rename from Navigator/src/Navigator/Cut.h
rename to Navigator/src/Navigator/Core/Cut.h
diff --git a/Navigator/src/Navigator/Histogram.cpp b/Navigator/src/Navigator/Core/Histogram.cpp
similarity index 100%
rename from Navigator/src/Navigator/Histogram.cpp
rename to Navigator/src/Navigator/Core/Histogram.cpp
diff --git a/Navigator/src/Navigator/Histogram.h b/Navigator/src/Navigator/Core/Histogram.h
similarity index 100%
rename from Navigator/src/Navigator/Histogram.h
rename to Navigator/src/Navigator/Core/Histogram.h
diff --git a/Navigator/src/Navigator/Layer.cpp b/Navigator/src/Navigator/Core/Layer.cpp
similarity index 100%
rename from Navigator/src/Navigator/Layer.cpp
rename to Navigator/src/Navigator/Core/Layer.cpp
diff --git a/Navigator/src/Navigator/Layer.h b/Navigator/src/Navigator/Core/Layer.h
similarity index 93%
rename from Navigator/src/Navigator/Layer.h
rename to Navigator/src/Navigator/Core/Layer.h
index cd23a63..fa0219c 100644
--- a/Navigator/src/Navigator/Layer.h
+++ b/Navigator/src/Navigator/Core/Layer.h
@@ -8,7 +8,7 @@
 #define LAYER_H
 
 #include "NavCore.h"
-#include "Events/Event.h"
+#include "Navigator/Events/Event.h"
 
 namespace Navigator {
 
diff --git a/Navigator/src/Navigator/LayerStack.cpp b/Navigator/src/Navigator/Core/LayerStack.cpp
similarity index 100%
rename from Navigator/src/Navigator/LayerStack.cpp
rename to Navigator/src/Navigator/Core/LayerStack.cpp
diff --git a/Navigator/src/Navigator/LayerStack.h b/Navigator/src/Navigator/Core/LayerStack.h
similarity index 100%
rename from Navigator/src/Navigator/LayerStack.h
rename to Navigator/src/Navigator/Core/LayerStack.h
diff --git a/Navigator/src/Navigator/Logger.cpp b/Navigator/src/Navigator/Core/Logger.cpp
similarity index 100%
rename from Navigator/src/Navigator/Logger.cpp
rename to Navigator/src/Navigator/Core/Logger.cpp
diff --git a/Navigator/src/Navigator/Logger.h b/Navigator/src/Navigator/Core/Logger.h
similarity index 100%
rename from Navigator/src/Navigator/Logger.h
rename to Navigator/src/Navigator/Core/Logger.h
diff --git a/Navigator/src/Navigator/NavCore.h b/Navigator/src/Navigator/Core/NavCore.h
similarity index 100%
rename from Navigator/src/Navigator/NavCore.h
rename to Navigator/src/Navigator/Core/NavCore.h
diff --git a/Navigator/src/Navigator/Parameter.cpp b/Navigator/src/Navigator/Core/Parameter.cpp
similarity index 100%
rename from Navigator/src/Navigator/Parameter.cpp
rename to Navigator/src/Navigator/Core/Parameter.cpp
diff --git a/Navigator/src/Navigator/Parameter.h b/Navigator/src/Navigator/Core/Parameter.h
similarity index 100%
rename from Navigator/src/Navigator/Parameter.h
rename to Navigator/src/Navigator/Core/Parameter.h
diff --git a/Navigator/src/Navigator/SpectrumManager.cpp b/Navigator/src/Navigator/Core/SpectrumManager.cpp
similarity index 100%
rename from Navigator/src/Navigator/SpectrumManager.cpp
rename to Navigator/src/Navigator/Core/SpectrumManager.cpp
diff --git a/Navigator/src/Navigator/SpectrumManager.h b/Navigator/src/Navigator/Core/SpectrumManager.h
similarity index 100%
rename from Navigator/src/Navigator/SpectrumManager.h
rename to Navigator/src/Navigator/Core/SpectrumManager.h
diff --git a/Navigator/src/Navigator/SpectrumSerializer.cpp b/Navigator/src/Navigator/Core/SpectrumSerializer.cpp
similarity index 100%
rename from Navigator/src/Navigator/SpectrumSerializer.cpp
rename to Navigator/src/Navigator/Core/SpectrumSerializer.cpp
diff --git a/Navigator/src/Navigator/SpectrumSerializer.h b/Navigator/src/Navigator/Core/SpectrumSerializer.h
similarity index 100%
rename from Navigator/src/Navigator/SpectrumSerializer.h
rename to Navigator/src/Navigator/Core/SpectrumSerializer.h
diff --git a/Navigator/src/Navigator/Window.h b/Navigator/src/Navigator/Core/Window.h
similarity index 96%
rename from Navigator/src/Navigator/Window.h
rename to Navigator/src/Navigator/Core/Window.h
index 387aab2..843f3e1 100644
--- a/Navigator/src/Navigator/Window.h
+++ b/Navigator/src/Navigator/Core/Window.h
@@ -10,7 +10,7 @@
 #define WINDOW_H
 
 #include "NavCore.h"
-#include "Events/Event.h"
+#include "Navigator/Events/Event.h"
 
 namespace Navigator {
 
diff --git a/Navigator/src/Navigator/Editor/EditorLayer.cpp b/Navigator/src/Navigator/Editor/EditorLayer.cpp
index e78dfe6..3f934fd 100644
--- a/Navigator/src/Navigator/Editor/EditorLayer.cpp
+++ b/Navigator/src/Navigator/Editor/EditorLayer.cpp
@@ -10,9 +10,9 @@
 #include "misc/cpp/imgui_stdlib.h"
 #include "implot.h"
 #include "FileDialog.h"
-#include "Navigator/Application.h"
-#include "Navigator/SpectrumSerializer.h"
-#include "Navigator/SpectrumManager.h"
+#include "Navigator/Core/Application.h"
+#include "Navigator/Core/SpectrumSerializer.h"
+#include "Navigator/Core/SpectrumManager.h"
 
 #include "IconsFontAwesome5.h"
 
diff --git a/Navigator/src/Navigator/Editor/EditorLayer.h b/Navigator/src/Navigator/Editor/EditorLayer.h
index 6de2f83..9fad635 100644
--- a/Navigator/src/Navigator/Editor/EditorLayer.h
+++ b/Navigator/src/Navigator/Editor/EditorLayer.h
@@ -8,11 +8,11 @@
 #ifndef EDITOR_LAYER_H
 #define EDITOR_LAYER_H
 
-#include "Navigator/Layer.h"
+#include "Navigator/Core/Layer.h"
 #include "Navigator/Events/Event.h"
 #include "Navigator/Events/PhysicsEvent.h"
-#include "Navigator/Histogram.h"
-#include "Navigator/Cut.h"
+#include "Navigator/Core/Histogram.h"
+#include "Navigator/Core/Cut.h"
 #include "SpectrumPanel.h"
 #include "FileDialog.h"
 #include "SpectrumDialog.h"
diff --git a/Navigator/src/Navigator/Editor/SourceDialog.cpp b/Navigator/src/Navigator/Editor/SourceDialog.cpp
index 4eb32ed..f60326c 100644
--- a/Navigator/src/Navigator/Editor/SourceDialog.cpp
+++ b/Navigator/src/Navigator/Editor/SourceDialog.cpp
@@ -8,7 +8,7 @@
 #include "SourceDialog.h"
 #include "Navigator/Events/PhysicsEvent.h"
 #include "Navigator/Events/Event.h"
-#include "Navigator/Application.h"
+#include "Navigator/Core/Application.h"
 
 #include "imgui.h"
 #include "misc/cpp/imgui_stdlib.h"
diff --git a/Navigator/src/Navigator/Editor/SpectrumDialog.cpp b/Navigator/src/Navigator/Editor/SpectrumDialog.cpp
index 3fb4705..d8a5668 100644
--- a/Navigator/src/Navigator/Editor/SpectrumDialog.cpp
+++ b/Navigator/src/Navigator/Editor/SpectrumDialog.cpp
@@ -5,7 +5,7 @@
 	GWM -- Feb 2022
 */
 #include "SpectrumDialog.h"
-#include "Navigator/SpectrumManager.h"
+#include "Navigator/Core/SpectrumManager.h"
 
 #include "misc/cpp/imgui_stdlib.h"
 
diff --git a/Navigator/src/Navigator/Editor/SpectrumDialog.h b/Navigator/src/Navigator/Editor/SpectrumDialog.h
index 9232f2b..c8f8770 100644
--- a/Navigator/src/Navigator/Editor/SpectrumDialog.h
+++ b/Navigator/src/Navigator/Editor/SpectrumDialog.h
@@ -7,8 +7,8 @@
 #ifndef SPECTRUM_DIALOG_H
 #define SPECTRUM_DIALOG_H
 
-#include "Navigator/Histogram.h"
-#include "Navigator/Cut.h"
+#include "Navigator/Core/Histogram.h"
+#include "Navigator/Core/Cut.h"
 
 #include "imgui.h"
 
diff --git a/Navigator/src/Navigator/Editor/SpectrumPanel.cpp b/Navigator/src/Navigator/Editor/SpectrumPanel.cpp
index f33853f..836f93e 100644
--- a/Navigator/src/Navigator/Editor/SpectrumPanel.cpp
+++ b/Navigator/src/Navigator/Editor/SpectrumPanel.cpp
@@ -6,7 +6,7 @@
     GWM -- Feb 2022
 */
 #include "SpectrumPanel.h"
-#include "Navigator/SpectrumManager.h"
+#include "Navigator/Core/SpectrumManager.h"
 #include "misc/cpp/imgui_stdlib.h"
 #include "IconsFontAwesome5.h"
 
diff --git a/Navigator/src/Navigator/Editor/SpectrumPanel.h b/Navigator/src/Navigator/Editor/SpectrumPanel.h
index 252fe8d..8143e7d 100644
--- a/Navigator/src/Navigator/Editor/SpectrumPanel.h
+++ b/Navigator/src/Navigator/Editor/SpectrumPanel.h
@@ -8,8 +8,8 @@
 #ifndef SPECTRUM_PANEL_H
 #define SPECTRUM_PANEL_H
 
-#include "Navigator/Histogram.h"
-#include "Navigator/Cut.h"
+#include "Navigator/Core/Histogram.h"
+#include "Navigator/Core/Cut.h"
 #include "imgui.h"
 #include "implot.h"
 
diff --git a/Navigator/src/Navigator/Events/AppEvent.h b/Navigator/src/Navigator/Events/AppEvent.h
index 9d1c17c..0b1eda4 100644
--- a/Navigator/src/Navigator/Events/AppEvent.h
+++ b/Navigator/src/Navigator/Events/AppEvent.h
@@ -7,7 +7,6 @@
 #ifndef APP_EVENT_H
 #define APP_EVENT_H
 
-#include "Navigator/NavCore.h"
 #include "Event.h"
 
 namespace Navigator {
diff --git a/Navigator/src/Navigator/Events/Event.h b/Navigator/src/Navigator/Events/Event.h
index c52bc6c..9a55a69 100644
--- a/Navigator/src/Navigator/Events/Event.h
+++ b/Navigator/src/Navigator/Events/Event.h
@@ -9,7 +9,7 @@
 #ifndef EVENT_H
 #define EVENT_H
 
-#include "Navigator/NavCore.h"
+#include "Navigator/Core/NavCore.h"
 
 namespace Navigator {
 
diff --git a/Navigator/src/Navigator/Events/KeyEvent.h b/Navigator/src/Navigator/Events/KeyEvent.h
index 9c107dd..3cc037e 100644
--- a/Navigator/src/Navigator/Events/KeyEvent.h
+++ b/Navigator/src/Navigator/Events/KeyEvent.h
@@ -7,7 +7,6 @@
 #ifndef KEY_EVENT_H
 #define KEY_EVENT_H
 
-#include "Navigator/NavCore.h"
 #include "Event.h"
 
 namespace Navigator {
diff --git a/Navigator/src/Navigator/Events/MouseEvent.h b/Navigator/src/Navigator/Events/MouseEvent.h
index 2f71a3b..11226cb 100644
--- a/Navigator/src/Navigator/Events/MouseEvent.h
+++ b/Navigator/src/Navigator/Events/MouseEvent.h
@@ -7,7 +7,6 @@
 #ifndef MOUSE_EVENT_H
 #define MOUSE_EVENT_H
 
-#include "Navigator/NavCore.h"
 #include "Event.h"
 
 namespace Navigator {
diff --git a/Navigator/src/Navigator/Events/PhysicsEvent.h b/Navigator/src/Navigator/Events/PhysicsEvent.h
index 6b12672..865b679 100644
--- a/Navigator/src/Navigator/Events/PhysicsEvent.h
+++ b/Navigator/src/Navigator/Events/PhysicsEvent.h
@@ -7,7 +7,6 @@
 #ifndef PHYSICS_EVENT_H
 #define PHYSICS_EVENT_H
 
-#include "Navigator/NavCore.h"
 #include "Event.h"
 #include "Navigator/Physics/DataSource.h"
 
diff --git a/Navigator/src/Navigator/ImGui/ImGuiLayer.cpp b/Navigator/src/Navigator/ImGui/ImGuiLayer.cpp
index ed297f0..14ff85c 100644
--- a/Navigator/src/Navigator/ImGui/ImGuiLayer.cpp
+++ b/Navigator/src/Navigator/ImGui/ImGuiLayer.cpp
@@ -7,8 +7,8 @@
 	GWM -- Feb 2022
 */
 #include "ImGuiLayer.h"
-#include "Navigator/Application.h"
-#include "Navigator/NavCore.h"
+#include "Navigator/Core/Application.h"
+#include "Navigator/Core/NavCore.h"
 
 #include "imgui.h"
 #include "implot.h"
diff --git a/Navigator/src/Navigator/ImGui/ImGuiLayer.h b/Navigator/src/Navigator/ImGui/ImGuiLayer.h
index dc5dc94..54d28dc 100644
--- a/Navigator/src/Navigator/ImGui/ImGuiLayer.h
+++ b/Navigator/src/Navigator/ImGui/ImGuiLayer.h
@@ -9,8 +9,8 @@
 #ifndef IMGUI_LAYER_H
 #define IMGUI_LAYER_H
 
-#include "Navigator/NavCore.h"
-#include "Navigator/Layer.h"
+#include "Navigator/Core/NavCore.h"
+#include "Navigator/Core/Layer.h"
 
 namespace Navigator {
 
diff --git a/Navigator/src/Navigator/Physics/AnalysisStack.h b/Navigator/src/Navigator/Physics/AnalysisStack.h
index b7e18ba..1a0f842 100644
--- a/Navigator/src/Navigator/Physics/AnalysisStack.h
+++ b/Navigator/src/Navigator/Physics/AnalysisStack.h
@@ -9,7 +9,7 @@
 #define ANALYSIS_STACK_H
 
 #include "AnalysisStage.h"
-#include "Navigator/NavCore.h"
+#include "Navigator/Core/NavCore.h"
 
 namespace Navigator {
 
diff --git a/Navigator/src/Navigator/Physics/AnalysisStage.h b/Navigator/src/Navigator/Physics/AnalysisStage.h
index 2ca0884..7f61620 100644
--- a/Navigator/src/Navigator/Physics/AnalysisStage.h
+++ b/Navigator/src/Navigator/Physics/AnalysisStage.h
@@ -8,8 +8,8 @@
 #ifndef ANALYSIS_STAGE_H
 #define ANALYSIS_STAGE_H
 
-#include "Navigator/NavCore.h"
-#include "Navigator/Parameter.h"
+#include "Navigator/Core/NavCore.h"
+#include "Navigator/Core/Parameter.h"
 #include "NavData.h"
 
 namespace Navigator {
diff --git a/Navigator/src/Navigator/Physics/Caen/CompassFile.h b/Navigator/src/Navigator/Physics/Caen/CompassFile.h
index b9aa3fc..1eccb25 100644
--- a/Navigator/src/Navigator/Physics/Caen/CompassFile.h
+++ b/Navigator/src/Navigator/Physics/Caen/CompassFile.h
@@ -15,7 +15,7 @@
 #ifndef COMPASSFILE_H
 #define COMPASSFILE_H
 
-#include "Navigator/NavCore.h"
+#include "Navigator/Core/NavCore.h"
 #include "CompassHit.h"
 #include "Navigator/Physics/ShiftMap.h"
 
diff --git a/Navigator/src/Navigator/Physics/Caen/CompassHit.h b/Navigator/src/Navigator/Physics/Caen/CompassHit.h
index 4250261..243b9d9 100644
--- a/Navigator/src/Navigator/Physics/Caen/CompassHit.h
+++ b/Navigator/src/Navigator/Physics/Caen/CompassHit.h
@@ -7,7 +7,7 @@
 #ifndef COMPASS_HIT_H
 #define COMPASS_HIT_H
 
-#include "Navigator/NavCore.h"
+#include "Navigator/Core/NavCore.h"
 
 namespace Navigator {
 
diff --git a/Navigator/src/Navigator/Physics/Caen/CompassRun.h b/Navigator/src/Navigator/Physics/Caen/CompassRun.h
index 7288cfb..6ae24ca 100644
--- a/Navigator/src/Navigator/Physics/Caen/CompassRun.h
+++ b/Navigator/src/Navigator/Physics/Caen/CompassRun.h
@@ -19,7 +19,7 @@
 #ifndef COMPASSRUN_H
 #define COMPASSRUN_H
 
-#include "Navigator/NavCore.h"
+#include "Navigator/Core/NavCore.h"
 #include "Navigator/Physics/DataSource.h"
 #include "CompassFile.h"
 #include "Navigator/Physics/ShiftMap.h"
diff --git a/Navigator/src/Navigator/Physics/DataSource.h b/Navigator/src/Navigator/Physics/DataSource.h
index 683c995..51bd4f7 100644
--- a/Navigator/src/Navigator/Physics/DataSource.h
+++ b/Navigator/src/Navigator/Physics/DataSource.h
@@ -9,7 +9,7 @@
 #ifndef DATA_SOURCE_H
 #define DATA_SOURCE_H
 
-#include "Navigator/NavCore.h"
+#include "Navigator/Core/NavCore.h"
 #include "NavData.h"
 
 namespace Navigator {
diff --git a/Navigator/src/Navigator/Physics/PhysicsLayer.cpp b/Navigator/src/Navigator/Physics/PhysicsLayer.cpp
index bb2e9bc..f37f1be 100644
--- a/Navigator/src/Navigator/Physics/PhysicsLayer.cpp
+++ b/Navigator/src/Navigator/Physics/PhysicsLayer.cpp
@@ -8,7 +8,7 @@
 	GWM -- Feb 2022
 */
 #include "PhysicsLayer.h"
-#include "Navigator/SpectrumManager.h"
+#include "Navigator/Core/SpectrumManager.h"
 #include "NavData.h"
 
 namespace Navigator {
diff --git a/Navigator/src/Navigator/Physics/PhysicsLayer.h b/Navigator/src/Navigator/Physics/PhysicsLayer.h
index cd3684f..2a23fc3 100644
--- a/Navigator/src/Navigator/Physics/PhysicsLayer.h
+++ b/Navigator/src/Navigator/Physics/PhysicsLayer.h
@@ -10,8 +10,8 @@
 #ifndef PHYSICS_LAYER_H
 #define PHYSICS_LAYER_H
 
-#include "Navigator/NavCore.h"
-#include "Navigator/Layer.h"
+#include "Navigator/Core/NavCore.h"
+#include "Navigator/Core/Layer.h"
 #include "Navigator/Events/PhysicsEvent.h"
 #include "AnalysisStack.h"
 #include "AnalysisStage.h"
diff --git a/Navigator/src/Navigator/Physics/ShiftMap.h b/Navigator/src/Navigator/Physics/ShiftMap.h
index 8efdd03..869f8d9 100644
--- a/Navigator/src/Navigator/Physics/ShiftMap.h
+++ b/Navigator/src/Navigator/Physics/ShiftMap.h
@@ -13,7 +13,7 @@
 #ifndef SHIFTMAP_H
 #define SHIFTMAP_H
 
-#include "Navigator/NavCore.h"
+#include "Navigator/Core/NavCore.h"
 
 namespace Navigator {
 
diff --git a/Navigator/src/Navigator/Renderer/RenderCommand.h b/Navigator/src/Navigator/Renderer/RenderCommand.h
index 5e4a1de..8095a88 100644
--- a/Navigator/src/Navigator/Renderer/RenderCommand.h
+++ b/Navigator/src/Navigator/Renderer/RenderCommand.h
@@ -8,7 +8,7 @@
 #ifndef RENDER_COMMAND_H
 #define RENDER_COMMAND_H
 
-#include "Navigator/NavCore.h"
+#include "Navigator/Core/NavCore.h"
 #include "RendererAPI.h"
 
 namespace Navigator {
diff --git a/Navigator/src/Navigator/Renderer/RendererAPI.h b/Navigator/src/Navigator/Renderer/RendererAPI.h
index 1e83134..ab464d5 100644
--- a/Navigator/src/Navigator/Renderer/RendererAPI.h
+++ b/Navigator/src/Navigator/Renderer/RendererAPI.h
@@ -8,7 +8,7 @@
 #ifndef RENDERER_API_H
 #define RENDERER_API_H
 
-#include "Navigator/NavCore.h"
+#include "Navigator/Core/NavCore.h"
 #include "glm/vec4.hpp"
 
 namespace Navigator {
diff --git a/Navigator/src/Platform/OpenGL/OpenGLContext.h b/Navigator/src/Platform/OpenGL/OpenGLContext.h
index 3f53e04..1b91cf5 100644
--- a/Navigator/src/Platform/OpenGL/OpenGLContext.h
+++ b/Navigator/src/Platform/OpenGL/OpenGLContext.h
@@ -7,7 +7,7 @@
 #ifndef OPEGL_CONTEXT_H
 #define OPEGL_CONTEXT_H
 
-#include "Navigator/NavCore.h"
+#include "Navigator/Core/NavCore.h"
 #include "Navigator/Renderer/GraphicsContext.h"
 
 struct GLFWwindow;
diff --git a/Navigator/src/Platform/OpenGL/OpenGLRendererAPI.h b/Navigator/src/Platform/OpenGL/OpenGLRendererAPI.h
index 61557ee..21e8118 100644
--- a/Navigator/src/Platform/OpenGL/OpenGLRendererAPI.h
+++ b/Navigator/src/Platform/OpenGL/OpenGLRendererAPI.h
@@ -8,7 +8,7 @@
 #ifndef OPENGL_RENDERER_API_H
 #define OPENGL_RENDERER_API_H
 
-#include "Navigator/NavCore.h"
+#include "Navigator/Core/NavCore.h"
 #include "Navigator/Renderer/RendererAPI.h"
 
 namespace Navigator {
diff --git a/Navigator/src/Platform/OpenGL/OpenGLWindow.cpp b/Navigator/src/Platform/OpenGL/OpenGLWindow.cpp
index db65664..6c49854 100644
--- a/Navigator/src/Platform/OpenGL/OpenGLWindow.cpp
+++ b/Navigator/src/Platform/OpenGL/OpenGLWindow.cpp
@@ -8,7 +8,7 @@
 */
 #include "OpenGLWindow.h"
 #include "OpenGLContext.h"
-#include "Navigator/NavCore.h"
+#include "Navigator/Core/NavCore.h"
 #include "Navigator/Events/AppEvent.h"
 #include "Navigator/Events/KeyEvent.h"
 #include "Navigator/Events/MouseEvent.h"
diff --git a/Navigator/src/Platform/OpenGL/OpenGLWindow.h b/Navigator/src/Platform/OpenGL/OpenGLWindow.h
index 20d3db1..e4f769f 100644
--- a/Navigator/src/Platform/OpenGL/OpenGLWindow.h
+++ b/Navigator/src/Platform/OpenGL/OpenGLWindow.h
@@ -9,8 +9,8 @@
 #ifndef OPENGL_WINDOW_H
 #define OPENGL_WINDOW_H
 
-#include "Navigator/NavCore.h"
-#include "Navigator/Window.h"
+#include "Navigator/Core/NavCore.h"
+#include "Navigator/Core/Window.h"
 #include "Navigator/Renderer/GraphicsContext.h"
 #include "GLFW/glfw3.h"
 
diff --git a/Navigator/src/navpch.h b/Navigator/src/navpch.h
index fd6ce36..1a7df96 100644
--- a/Navigator/src/navpch.h
+++ b/Navigator/src/navpch.h
@@ -17,6 +17,6 @@
 #include <cstdint>
 
 
-#include "Navigator/Logger.h"
+#include "Navigator/Core/Logger.h"
 
 #endif
\ No newline at end of file