diff --git a/EU07.cpp b/EU07.cpp
index a8e5817e..e1be8584 100644
--- a/EU07.cpp
+++ b/EU07.cpp
@@ -38,7 +38,7 @@ void export_e3d_standalone(std::string in, std::string out, int flags, bool dyna
 #include <string>
 #include <sstream>
 #include <iomanip>
-#include <Globals.h>
+#include <utilities/Globals.h>
 
 #ifdef _WIN32
 #pragma comment(lib, "Dbghelp.lib")
diff --git a/betterRenderer/renderer/include/nvrenderer/nvrenderer.h b/betterRenderer/renderer/include/nvrenderer/nvrenderer.h
index 80a3cd62..a572c6dc 100644
--- a/betterRenderer/renderer/include/nvrenderer/nvrenderer.h
+++ b/betterRenderer/renderer/include/nvrenderer/nvrenderer.h
@@ -22,14 +22,14 @@
 #include <mutex>
 
 // EU07 includes
-#include <Classes.h>
-#include <scene.h>
+#include <utilities/Classes.h>
+#include <scene/scene.h>
 
 #include "nvrenderer_enums.h"
 #include "quadtree.h"
 #include "rendering/renderer.h"
 #include "resource_registry.h"
-#include "sky.h"
+#include "environment/sky.h"
 
 namespace Rt {
 struct IRtModel;
diff --git a/betterRenderer/renderer/source/gbufferblitpass.cpp b/betterRenderer/renderer/source/gbufferblitpass.cpp
index 97123f91..6a927b3c 100644
--- a/betterRenderer/renderer/source/gbufferblitpass.cpp
+++ b/betterRenderer/renderer/source/gbufferblitpass.cpp
@@ -1,7 +1,7 @@
 #include "gbufferblitpass.h"
 
 #include <chrono>
-#include <Timer.h>
+#include <utilities/Timer.h>
 #include <nvrhi/utils.h>
 
 #include "contactshadows.h"
diff --git a/betterRenderer/renderer/source/materialparser.cpp b/betterRenderer/renderer/source/materialparser.cpp
index ed949bac..20ef4322 100644
--- a/betterRenderer/renderer/source/materialparser.cpp
+++ b/betterRenderer/renderer/source/materialparser.cpp
@@ -2,12 +2,12 @@
 
 #include "nvrenderer/nvrenderer.h"
 
-#include <Globals.h>
-#include <Logs.h>
+#include <utilities/Globals.h>
+#include <utilities/Logs.h>
 #include <fmt/format.h>
-#include <material.h>
+#include <model/material.h>
 #include <parser.h>
-#include <utilities.h>
+#include <utilities/utilities.h>
 #include <yaml-cpp/yaml.h>
 #include <string>
 
diff --git a/betterRenderer/renderer/source/nvrenderer.cpp b/betterRenderer/renderer/source/nvrenderer.cpp
index 9156ab08..926666d5 100644
--- a/betterRenderer/renderer/source/nvrenderer.cpp
+++ b/betterRenderer/renderer/source/nvrenderer.cpp
@@ -1,12 +1,12 @@
 #include "nvrenderer/nvrenderer.h"
 
-#include <AnimModel.h>
-#include <Logs.h>
-#include <Model3d.h>
-#include <Timer.h>
-#include <application.h>
+#include <model/AnimModel.h>
+#include <utilities/Logs.h>
+#include <model/Model3d.h>
+#include <utilities/Timer.h>
+#include <application/application.h>
 #include <nvrhi/utils.h>
-#include <simulation.h>
+#include <simulation/simulation.h>
 
 #include <future>
 #include <glm/gtx/transform.hpp>
diff --git a/betterRenderer/renderer/source/nvtexture.cpp b/betterRenderer/renderer/source/nvtexture.cpp
index fa0ea8a3..47178111 100644
--- a/betterRenderer/renderer/source/nvtexture.cpp
+++ b/betterRenderer/renderer/source/nvtexture.cpp
@@ -1,12 +1,12 @@
 #include "nvtexture.h"
 #include "nvrenderer/nvrenderer.h"
 
-#include <Globals.h>
-#include <PyInt.h>
-#include <application.h>
-#include <dictionary.h>
+#include <utilities/Globals.h>
+#include <scripting/PyInt.h>
+#include <application/application.h>
+#include <utilities/dictionary.h>
 #include <fmt/format.h>
-#include <utilities.h>
+#include <utilities/utilities.h>
 
 #include "utilities/Logs.h"
 // #include "Texture.h"
diff --git a/betterRenderer/renderer/source/track_batching.cpp b/betterRenderer/renderer/source/track_batching.cpp
index 946e4599..4223ae31 100644
--- a/betterRenderer/renderer/source/track_batching.cpp
+++ b/betterRenderer/renderer/source/track_batching.cpp
@@ -4,9 +4,9 @@
 #include "nvrenderer/nvrenderer.h"
 #include "nvrendererbackend.h"
 
-#include <Timer.h>
-#include <AnimModel.h>
-#include <simulation.h>
+#include <utilities/Timer.h>
+#include <model/AnimModel.h>
+#include <simulation/simulation.h>
 
 namespace BatchingUtils {
 
diff --git a/scripting/PyInt.cpp b/scripting/PyInt.cpp
index 7504e96b..007f732a 100644
--- a/scripting/PyInt.cpp
+++ b/scripting/PyInt.cpp
@@ -7,18 +7,18 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 
-#include "stdafx.h"
 #include "scripting/PyInt.h"
+#include "stdafx.h"
 
-#include "utilities/dictionary.h"
 #include "application/application.h"
-#include "utilities/Logs.h"
 #include "utilities/Globals.h"
+#include "utilities/Logs.h"
+#include "utilities/dictionary.h"
 
 #ifdef __GNUC__
 #pragma GCC diagnostic ignored "-Wwrite-strings"
 #endif
-#include <simulation.h>
+#include <simulation/simulation.h>
 
 void render_task::run()
 {