Changed source file structure

Grouped header and source files into directories from the previous flat structure
Renamed all .h files to .hpp

Praxis3D/Praxis3D.vcxproj

@@ -99,12 +99,13 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <LanguageStandard>stdcpp20</LanguageStandard>
-      <PreprocessorDefinitions>NOMINMAX;NDEBUG;_RELEASE;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;CUSTOM_IMGUIFILEDIALOG_CONFIG="..\\..\\..\\Praxis3D\Source\EngineDefinitions.h";GLM_FORCE_CTOR_INIT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NOMINMAX;NDEBUG;_RELEASE;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;CUSTOM_IMGUIFILEDIALOG_CONFIG="..\\..\\..\\Praxis3D\Source\Engine\Include\EngineDefinitions.hpp";GLM_FORCE_CTOR_INIT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <AdditionalOptions>/bigobj /MP8 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>$(ProjectDir)\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -150,77 +151,76 @@
     <ClCompile Include="..\Dependencies\include\imgui_tex_inspect\imgui_tex_inspect.cpp" />
     <ClCompile Include="..\Dependencies\include\imgui_tex_inspect\tex_inspect_opengl.cpp" />
     <ClCompile Include="main.cpp" />
-    <ClCompile Include="Source\AboutWindow.cpp" />
-    <ClCompile Include="Source\AtmScatteringModel.cpp" />
-    <ClCompile Include="Source\AtmScatteringPass.cpp" />
-    <ClCompile Include="Source\AudioScene.cpp" />
-    <ClCompile Include="Source\AudioSystem.cpp" />
-    <ClCompile Include="Source\AudioTask.cpp" />
-    <ClCompile Include="Source\BaseGraphicsComponent.cpp" />
-    <ClCompile Include="Source\BaseGraphicsObjects.cpp" />
-    <ClCompile Include="Source\ChangeController.cpp" />
-    <ClCompile Include="Source\ClockLocator.cpp" />
-    <ClCompile Include="Source\CommonDefinitions.cpp" />
-    <ClCompile Include="Source\Config.cpp" />
-    <ClCompile Include="Source\ConfigLoader.cpp" />
-    <ClCompile Include="Source\DeferredRenderer.cpp" />
-    <ClCompile Include="Source\EditorState.cpp" />
-    <ClCompile Include="Source\EditorWindow.cpp" />
-    <ClCompile Include="Source\Engine.cpp" />
-    <ClCompile Include="Source\EngineState.cpp" />
-    <ClCompile Include="Source\ErrorCodes.cpp" />
-    <ClCompile Include="Source\ErrorHandler.cpp" />
-    <ClCompile Include="Source\ErrorHandlerLocator.cpp" />
-    <ClCompile Include="Source\FmodErrorCodes.cpp" />
-    <ClCompile Include="Source\GeometryBuffer.cpp" />
-    <ClCompile Include="Source\GUIHandler.cpp" />
-    <ClCompile Include="Source\GUIHandlerLocator.cpp" />
-    <ClCompile Include="Source\GUIScene.cpp" />
-    <ClCompile Include="Source\GUISystem.cpp" />
-    <ClCompile Include="Source\GUITask.cpp" />
-    <ClCompile Include="Source\Input.cpp" />
-    <ClCompile Include="Source\KeyCommand.cpp" />
-    <ClCompile Include="Source\LightComponent.cpp" />
-    <ClCompile Include="Source\Loaders.cpp" />
-    <ClCompile Include="Source\LuaScript.cpp" />
-    <ClCompile Include="Source\MainMenuState.cpp" />
-    <ClCompile Include="Source\Math.cpp" />
-    <ClCompile Include="Source\ModelLoader.cpp" />
-    <ClCompile Include="Source\NullObjects.cpp" />
-    <ClCompile Include="Source\NullSystemObjects.cpp" />
-    <ClCompile Include="Source\ObjectDirectory.cpp" />
-    <ClCompile Include="Source\ObserverBase.cpp" />
-    <ClCompile Include="Source\PhysicsScene.cpp" />
-    <ClCompile Include="Source\PhysicsTask.cpp" />
-    <ClCompile Include="Source\PlayState.cpp" />
-    <ClCompile Include="Source\PropertyLoader.cpp" />
-    <ClCompile Include="Source\PropertySet.cpp" />
-    <ClCompile Include="Source\Renderer.cpp" />
-    <ClCompile Include="Source\RendererBackend.cpp" />
-    <ClCompile Include="Source\RendererFrontend.cpp" />
-    <ClCompile Include="Source\RendererGL.cpp" />
-    <ClCompile Include="Source\RendererScene.cpp" />
-    <ClCompile Include="Source\RendererSystem.cpp" />
-    <ClCompile Include="Source\RenderTask.cpp" />
-    <ClCompile Include="Source\RigidBodyComponent.cpp" />
-    <ClCompile Include="Source\Scancodes.cpp" />
-    <ClCompile Include="Source\SceneLoader.cpp" />
-    <ClCompile Include="Source\ScriptScene.cpp" />
-    <ClCompile Include="Source\ScriptSystem.cpp" />
-    <ClCompile Include="Source\ScriptTask.cpp" />
-    <ClCompile Include="Source\ShaderLoader.cpp" />
-    <ClCompile Include="Source\ShaderUniformUpdater.cpp" />
-    <ClCompile Include="Source\SpinWait.cpp" />
-    <ClCompile Include="Source\System.cpp" />
-    <ClCompile Include="Source\TaskManager.cpp" />
-    <ClCompile Include="Source\TaskManagerLocator.cpp" />
-    <ClCompile Include="Source\TaskScheduler.cpp" />
-    <ClCompile Include="Source\TextureLoader.cpp" />
-    <ClCompile Include="Source\Universal.cpp" />
-    <ClCompile Include="Source\Window.cpp" />
-    <ClCompile Include="Source\WindowLocator.cpp" />
-    <ClCompile Include="Source\WorldScene.cpp" />
-    <ClCompile Include="Source\WorldTask.cpp" />
+    <ClCompile Include="Source\Systems\GUISystem\Objects\Source\AboutWindow.cpp" />
+    <ClCompile Include="Source\Systems\RendererSystem\Source\AtmScatteringModel.cpp" />
+    <ClCompile Include="Source\Systems\RendererSystem\Passes\Source\AtmScatteringPass.cpp" />
+    <ClCompile Include="Source\Systems\AudioSystem\Source\AudioScene.cpp" />
+    <ClCompile Include="Source\Systems\AudioSystem\Source\AudioSystem.cpp" />
+    <ClCompile Include="Source\Systems\AudioSystem\Source\AudioTask.cpp" />
+    <ClCompile Include="Source\Systems\RendererSystem\Components\Source\BaseGraphicsComponent.cpp" />
+    <ClCompile Include="Source\Systems\RendererSystem\Components\Source\BaseGraphicsObjects.cpp" />
+    <ClCompile Include="Source\Communication\Source\ChangeController.cpp" />
+    <ClCompile Include="Source\ServiceLocators\Source\ClockLocator.cpp" />
+    <ClCompile Include="Source\Definitions\Source\CommonDefinitions.cpp" />
+    <ClCompile Include="Source\Loaders\Source\Config.cpp" />
+    <ClCompile Include="Source\Loaders\Source\ConfigLoader.cpp" />
+    <ClCompile Include="Source\Systems\RendererSystem\Source\DeferredRenderer.cpp" />
+    <ClCompile Include="Source\Engine\States\Source\EditorState.cpp" />
+    <ClCompile Include="Source\Systems\GUISystem\Objects\Source\EditorWindow.cpp" />
+    <ClCompile Include="Source\Engine\Source\Engine.cpp" />
+    <ClCompile Include="Source\Engine\States\Source\EngineState.cpp" />
+    <ClCompile Include="Source\ErrorHandler\Source\ErrorCodes.cpp" />
+    <ClCompile Include="Source\ErrorHandler\Source\ErrorHandler.cpp" />
+    <ClCompile Include="Source\ServiceLocators\Source\ErrorHandlerLocator.cpp" />
+    <ClCompile Include="Source\Systems\AudioSystem\Source\FmodErrorCodes.cpp" />
+    <ClCompile Include="Source\Systems\RendererSystem\Source\GeometryBuffer.cpp" />
+    <ClCompile Include="Source\Systems\GUISystem\Source\GUIHandler.cpp" />
+    <ClCompile Include="Source\ServiceLocators\Source\GUIHandlerLocator.cpp" />
+    <ClCompile Include="Source\Systems\GUISystem\Source\GUIScene.cpp" />
+    <ClCompile Include="Source\Systems\GUISystem\Source\GUISystem.cpp" />
+    <ClCompile Include="Source\Systems\GUISystem\Source\GUITask.cpp" />
+    <ClCompile Include="Source\Window\Source\Input.cpp" />
+    <ClCompile Include="Source\Window\Source\KeyCommand.cpp" />
+    <ClCompile Include="Source\Systems\RendererSystem\Components\Source\LightComponent.cpp" />
+    <ClCompile Include="Source\ServiceLocators\Source\Loaders.cpp" />
+    <ClCompile Include="Source\Systems\ScriptingSystem\Objects\Source\LuaScript.cpp" />
+    <ClCompile Include="Source\Engine\States\Source\MainMenuState.cpp" />
+    <ClCompile Include="Source\Math\Source\Math.cpp" />
+    <ClCompile Include="Source\Loaders\Source\ModelLoader.cpp" />
+    <ClCompile Include="Source\Systems\Base\Source\NullObjects.cpp" />
+    <ClCompile Include="Source\Systems\Base\Source\NullSystemObjects.cpp" />
+    <ClCompile Include="Source\ServiceLocators\Source\ObjectDirectory.cpp" />
+    <ClCompile Include="Source\Communication\Source\ObserverBase.cpp" />
+    <ClCompile Include="Source\Systems\PhysicsSystem\Source\PhysicsScene.cpp" />
+    <ClCompile Include="Source\Systems\PhysicsSystem\Source\PhysicsTask.cpp" />
+    <ClCompile Include="Source\Engine\States\Source\PlayState.cpp" />
+    <ClCompile Include="Source\Loaders\Source\PropertyLoader.cpp" />
+    <ClCompile Include="Source\Common\Source\PropertySet.cpp" />
+    <ClCompile Include="Source\Systems\RendererSystem\Source\Renderer.cpp" />
+    <ClCompile Include="Source\Systems\RendererSystem\Source\RendererBackend.cpp" />
+    <ClCompile Include="Source\Systems\RendererSystem\Source\RendererFrontend.cpp" />
+    <ClCompile Include="Source\Systems\RendererSystem\Source\RendererScene.cpp" />
+    <ClCompile Include="Source\Systems\RendererSystem\Source\RendererSystem.cpp" />
+    <ClCompile Include="Source\Systems\RendererSystem\Source\RenderTask.cpp" />
+    <ClCompile Include="Source\Systems\PhysicsSystem\Components\Source\RigidBodyComponent.cpp" />
+    <ClCompile Include="Source\Window\Source\Scancodes.cpp" />
+    <ClCompile Include="Source\Loaders\Source\SceneLoader.cpp" />
+    <ClCompile Include="Source\Systems\ScriptingSystem\Source\ScriptScene.cpp" />
+    <ClCompile Include="Source\Systems\ScriptingSystem\Source\ScriptSystem.cpp" />
+    <ClCompile Include="Source\Systems\ScriptingSystem\Source\ScriptTask.cpp" />
+    <ClCompile Include="Source\Loaders\Source\ShaderLoader.cpp" />
+    <ClCompile Include="Source\Shaders\Source\ShaderUniformUpdater.cpp" />
+    <ClCompile Include="Source\Multithreading\Source\SpinWait.cpp" />
+    <ClCompile Include="Source\Systems\Base\Source\System.cpp" />
+    <ClCompile Include="Source\Multithreading\Source\TaskManager.cpp" />
+    <ClCompile Include="Source\ServiceLocators\Source\TaskManagerLocator.cpp" />
+    <ClCompile Include="Source\Multithreading\Source\TaskScheduler.cpp" />
+    <ClCompile Include="Source\Loaders\Source\TextureLoader.cpp" />
+    <ClCompile Include="Source\Systems\Base\Source\Universal.cpp" />
+    <ClCompile Include="Source\Window\Source\Window.cpp" />
+    <ClCompile Include="Source\ServiceLocators\Source\WindowLocator.cpp" />
+    <ClCompile Include="Source\Systems\WorldSystem\Source\WorldScene.cpp" />
+    <ClCompile Include="Source\Systems\WorldSystem\Source\WorldTask.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\Dependencies\include\ImGuizmo\ImGuizmo.h" />
@@ -234,162 +234,162 @@
     <ClInclude Include="..\Dependencies\include\imgui_tex_inspect\imgui_tex_inspect.h" />
     <ClInclude Include="..\Dependencies\include\imgui_tex_inspect\imgui_tex_inspect_internal.h" />
     <ClInclude Include="..\Dependencies\include\imgui_tex_inspect\tex_inspect_opengl.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="resource1.h" />
-    <ClInclude Include="Source\AboutWindow.h" />
-    <ClInclude Include="Source\AtmScatteringConstants.h" />
-    <ClInclude Include="Source\AtmScatteringModel.h" />
-    <ClInclude Include="Source\AtmScatteringPass.h" />
-    <ClInclude Include="Source\AtmScatteringShaderDefinitions.h" />
-    <ClInclude Include="Source\AtmScatteringShaderFunctions.h" />
-    <ClInclude Include="Source\AtmScatteringShaderPass.h" />
-    <ClInclude Include="Source\AudioScene.h" />
-    <ClInclude Include="Source\AudioSystem.h" />
-    <ClInclude Include="Source\AudioTask.h" />
-    <ClInclude Include="Source\BaseGraphicsComponent.h" />
-    <ClInclude Include="Source\BaseGraphicsObjects.h" />
-    <ClInclude Include="Source\BaseScriptObject.h" />
-    <ClInclude Include="Source\BloomCompositePass.h" />
-    <ClInclude Include="Source\BloomPass.h" />
-    <ClInclude Include="Source\BlurPass.h" />
-    <ClInclude Include="Source\CameraComponent.h" />
-    <ClInclude Include="Source\CameraGraphicsObject.h" />
-    <ClInclude Include="Source\CameraScript.h" />
-    <ClInclude Include="Source\ChangeController.h" />
-    <ClInclude Include="Source\Clock.h" />
-    <ClInclude Include="Source\ClockLocator.h" />
-    <ClInclude Include="Source\CollisionEventComponent.h" />
-    <ClInclude Include="Source\CollisionShapeComponent.h" />
-    <ClInclude Include="Source\CommandBuffer.h" />
-    <ClInclude Include="Source\CommonDefinitions.h" />
-    <ClInclude Include="Source\ComponentConstructorInfo.h" />
-    <ClInclude Include="Source\Config.h" />
-    <ClInclude Include="Source\ConfigLoader.h" />
-    <ClInclude Include="Source\Containers.h" />
-    <ClInclude Include="Source\CSMFramebuffer.h" />
-    <ClInclude Include="Source\DebugMoveScript.h" />
-    <ClInclude Include="Source\DebugRotateScript.h" />
-    <ClInclude Include="Source\DebugUIScript.h" />
-    <ClInclude Include="Source\DeferredRenderer.h" />
-    <ClInclude Include="Source\EditorWindow.h" />
-    <ClInclude Include="Source\EditorState.h" />
-    <ClInclude Include="Source\Engine.h" />
-    <ClInclude Include="Source\EngineDefinitions.h" />
-    <ClInclude Include="Source\EngineState.h" />
-    <ClInclude Include="Source\EntityViewDefinitions.h" />
-    <ClInclude Include="Source\EnumFactory.h" />
-    <ClInclude Include="Source\EnvironmentMapObjects.h" />
-    <ClInclude Include="Source\ErrorCodes.h" />
-    <ClInclude Include="Source\ErrorHandler.h" />
-    <ClInclude Include="Source\ErrorHandlerLocator.h" />
-    <ClInclude Include="Source\Filesystem.h" />
-    <ClInclude Include="Source\FinalPass.h" />
-    <ClInclude Include="Source\FmodErrorCodes.h" />
-    <ClInclude Include="Source\Framebuffer.h" />
-    <ClInclude Include="Source\GameLogicObject.h" />
-    <ClInclude Include="Source\GameObject.h" />
-    <ClInclude Include="Source\GameObjectComponent.h" />
-    <ClInclude Include="Source\GeometryBuffer.h" />
-    <ClInclude Include="Source\GeometryPass.h" />
-    <ClInclude Include="Source\GraphicsDataSets.h" />
-    <ClInclude Include="Source\GraphicsLoadComponents.h" />
-    <ClInclude Include="Source\GraphicsObject.h" />
-    <ClInclude Include="Source\GUICommandBuffer.h" />
-    <ClInclude Include="Source\GUIDataManager.h" />
-    <ClInclude Include="Source\GUIHandler.h" />
-    <ClInclude Include="Source\GUIHandlerLocator.h" />
-    <ClInclude Include="Source\GUIObject.h" />
-    <ClInclude Include="Source\GUIPass.h" />
-    <ClInclude Include="Source\GUIScene.h" />
-    <ClInclude Include="Source\GUISequenceComponent.h" />
-    <ClInclude Include="Source\GUISystem.h" />
-    <ClInclude Include="Source\GUITask.h" />
-    <ClInclude Include="Source\HdrMappingPass.h" />
-    <ClInclude Include="Source\ImpactSoundComponent.h" />
-    <ClInclude Include="Source\InheritanceObjects.h" />
-    <ClInclude Include="Source\Input.h" />
-    <ClInclude Include="Source\KeyCommand.h" />
-    <ClInclude Include="Source\LenseFlareCompositePass.h" />
-    <ClInclude Include="Source\LenseFlarePass.h" />
-    <ClInclude Include="Source\LightComponent.h" />
-    <ClInclude Include="Source\LightingGraphicsObjects.h" />
-    <ClInclude Include="Source\LightingPass.h" />
-    <ClInclude Include="Source\LoaderBase.h" />
-    <ClInclude Include="Source\Loaders.h" />
-    <ClInclude Include="Source\LuaComponent.h" />
-    <ClInclude Include="Source\LuaScript.h" />
-    <ClInclude Include="Source\LuminancePass.h" />
-    <ClInclude Include="Source\MainMenuState.h" />
-    <ClInclude Include="Source\MetadataComponent.h" />
-    <ClInclude Include="Source\ObjectMaterialComponent.h" />
-    <ClInclude Include="Source\Math.h" />
-    <ClInclude Include="Source\ModelComponent.h" />
-    <ClInclude Include="Source\ModelLoader.h" />
-    <ClInclude Include="Source\ModelGraphicsObjects.h" />
-    <ClInclude Include="Source\ShadowMappingPass.h" />
-    <ClInclude Include="Source\SoundComponent.h" />
-    <ClInclude Include="Source\NullObjects.h" />
-    <ClInclude Include="Source\NullSystemObjects.h" />
-    <ClInclude Include="Source\ObjectDirectory.h" />
-    <ClInclude Include="Source\ObjectPool.h" />
-    <ClInclude Include="Source\ObserverBase.h" />
-    <ClInclude Include="Source\PhysicsDataManager.h" />
-    <ClInclude Include="Source\PhysicsMotionState.h" />
-    <ClInclude Include="Source\PhysicsObject.h" />
-    <ClInclude Include="Source\PhysicsScene.h" />
-    <ClInclude Include="Source\PhysicsSystem.h" />
-    <ClInclude Include="Source\PhysicsTask.h" />
-    <ClInclude Include="Source\PlayState.h" />
-    <ClInclude Include="Source\PostProcessPass.h" />
-    <ClInclude Include="Source\PropertyLoader.h" />
-    <ClInclude Include="Source\PropertySet.h" />
-    <ClInclude Include="Source\ReflectionPass.h" />
-    <ClInclude Include="Source\Renderer.h" />
-    <ClInclude Include="Source\RendererBackend.h" />
-    <ClInclude Include="Source\RendererFrontend.h" />
-    <ClInclude Include="Source\RendererScene.h" />
-    <ClInclude Include="Source\RendererSystem.h" />
-    <ClInclude Include="Source\RenderPassBase.h" />
-    <ClInclude Include="Source\RenderTask.h" />
-    <ClInclude Include="Source\RenderTaskBase.h" />
-    <ClInclude Include="Source\RigidBodyComponent.h" />
-    <ClInclude Include="Source\Scancodes.h" />
-    <ClInclude Include="Source\SceneLoader.h" />
-    <ClInclude Include="Source\ScriptObject.h" />
-    <ClInclude Include="Source\ScriptScene.h" />
-    <ClInclude Include="Source\ScriptSystem.h" />
-    <ClInclude Include="Source\ScriptTask.h" />
-    <ClInclude Include="Source\ServiceBase.h" />
-    <ClInclude Include="Source\ShaderComponent.h" />
-    <ClInclude Include="Source\ShaderGraphicsObjects.h" />
-    <ClInclude Include="Source\ShaderLoader.h" />
-    <ClInclude Include="Source\ShaderUniforms.h" />
-    <ClInclude Include="Source\ShaderUniformUpdater.h" />
-    <ClInclude Include="Source\SkyPass.h" />
-    <ClInclude Include="Source\SolarTimeScript.h" />
-    <ClInclude Include="Source\SoundListenerComponent.h" />
-    <ClInclude Include="Source\SpatialComponent.h" />
-    <ClInclude Include="Source\SpatialDataManager.h" />
-    <ClInclude Include="Source\SpinWait.h" />
-    <ClInclude Include="Source\AmbientOcclusionPass.h" />
-    <ClInclude Include="Source\SunScript.h" />
-    <ClInclude Include="Source\System.h" />
-    <ClInclude Include="Source\TaskManager.h" />
-    <ClInclude Include="Source\TaskManagerLocator.h" />
-    <ClInclude Include="Source\TaskScheduler.h" />
-    <ClInclude Include="Source\TextureLoader.h" />
-    <ClInclude Include="Source\TonemappingPass.h" />
-    <ClInclude Include="Source\UniformData.h" />
-    <ClInclude Include="Source\ObjectRegister.h" />
-    <ClInclude Include="Source\Universal.h" />
-    <ClInclude Include="Source\Utilities.h" />
-    <ClInclude Include="Source\Version.h" />
-    <ClInclude Include="Source\Window.h" />
-    <ClInclude Include="Source\WindowLocator.h" />
-    <ClInclude Include="Source\WorldEditObject.h" />
-    <ClInclude Include="Source\WorldScene.h" />
-    <ClInclude Include="Source\WorldSystem.h" />
-    <ClInclude Include="Source\WorldTask.h" />
+    <ClInclude Include="resource.hpp" />
+    <ClInclude Include="resource1.hpp" />
+    <ClInclude Include="Source\Systems\GUISystem\Objects\Include\AboutWindow.hpp" />
+    <ClInclude Include="Source\Shaders\AtmosphericScattering\Include\AtmScatteringConstants.hpp" />
+    <ClInclude Include="Source\Shaders\AtmosphericScattering\Include\AtmScatteringModel.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Passes\Include\AtmScatteringPass.hpp" />
+    <ClInclude Include="Source\Shaders\AtmosphericScattering\Include\AtmScatteringShaderDefinitions.hpp" />
+    <ClInclude Include="Source\Shaders\AtmosphericScattering\Include\AtmScatteringShaderFunctions.hpp" />
+    <ClInclude Include="Source\Shaders\AtmosphericScattering\Include\AtmScatteringShaderPass.hpp" />
+    <ClInclude Include="Source\Systems\AudioSystem\Include\AudioScene.hpp" />
+    <ClInclude Include="Source\Systems\AudioSystem\Include\AudioSystem.hpp" />
+    <ClInclude Include="Source\Systems\AudioSystem\Include\AudioTask.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Components\Include\BaseGraphicsComponent.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Components\Include\BaseGraphicsObjects.hpp" />
+    <ClInclude Include="Source\Systems\ScriptingSystem\Objects\Include\BaseScriptObject.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Passes\Include\BloomCompositePass.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Passes\Include\BloomPass.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Passes\Include\BlurPass.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Components\Include\CameraComponent.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Components\Include\CameraGraphicsObject.hpp" />
+    <ClInclude Include="Source\Systems\ScriptingSystem\Objects\Include\CameraScript.hpp" />
+    <ClInclude Include="Source\Communication\Include\ChangeController.hpp" />
+    <ClInclude Include="Source\Common\Include\Clock.hpp" />
+    <ClInclude Include="Source\ServiceLocators\Include\ClockLocator.hpp" />
+    <ClInclude Include="Source\Systems\PhysicsSystem\Components\Include\CollisionEventComponent.hpp" />
+    <ClInclude Include="Source\Systems\PhysicsSystem\Components\Include\CollisionShapeComponent.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Include\CommandBuffer.hpp" />
+    <ClInclude Include="Source\Definitions\Include\CommonDefinitions.hpp" />
+    <ClInclude Include="Source\Systems\WorldSystem\Components\Include\ComponentConstructorInfo.hpp" />
+    <ClInclude Include="Source\Loaders\Include\Config.hpp" />
+    <ClInclude Include="Source\Loaders\Include\ConfigLoader.hpp" />
+    <ClInclude Include="Source\Definitions\Include\Containers.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Include\CSMFramebuffer.hpp" />
+    <ClInclude Include="Source\Systems\ScriptingSystem\Objects\Include\DebugMoveScript.hpp" />
+    <ClInclude Include="Source\Systems\ScriptingSystem\Objects\Include\DebugRotateScript.hpp" />
+    <ClInclude Include="Source\Systems\ScriptingSystem\Objects\Include\DebugUIScript.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Include\DeferredRenderer.hpp" />
+    <ClInclude Include="Source\Systems\GUISystem\Objects\Include\EditorWindow.hpp" />
+    <ClInclude Include="Source\Engine\States\Include\EditorState.hpp" />
+    <ClInclude Include="Source\Engine\Include\Engine.hpp" />
+    <ClInclude Include="Source\Engine\Include\EngineDefinitions.hpp" />
+    <ClInclude Include="Source\Engine\States\Include\EngineState.hpp" />
+    <ClInclude Include="Source\Definitions\Include\EntityViewDefinitions.hpp" />
+    <ClInclude Include="Source\Common\Include\EnumFactory.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Components\Include\EnvironmentMapObjects.hpp" />
+    <ClInclude Include="Source\ErrorHandler\Include\ErrorCodes.hpp" />
+    <ClInclude Include="Source\ErrorHandler\Include\ErrorHandler.hpp" />
+    <ClInclude Include="Source\ServiceLocators\Include\ErrorHandlerLocator.hpp" />
+    <ClInclude Include="Source\Common\Include\Filesystem.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Passes\Include\FinalPass.hpp" />
+    <ClInclude Include="Source\Systems\AudioSystem\Include\FmodErrorCodes.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Include\Framebuffer.hpp" />
+    <ClInclude Include="Source\Systems\ScriptingSystem\Objects\Include\GameLogicObject.hpp" />
+    <ClInclude Include="Source\Systems\WorldSystem\Components\Include\GameObject.hpp" />
+    <ClInclude Include="Source\Systems\WorldSystem\Components\Include\GameObjectComponent.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Include\GeometryBuffer.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Passes\Include\GeometryPass.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Include\GraphicsDataSets.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Components\Include\GraphicsLoadComponents.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Components\Include\GraphicsObject.hpp" />
+    <ClInclude Include="Source\Systems\GUISystem\Include\GUICommandBuffer.hpp" />
+    <ClInclude Include="Source\DataManagers\Include\GUIDataManager.hpp" />
+    <ClInclude Include="Source\Systems\GUISystem\Include\GUIHandler.hpp" />
+    <ClInclude Include="Source\ServiceLocators\Include\GUIHandlerLocator.hpp" />
+    <ClInclude Include="Source\Systems\GUISystem\Components\Include\GUIObject.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Passes\Include\GUIPass.hpp" />
+    <ClInclude Include="Source\Systems\GUISystem\Include\GUIScene.hpp" />
+    <ClInclude Include="Source\Systems\GUISystem\Components\Include\GUISequenceComponent.hpp" />
+    <ClInclude Include="Source\Systems\GUISystem\Include\GUISystem.hpp" />
+    <ClInclude Include="Source\Systems\GUISystem\Include\GUITask.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Passes\Include\HdrMappingPass.hpp" />
+    <ClInclude Include="Source\Systems\AudioSystem\Components\Include\ImpactSoundComponent.hpp" />
+    <ClInclude Include="Source\Definitions\Include\InheritanceObjects.hpp" />
+    <ClInclude Include="Source\Window\Include\Input.hpp" />
+    <ClInclude Include="Source\Window\Include\KeyCommand.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Passes\Include\LenseFlareCompositePass.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Passes\Include\LenseFlarePass.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Components\Include\LightComponent.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Components\Include\LightingGraphicsObjects.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Passes\Include\LightingPass.hpp" />
+    <ClInclude Include="Source\Loaders\Include\LoaderBase.hpp" />
+    <ClInclude Include="Source\Loaders\Include\Loaders.hpp" />
+    <ClInclude Include="Source\Systems\ScriptingSystem\Components\Include\LuaComponent.hpp" />
+    <ClInclude Include="Source\Systems\ScriptingSystem\Objects\Include\LuaScript.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Passes\Include\LuminancePass.hpp" />
+    <ClInclude Include="Source\Engine\States\Include\MainMenuState.hpp" />
+    <ClInclude Include="Source\Systems\WorldSystem\Components\Include\MetadataComponent.hpp" />
+    <ClInclude Include="Source\Systems\WorldSystem\Components\Include\ObjectMaterialComponent.hpp" />
+    <ClInclude Include="Source\Math\Include\Math.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Components\Include\ModelComponent.hpp" />
+    <ClInclude Include="Source\Loaders\Include\ModelLoader.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Components\Include\ModelGraphicsObjects.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Passes\Include\ShadowMappingPass.hpp" />
+    <ClInclude Include="Source\Systems\AudioSystem\Components\Include\SoundComponent.hpp" />
+    <ClInclude Include="Source\Systems\Base\Include\NullObjects.hpp" />
+    <ClInclude Include="Source\Systems\Base\Include\NullSystemObjects.hpp" />
+    <ClInclude Include="Source\ServiceLocators\Include\ObjectDirectory.hpp" />
+    <ClInclude Include="Source\Common\Include\ObjectPool.hpp" />
+    <ClInclude Include="Source\Communication\Include\ObserverBase.hpp" />
+    <ClInclude Include="Source\DataManagers\Include\PhysicsDataManager.hpp" />
+    <ClInclude Include="Source\Systems\PhysicsSystem\Include\PhysicsMotionState.hpp" />
+    <ClInclude Include="Source\Systems\PhysicsSystem\Components\Include\PhysicsObject.hpp" />
+    <ClInclude Include="Source\Systems\PhysicsSystem\Include\PhysicsScene.hpp" />
+    <ClInclude Include="Source\Systems\PhysicsSystem\Include\PhysicsSystem.hpp" />
+    <ClInclude Include="Source\Systems\PhysicsSystem\Include\PhysicsTask.hpp" />
+    <ClInclude Include="Source\Engine\States\Include\PlayState.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Passes\Include\PostProcessPass.hpp" />
+    <ClInclude Include="Source\Loaders\Include\PropertyLoader.hpp" />
+    <ClInclude Include="Source\Common\Include\PropertySet.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Passes\Include\ReflectionPass.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Include\Renderer.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Include\RendererBackend.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Include\RendererFrontend.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Include\RendererScene.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Include\RendererSystem.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Passes\Include\RenderPassBase.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Include\RenderTask.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Include\RenderTaskBase.hpp" />
+    <ClInclude Include="Source\Systems\PhysicsSystem\Components\Include\RigidBodyComponent.hpp" />
+    <ClInclude Include="Source\Window\Include\Scancodes.hpp" />
+    <ClInclude Include="Source\Loaders\Include\SceneLoader.hpp" />
+    <ClInclude Include="Source\Systems\ScriptingSystem\Objects\Include\ScriptObject.hpp" />
+    <ClInclude Include="Source\Systems\ScriptingSystem\Include\ScriptScene.hpp" />
+    <ClInclude Include="Source\Systems\ScriptingSystem\Include\ScriptSystem.hpp" />
+    <ClInclude Include="Source\Systems\ScriptingSystem\Include\ScriptTask.hpp" />
+    <ClInclude Include="Source\Systems\Base\Include\ServiceBase.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Components\Include\ShaderComponent.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Components\Include\ShaderGraphicsObjects.hpp" />
+    <ClInclude Include="Source\Loaders\Include\ShaderLoader.hpp" />
+    <ClInclude Include="Source\Shaders\Include\ShaderUniforms.hpp" />
+    <ClInclude Include="Source\Shaders\Include\ShaderUniformUpdater.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Passes\Include\SkyPass.hpp" />
+    <ClInclude Include="Source\Systems\ScriptingSystem\Objects\Include\SolarTimeScript.hpp" />
+    <ClInclude Include="Source\Systems\AudioSystem\Components\Include\SoundListenerComponent.hpp" />
+    <ClInclude Include="Source\Systems\WorldSystem\Components\Include\SpatialComponent.hpp" />
+    <ClInclude Include="Source\DataManagers\Include\SpatialDataManager.hpp" />
+    <ClInclude Include="Source\Multithreading\Include\SpinWait.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Passes\Include\AmbientOcclusionPass.hpp" />
+    <ClInclude Include="Source\Systems\ScriptingSystem\Objects\Include\SunScript.hpp" />
+    <ClInclude Include="Source\Systems\Base\Include\System.hpp" />
+    <ClInclude Include="Source\Multithreading\Include\TaskManager.hpp" />
+    <ClInclude Include="Source\ServiceLocators\Include\TaskManagerLocator.hpp" />
+    <ClInclude Include="Source\Multithreading\Include\TaskScheduler.hpp" />
+    <ClInclude Include="Source\Loaders\Include\TextureLoader.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Passes\Include\TonemappingPass.hpp" />
+    <ClInclude Include="Source\Systems\RendererSystem\Include\UniformData.hpp" />
+    <ClInclude Include="Source\Common\Include\ObjectRegister.hpp" />
+    <ClInclude Include="Source\Systems\Base\Include\Universal.hpp" />
+    <ClInclude Include="Source\Common\Include\Utilities.hpp" />
+    <ClInclude Include="Source\Common\Include\Version.hpp" />
+    <ClInclude Include="Source\Window\Include\Window.hpp" />
+    <ClInclude Include="Source\ServiceLocators\Include\WindowLocator.hpp" />
+    <ClInclude Include="Source\Systems\ScriptingSystem\Objects\Include\WorldEditObject.hpp" />
+    <ClInclude Include="Source\Systems\WorldSystem\Include\WorldScene.hpp" />
+    <ClInclude Include="Source\Systems\WorldSystem\Include\WorldSystem.hpp" />
+    <ClInclude Include="Source\Systems\WorldSystem\Include\WorldTask.hpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Data\config.ini" />

Praxis3D/Praxis3D.vcxproj.filters

@@ -420,7 +420,7 @@
     <ClCompile Include="Source\EngineState.cpp">
       <Filter>Engine States\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\CommonDefinitions.cpp">
+    <ClCompile Include="Source\Definitions\Source Files\CommonDefinitions.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="Source\FmodErrorCodes.cpp">
@@ -470,361 +470,361 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Source\ErrorCodes.h">
+    <ClInclude Include="Source\ErrorCodes.hpp">
       <Filter>Error Handler\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\ErrorHandler.h">
+    <ClInclude Include="Source\ErrorHandler.hpp">
       <Filter>Error Handler\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\ConfigLoader.h">
+    <ClInclude Include="Source\ConfigLoader.hpp">
       <Filter>Loaders\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\LoaderBase.h">
+    <ClInclude Include="Source\LoaderBase.hpp">
       <Filter>Loaders\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\ModelLoader.h">
+    <ClInclude Include="Source\ModelLoader.hpp">
       <Filter>Loaders\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\PropertyLoader.h">
+    <ClInclude Include="Source\PropertyLoader.hpp">
       <Filter>Loaders\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\SceneLoader.h">
+    <ClInclude Include="Source\SceneLoader.hpp">
       <Filter>Loaders\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\ShaderLoader.h">
+    <ClInclude Include="Source\ShaderLoader.hpp">
       <Filter>Loaders\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\TextureLoader.h">
+    <ClInclude Include="Source\TextureLoader.hpp">
       <Filter>Loaders\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\SpinWait.h">
+    <ClInclude Include="Source\SpinWait.hpp">
       <Filter>Task Systems\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\TaskManager.h">
+    <ClInclude Include="Source\TaskManager.hpp">
       <Filter>Task Systems\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\TaskScheduler.h">
+    <ClInclude Include="Source\TaskScheduler.hpp">
       <Filter>Task Systems\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\ClockLocator.h">
+    <ClInclude Include="Source\ClockLocator.hpp">
       <Filter>Service Locators\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\ErrorHandlerLocator.h">
+    <ClInclude Include="Source\ErrorHandlerLocator.hpp">
       <Filter>Service Locators\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\Loaders.h">
+    <ClInclude Include="Source\Loaders.hpp">
       <Filter>Service Locators\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\TaskManagerLocator.h">
+    <ClInclude Include="Source\TaskManagerLocator.hpp">
       <Filter>Service Locators\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\WindowLocator.h">
+    <ClInclude Include="Source\WindowLocator.hpp">
       <Filter>Service Locators\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\ScriptScene.h">
+    <ClInclude Include="Source\ScriptScene.hpp">
       <Filter>Scripting\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\ScriptSystem.h">
+    <ClInclude Include="Source\ScriptSystem.hpp">
       <Filter>Scripting\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\ScriptTask.h">
+    <ClInclude Include="Source\ScriptTask.hpp">
       <Filter>Scripting\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\BaseScriptObject.h">
+    <ClInclude Include="Source\BaseScriptObject.hpp">
       <Filter>Scripting\Objects\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\CameraScript.h">
+    <ClInclude Include="Source\CameraScript.hpp">
       <Filter>Scripting\Objects\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\DebugUIScript.h">
+    <ClInclude Include="Source\DebugUIScript.hpp">
       <Filter>Scripting\Objects\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\DeferredRenderer.h">
+    <ClInclude Include="Source\DeferredRenderer.hpp">
       <Filter>Renderer\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\Framebuffer.h">
+    <ClInclude Include="Source\Framebuffer.hpp">
       <Filter>Renderer\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\GeometryBuffer.h">
+    <ClInclude Include="Source\GeometryBuffer.hpp">
       <Filter>Renderer\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\Renderer.h">
+    <ClInclude Include="Source\Renderer.hpp">
       <Filter>Renderer\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\RendererScene.h">
+    <ClInclude Include="Source\RendererScene.hpp">
       <Filter>Renderer\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\RendererSystem.h">
+    <ClInclude Include="Source\RendererSystem.hpp">
       <Filter>Renderer\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\RenderTask.h">
+    <ClInclude Include="Source\RenderTask.hpp">
       <Filter>Renderer\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\RenderTaskBase.h">
+    <ClInclude Include="Source\RenderTaskBase.hpp">
       <Filter>Renderer\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\BaseGraphicsObjects.h">
+    <ClInclude Include="Source\BaseGraphicsObjects.hpp">
       <Filter>Renderer\Objects\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\ShaderUniforms.h">
+    <ClInclude Include="Source\ShaderUniforms.hpp">
       <Filter>Shaders\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\ShaderUniformUpdater.h">
+    <ClInclude Include="Source\ShaderUniformUpdater.hpp">
       <Filter>Shaders\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\ChangeController.h">
+    <ClInclude Include="Source\ChangeController.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\Clock.h">
+    <ClInclude Include="Source\Clock.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\Config.h">
+    <ClInclude Include="Source\Config.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\Engine.h">
+    <ClInclude Include="Source\Engine.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\EngineDefinitions.h">
+    <ClInclude Include="Source\EngineDefinitions.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\EnumFactory.h">
+    <ClInclude Include="Source\EnumFactory.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\Input.h">
+    <ClInclude Include="Source\Input.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\KeyCommand.h">
+    <ClInclude Include="Source\KeyCommand.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\Math.h">
+    <ClInclude Include="Source\Math.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\NullSystemObjects.h">
+    <ClInclude Include="Source\NullSystemObjects.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\ObjectPool.h">
+    <ClInclude Include="Source\ObjectPool.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\ObserverBase.h">
+    <ClInclude Include="Source\ObserverBase.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\PropertySet.h">
+    <ClInclude Include="Source\PropertySet.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\Scancodes.h">
+    <ClInclude Include="Source\Scancodes.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\ServiceBase.h">
+    <ClInclude Include="Source\ServiceBase.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\System.h">
+    <ClInclude Include="Source\System.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\Universal.h">
+    <ClInclude Include="Source\Universal.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\Utilities.h">
+    <ClInclude Include="Source\Utilities.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\Window.h">
+    <ClInclude Include="Source\Window.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\ModelGraphicsObjects.h">
+    <ClInclude Include="Source\ModelGraphicsObjects.hpp">
       <Filter>Renderer\Objects\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\CameraGraphicsObject.h">
+    <ClInclude Include="Source\CameraGraphicsObject.hpp">
       <Filter>Renderer\Objects\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\ShaderGraphicsObjects.h">
+    <ClInclude Include="Source\ShaderGraphicsObjects.hpp">
       <Filter>Renderer\Objects\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\LightingGraphicsObjects.h">
+    <ClInclude Include="Source\LightingGraphicsObjects.hpp">
       <Filter>Renderer\Objects\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\GraphicsDataSets.h">
+    <ClInclude Include="Source\GraphicsDataSets.hpp">
       <Filter>Renderer\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\DebugMoveScript.h">
+    <ClInclude Include="Source\DebugMoveScript.hpp">
       <Filter>Scripting\Objects\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\EngineState.h">
+    <ClInclude Include="Source\EngineState.hpp">
       <Filter>Engine States\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\PlayState.h">
+    <ClInclude Include="Source\PlayState.hpp">
       <Filter>Engine States\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\WorldEditObject.h">
+    <ClInclude Include="Source\WorldEditObject.hpp">
       <Filter>Scripting\Objects\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\SolarTimeScript.h">
+    <ClInclude Include="Source\SolarTimeScript.hpp">
       <Filter>Scripting\Objects\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="resource.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\EnvironmentMapObjects.h">
+    <ClInclude Include="Source\EnvironmentMapObjects.hpp">
       <Filter>Renderer\Objects\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\RendererBackend.h">
+    <ClInclude Include="Source\RendererBackend.hpp">
       <Filter>Renderer\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\RendererFrontend.h">
+    <ClInclude Include="Source\RendererFrontend.hpp">
       <Filter>Renderer\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\CommonDefinitions.h">
+    <ClInclude Include="Source\Definitions\Header Files\CommonDefinitions.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\UniformData.h">
+    <ClInclude Include="Source\UniformData.hpp">
       <Filter>Renderer\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\RenderPassBase.h">
+    <ClInclude Include="Source\RenderPassBase.hpp">
       <Filter>Renderer\Render Passes\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\GeometryPass.h">
+    <ClInclude Include="Source\GeometryPass.hpp">
       <Filter>Renderer\Render Passes\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\LightingPass.h">
+    <ClInclude Include="Source\LightingPass.hpp">
       <Filter>Renderer\Render Passes\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\FinalPass.h">
+    <ClInclude Include="Source\FinalPass.hpp">
       <Filter>Renderer\Render Passes\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\ReflectionPass.h">
+    <ClInclude Include="Source\ReflectionPass.hpp">
       <Filter>Renderer\Render Passes\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\CommandBuffer.h">
+    <ClInclude Include="Source\CommandBuffer.hpp">
       <Filter>Renderer\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\ObjectDirectory.h">
+    <ClInclude Include="Source\ObjectDirectory.hpp">
       <Filter>Service Locators\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource1.h">
+    <ClInclude Include="resource1.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\BlurPass.h">
+    <ClInclude Include="Source\BlurPass.hpp">
       <Filter>Renderer\Render Passes\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\DebugRotateScript.h">
+    <ClInclude Include="Source\DebugRotateScript.hpp">
       <Filter>Scripting\Objects\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\SkyPass.h">
+    <ClInclude Include="Source\SkyPass.hpp">
       <Filter>Renderer\Render Passes\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\HdrMappingPass.h">
+    <ClInclude Include="Source\HdrMappingPass.hpp">
       <Filter>Renderer\Render Passes\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\PostProcessPass.h">
+    <ClInclude Include="Source\PostProcessPass.hpp">
       <Filter>Renderer\Render Passes\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\AtmScatteringModel.h">
+    <ClInclude Include="Source\AtmScatteringModel.hpp">
       <Filter>Renderer\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\AtmScatteringConstants.h">
+    <ClInclude Include="Source\AtmScatteringConstants.hpp">
       <Filter>Renderer\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\AtmScatteringShaderFunctions.h">
+    <ClInclude Include="Source\AtmScatteringShaderFunctions.hpp">
       <Filter>Shaders\Shader Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\AtmScatteringShaderDefinitions.h">
+    <ClInclude Include="Source\AtmScatteringShaderDefinitions.hpp">
       <Filter>Shaders\Shader Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\AtmScatteringPass.h">
+    <ClInclude Include="Source\AtmScatteringPass.hpp">
       <Filter>Renderer\Render Passes\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\AtmScatteringShaderPass.h">
+    <ClInclude Include="Source\AtmScatteringShaderPass.hpp">
       <Filter>Shaders\Shader Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\SunScript.h">
+    <ClInclude Include="Source\SunScript.hpp">
       <Filter>Scripting\Objects\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\BloomCompositePass.h">
+    <ClInclude Include="Source\BloomCompositePass.hpp">
       <Filter>Renderer\Render Passes\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\LenseFlarePass.h">
+    <ClInclude Include="Source\LenseFlarePass.hpp">
       <Filter>Renderer\Render Passes\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\LenseFlareCompositePass.h">
+    <ClInclude Include="Source\LenseFlareCompositePass.hpp">
       <Filter>Renderer\Render Passes\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\Filesystem.h">
+    <ClInclude Include="Source\Filesystem.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\WorldScene.h">
+    <ClInclude Include="Source\WorldScene.hpp">
       <Filter>World\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\GameObject.h">
+    <ClInclude Include="Source\GameObject.hpp">
       <Filter>World\Components</Filter>
     </ClInclude>
-    <ClInclude Include="Source\WorldTask.h">
+    <ClInclude Include="Source\WorldTask.hpp">
       <Filter>World\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\Containers.h">
+    <ClInclude Include="Source\Definitions\Header Files\Containers.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\GraphicsObject.h">
+    <ClInclude Include="Source\GraphicsObject.hpp">
       <Filter>Renderer\Objects\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\ObjectRegister.h">
+    <ClInclude Include="Source\ObjectRegister.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\BaseGraphicsComponent.h">
+    <ClInclude Include="Source\BaseGraphicsComponent.hpp">
       <Filter>Renderer\Objects\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\ModelComponent.h">
+    <ClInclude Include="Source\ModelComponent.hpp">
       <Filter>Renderer\Objects\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\ShaderComponent.h">
+    <ClInclude Include="Source\ShaderComponent.hpp">
       <Filter>Renderer\Objects\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\CameraComponent.h">
+    <ClInclude Include="Source\CameraComponent.hpp">
       <Filter>Renderer\Objects\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\LightComponent.h">
+    <ClInclude Include="Source\LightComponent.hpp">
       <Filter>Renderer\Objects\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\GameLogicObject.h">
+    <ClInclude Include="Source\GameLogicObject.hpp">
       <Filter>Scripting\Objects\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\InheritanceObjects.h">
+    <ClInclude Include="Source\InheritanceObjects.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\NullObjects.h">
+    <ClInclude Include="Source\NullObjects.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\WorldSystem.h">
+    <ClInclude Include="Source\WorldSystem.hpp">
       <Filter>World\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\ScriptObject.h">
+    <ClInclude Include="Source\ScriptObject.hpp">
       <Filter>Scripting\Objects\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\LuaComponent.h">
+    <ClInclude Include="Source\LuaComponent.hpp">
       <Filter>Scripting\Objects\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\LuaScript.h">
+    <ClInclude Include="Source\LuaScript.hpp">
       <Filter>Scripting\Objects\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\GUIScene.h">
+    <ClInclude Include="Source\GUIScene.hpp">
       <Filter>GUI\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\GUITask.h">
+    <ClInclude Include="Source\GUITask.hpp">
       <Filter>GUI\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\GUISystem.h">
+    <ClInclude Include="Source\GUISystem.hpp">
       <Filter>GUI\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\PhysicsSystem.h">
+    <ClInclude Include="Source\PhysicsSystem.hpp">
       <Filter>Physics\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\PhysicsScene.h">
+    <ClInclude Include="Source\PhysicsScene.hpp">
       <Filter>Physics\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\PhysicsTask.h">
+    <ClInclude Include="Source\PhysicsTask.hpp">
       <Filter>Physics\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\GUIHandler.h">
+    <ClInclude Include="Source\GUIHandler.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\GUIHandlerLocator.h">
+    <ClInclude Include="Source\GUIHandlerLocator.hpp">
       <Filter>Service Locators\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\Dependencies\include\imgui\imconfig.h">
@@ -842,97 +842,97 @@
     <ClInclude Include="..\Dependencies\include\imgui\backends\imgui_impl_opengl3_loader.h">
       <Filter>3rd Party\imgui\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\GUIPass.h">
+    <ClInclude Include="Source\GUIPass.hpp">
       <Filter>Renderer\Render Passes\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\GUICommandBuffer.h">
+    <ClInclude Include="Source\GUICommandBuffer.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\GUIObject.h">
+    <ClInclude Include="Source\GUIObject.hpp">
       <Filter>GUI\Objects\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\GUISequenceComponent.h">
+    <ClInclude Include="Source\GUISequenceComponent.hpp">
       <Filter>GUI\Objects\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\SpatialDataManager.h">
+    <ClInclude Include="Source\SpatialDataManager.hpp">
       <Filter>Data Managers</Filter>
     </ClInclude>
-    <ClInclude Include="Source\GUIDataManager.h">
+    <ClInclude Include="Source\GUIDataManager.hpp">
       <Filter>Data Managers</Filter>
     </ClInclude>
-    <ClInclude Include="Source\PhysicsDataManager.h">
+    <ClInclude Include="Source\PhysicsDataManager.hpp">
       <Filter>Data Managers</Filter>
     </ClInclude>
-    <ClInclude Include="Source\PhysicsObject.h">
+    <ClInclude Include="Source\PhysicsObject.hpp">
       <Filter>Physics\Components\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\PhysicsMotionState.h">
+    <ClInclude Include="Source\PhysicsMotionState.hpp">
       <Filter>Physics\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\RigidBodyComponent.h">
+    <ClInclude Include="Source\RigidBodyComponent.hpp">
       <Filter>Physics\Components\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\CollisionShapeComponent.h">
+    <ClInclude Include="Source\CollisionShapeComponent.hpp">
       <Filter>Physics\Components\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\SpatialComponent.h">
+    <ClInclude Include="Source\SpatialComponent.hpp">
       <Filter>World\Components</Filter>
     </ClInclude>
-    <ClInclude Include="Source\GameObjectComponent.h">
+    <ClInclude Include="Source\GameObjectComponent.hpp">
       <Filter>World\Components</Filter>
     </ClInclude>
-    <ClInclude Include="Source\EntityViewDefinitions.h">
+    <ClInclude Include="Source\EntityViewDefinitions.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\BloomPass.h">
+    <ClInclude Include="Source\BloomPass.hpp">
       <Filter>Renderer\Render Passes\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\LuminancePass.h">
+    <ClInclude Include="Source\LuminancePass.hpp">
       <Filter>Renderer\Render Passes\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\ComponentConstructorInfo.h">
+    <ClInclude Include="Source\ComponentConstructorInfo.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\AudioScene.h">
+    <ClInclude Include="Source\AudioScene.hpp">
       <Filter>Audio\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\AudioTask.h">
+    <ClInclude Include="Source\AudioTask.hpp">
       <Filter>Audio\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\AudioSystem.h">
+    <ClInclude Include="Source\AudioSystem.hpp">
       <Filter>Audio\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\MainMenuState.h">
+    <ClInclude Include="Source\MainMenuState.hpp">
       <Filter>Engine States\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\GraphicsLoadComponents.h">
+    <ClInclude Include="Source\GraphicsLoadComponents.hpp">
       <Filter>Renderer\Objects\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\SoundComponent.h">
+    <ClInclude Include="Source\SoundComponent.hpp">
       <Filter>Audio\Components</Filter>
     </ClInclude>
-    <ClInclude Include="Source\ObjectMaterialComponent.h">
+    <ClInclude Include="Source\ObjectMaterialComponent.hpp">
       <Filter>World\Components</Filter>
     </ClInclude>
-    <ClInclude Include="Source\CollisionEventComponent.h">
+    <ClInclude Include="Source\CollisionEventComponent.hpp">
       <Filter>Physics\Components\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\SoundListenerComponent.h">
+    <ClInclude Include="Source\SoundListenerComponent.hpp">
       <Filter>Audio\Components</Filter>
     </ClInclude>
-    <ClInclude Include="Source\FmodErrorCodes.h">
+    <ClInclude Include="Source\FmodErrorCodes.hpp">
       <Filter>Audio\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\ImpactSoundComponent.h">
+    <ClInclude Include="Source\ImpactSoundComponent.hpp">
       <Filter>Audio\Components</Filter>
     </ClInclude>
-    <ClInclude Include="Source\EditorState.h">
+    <ClInclude Include="Source\EditorState.hpp">
       <Filter>Engine States\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\EditorWindow.h">
+    <ClInclude Include="Source\EditorWindow.hpp">
       <Filter>GUI\Objects\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\MetadataComponent.h">
+    <ClInclude Include="Source\MetadataComponent.hpp">
       <Filter>World\Components</Filter>
     </ClInclude>
     <ClInclude Include="..\Dependencies\include\imgui_tex_inspect\imgui_tex_inspect.h">
@@ -950,25 +950,25 @@
     <ClInclude Include="..\Dependencies\include\ImGuizmo\ImGuizmo.h">
       <Filter>3rd Party\ImGuizmo</Filter>
     </ClInclude>
-    <ClInclude Include="Source\Version.h">
+    <ClInclude Include="Source\Version.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\Dependencies\include\imgui\backends\imgui_impl_sdl2.h">
       <Filter>3rd Party\imgui\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\AmbientOcclusionPass.h">
+    <ClInclude Include="Source\AmbientOcclusionPass.hpp">
       <Filter>Renderer\Render Passes\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\ShadowMappingPass.h">
+    <ClInclude Include="Source\ShadowMappingPass.hpp">
       <Filter>Renderer\Render Passes\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\CSMFramebuffer.h">
+    <ClInclude Include="Source\CSMFramebuffer.hpp">
       <Filter>Renderer\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\AboutWindow.h">
+    <ClInclude Include="Source\AboutWindow.hpp">
       <Filter>GUI\Objects\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\TonemappingPass.h">
+    <ClInclude Include="Source\TonemappingPass.hpp">
       <Filter>Renderer\Render Passes\Header Files</Filter>
     </ClInclude>
   </ItemGroup>

Praxis3D/Source/BaseGraphicsComponent.cpp

@@ -1,6 +0,0 @@
-#include "BaseGraphicsComponent.h"
-#include "GraphicsObject.h"
-
-void update(GraphicsObject &p_parentObject)
-{
-}

Praxis3D/Source/Clock.h → Praxis3D/Source/Common/Include/Clock.hpp

@@ -7,8 +7,8 @@
 #endif
 #include <Windows.h>
 
-#include "Config.h"
-#include "ErrorCodes.h"
+#include "Loaders/Include/Config.hpp"
+#include "ErrorHandler/Include/ErrorCodes.hpp"
 
 // Base class from which real and null implementations must inherit
 // Does not contain some core methods, to restrict access to however can only call the base class, and whoever has

Praxis3D/Source/Filesystem.h → Praxis3D/Source/Common/Include/Filesystem.hpp

@@ -7,7 +7,7 @@
 #include <iostream>
 #include <sstream>
 
-#include "Utilities.h"
+#include "Common/Include/Utilities.hpp"
 
 // General file and file-system operations
 class Filesystem

Praxis3D/Source/ObjectPool.h → Praxis3D/Source/Common/Include/ObjectPool.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "ErrorCodes.h"
+#include "ErrorHandler/Include/ErrorCodes.hpp"
 
 // Generic object pool (used to optimize data locality). Simplistic design intended
 // for game objects (i.e. entities that need fast random access, add/remove, etc)

Praxis3D/Source/ObjectRegister.h → Praxis3D/Source/Common/Include/ObjectRegister.hpp

@@ -7,7 +7,7 @@ constexpr auto OBJECT_REGISTER_RESIZE_ADDED_OVERHEAD_MULTIPLIER = 1.5;
 #include <tbb/concurrent_vector.h>
 #include <vector>
 
-#include "CommonDefinitions.h"
+#include "Definitions/Include/CommonDefinitions.hpp"
 
 // An object directory, used for getting unique IDs to all registered objects.
 // Also contains a list of registered object pointers, thus an object can be retrieved based on its ID.

Praxis3D/Source/PropertySet.h → Praxis3D/Source/Common/Include/PropertySet.hpp

@@ -4,9 +4,9 @@
 #include <iostream>
 #include <vector>
 
-#include "Config.h"
-#include "Math.h"
-#include "Utilities.h"
+#include "Loaders/Include/Config.hpp"
+#include "Math/Include/Math.hpp"
+#include "Common/Include/Utilities.hpp"
 
 class PropertySet;
 

Praxis3D/Source/Utilities.h → Praxis3D/Source/Common/Include/Utilities.hpp

@@ -3,7 +3,7 @@
 #include <sstream>
 #include <string>
 
-#include "Scancodes.h"
+#include "Window/Include/Scancodes.hpp"
 
 namespace Utilities
 {

Praxis3D/Source/PropertySet.cpp → Praxis3D/Source/Common/Source/PropertySet.cpp

@@ -1,4 +1,4 @@
-#include "PropertySet.h"
+#include "Common/Include/PropertySet.hpp"
 
 Property PropertySet::m_nullProperty;
 PropertySet PropertySet::m_nullPropertySet;

Praxis3D/Source/ChangeController.h → Praxis3D/Source/Communication/Include/ChangeController.hpp

@@ -2,8 +2,8 @@
 #include <list>
 #include <vector>
 
-#include "ObserverBase.h"
-#include "SpinWait.h"
+#include "Communication/Include/ObserverBase.hpp"
+#include "Multithreading/Include/SpinWait.hpp"
 
 #include <lmerr.h>
 #include <tchar.h>

Praxis3D/Source/ObserverBase.h → Praxis3D/Source/Communication/Include/ObserverBase.hpp

@@ -24,11 +24,11 @@
 
 #include <list>
 
-#include "Config.h"
-#include "Containers.h"
-#include "NullObjects.h"
-#include "Math.h"
-#include "SpinWait.h"
+#include "Loaders/Include/Config.hpp"
+#include "Definitions/Include/Containers.hpp"
+#include "Systems/Base/Include/NullObjects.hpp"
+#include "Math/Include/Math.hpp"
+#include "Multithreading/Include/SpinWait.hpp"
 
 typedef unsigned int SystemObjectID;
 

Praxis3D/Source/ChangeController.cpp → Praxis3D/Source/Communication/Source/ChangeController.cpp

@@ -1,7 +1,7 @@
 
-#include "ChangeController.h"
-#include "ErrorHandlerLocator.h"
-#include "TaskManager.h"
+#include "Communication/Include/ChangeController.hpp"
+#include "ServiceLocators/Include/ErrorHandlerLocator.hpp"
+#include "Multithreading/Include/TaskManager.hpp"
 
 ChangeController::ChangeController() : Observer(Properties::PropertyID::ChangeController), m_lastID(0), m_tlsNotifyList(TLS_OUT_OF_INDEXES), m_taskManager(nullptr)
 {

Praxis3D/Source/ObserverBase.cpp → Praxis3D/Source/Communication/Source/ObserverBase.cpp

@@ -1,4 +1,4 @@
-#include "ObserverBase.h"
+#include "Communication/Include/ObserverBase.hpp"
 
 ObservedSubject::ObservedSubject()
 {

Praxis3D/Source/GUIDataManager.h → Praxis3D/Source/DataManagers/Include/GUIDataManager.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Containers.h"
-#include "ObserverBase.h"
+#include "Definitions/Include/Containers.hpp"
+#include "Communication/Include/ObserverBase.hpp"
 
 // Manages GUI data updates
 class GUIDataManager

Praxis3D/Source/PhysicsDataManager.h → Praxis3D/Source/DataManagers/Include/PhysicsDataManager.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Containers.h"
-#include "ObserverBase.h"
+#include "Definitions/Include/Containers.hpp"
+#include "Communication/Include/ObserverBase.hpp"
 
 // Manages physics data updates
 class PhysicsDataManager

Praxis3D/Source/SpatialDataManager.h → Praxis3D/Source/DataManagers/Include/SpatialDataManager.hpp

@@ -3,10 +3,10 @@
 #include <atomic>
 #include <iostream>
 
-#include "Containers.h"
-#include "CommonDefinitions.h"
-#include "ObserverBase.h"
-#include "NullObjects.h"
+#include "Definitions/Include/Containers.hpp"
+#include "Definitions/Include/CommonDefinitions.hpp"
+#include "Communication/Include/ObserverBase.hpp"
+#include "Systems/Base/Include/NullObjects.hpp"
 
 // Manages spatial data updates. Contains:
 // *Local-space data		- local data that is every object has individually 

Praxis3D/Source/CommonDefinitions.h → Praxis3D/Source/Definitions/Include/CommonDefinitions.hpp

@@ -3,8 +3,8 @@
 #include <GL\glew.h>
 #include <functional>
 
-#include "EnumFactory.h"
-#include "Utilities.h"
+#include "Common/Include/EnumFactory.hpp"
+#include "Common/Include/Utilities.hpp"
 
 typedef std::uint32_t EntityID;
 typedef unsigned int UpdateCount;

Praxis3D/Source/Containers.h → Praxis3D/Source/Definitions/Include/Containers.hpp

@@ -2,10 +2,10 @@
 
 #include <string>
 
-#include "Config.h"
-#include "CommonDefinitions.h"
-#include "Math.h"
-#include "PropertySet.h"
+#include "Loaders/Include/Config.hpp"
+#include "Definitions/Include/CommonDefinitions.hpp"
+#include "Math/Include/Math.hpp"
+#include "Common/Include/PropertySet.hpp"
 
 // Stores two template objects to be used for double buffering
 template <class T_Object>

Praxis3D/Source/EntityViewDefinitions.h → Praxis3D/Source/Definitions/Include/EntityViewDefinitions.hpp

@@ -2,23 +2,15 @@
 
 #include <entt/entt.hpp>
 
-#include "CameraComponent.h"
-#include "GraphicsLoadComponents.h"
-#include "LightComponent.h"
-#include "ModelComponent.h"
-#include "ShaderComponent.h"
-#include "SpatialComponent.h"
+#include "Systems/RendererSystem/Components/Include/CameraComponent.hpp"
+#include "Systems/RendererSystem/Components/Include/GraphicsLoadComponents.hpp"
+#include "Systems/RendererSystem/Components/Include/LightComponent.hpp"
+#include "Systems/RendererSystem/Components/Include/ModelComponent.hpp"
+#include "Systems/RendererSystem/Components/Include/ShaderComponent.hpp"
+#include "Systems/WorldSystem/Components/Include/SpatialComponent.hpp"
 
-//class ModelComponent;
-//class SpatialComponent;
-//class ShaderComponent;
-
-//typedef entt::basic_view<unsigned int, entt::get_t<ModelComponent, SpatialComponent>, entt::exclude_t<ShaderComponent, GraphicsLoadToMemoryComponent, GraphicsLoadToVideoMemoryComponent>> ModelSpatialView;
 //typedef entt::basic_view<entt::get_t<entt::basic_sigh_mixin<entt::basic_storage<Type, Entity, Allocator, void>, entt::basic_registry<Entity, std::allocator<std::seed_seq::result_type>>>, entt::basic_sigh_mixin<entt::basic_storage<SpatialComponent, Entity, std::allocator<SpatialComponent>, void>, entt::basic_registry<Entity, std::allocator<std::seed_seq::result_type>>>>, entt::exclude_t<entt::basic_sigh_mixin<entt::basic_storage<ShaderComponent, Entity, std::allocator<ShaderComponent>, void>, entt::basic_registry<Entity, std::allocator<std::seed_seq::result_type>>>, entt::basic_sigh_mixin<entt::basic_storage<GraphicsLoadToMemoryComponent, Entity, std::allocator<GraphicsLoadToMemoryComponent>, void>, entt::basic_registry<Entity, std::allocator<std::seed_seq::result_type>>>, entt::basic_sigh_mixin<entt::basic_storage<GraphicsLoadToVideoMemoryComponent, Entity, std::allocator<GraphicsLoadToVideoMemoryComponent>, void>, entt::basic_registry<Entity, std::allocator<std::seed_seq::result_type>>>>, void> ModelSpatialView;
 typedef entt::basic_view<unsigned int, entt::get_t<ModelComponent, ShaderComponent, SpatialComponent>, entt::exclude_t<GraphicsLoadToMemoryComponent, GraphicsLoadToVideoMemoryComponent>> ModelShaderSpatialView;
 typedef entt::basic_view<unsigned int, entt::get_t<LightComponent, SpatialComponent>, entt::exclude_t<>> LightSpatialView;
 
-//typedef entt::basic_view<unsigned int, entt::get_t<ModelComponent>, entt::exclude_t<ShaderComponent, GraphicsLoadToMemoryComponent, GraphicsLoadToVideoMemoryComponent>> ModelLoadToVideoMemoryView;
-//typedef entt::basic_view<unsigned int, entt::get_t<ModelComponent, ShaderComponent>, entt::exclude_t<GraphicsLoadToMemoryComponent, GraphicsLoadToVideoMemoryComponent>> ModelShaderLoadToVideoMemoryView;
-
 typedef entt::basic_view<unsigned int, entt::get_t<GraphicsLoadToVideoMemoryComponent>, entt::exclude_t<GraphicsLoadToMemoryComponent>> LoadToVideoMemoryView;

Praxis3D/Source/InheritanceObjects.h → Praxis3D/Source/Definitions/Include/InheritanceObjects.hpp

@@ -1,11 +1,11 @@
 #pragma once
 
-#include "CommonDefinitions.h"
-#include "GraphicsDataSets.h"
-#include "GUIDataManager.h"
-#include "NullObjects.h"
-#include "PhysicsDataManager.h"
-#include "SpatialDataManager.h"
+#include "Definitions/Include/CommonDefinitions.hpp"
+#include "Systems/RendererSystem/Include/GraphicsDataSets.hpp"
+#include "DataManagers/Include/GUIDataManager.hpp"
+#include "Systems/Base/Include/NullObjects.hpp"
+#include "DataManagers/Include/PhysicsDataManager.hpp"
+#include "DataManagers/Include/SpatialDataManager.hpp"
 
 // Contains a const pointer to a SpatialDataManager
 // Used for objects that do not have their own SpatialDataManager, but uses another objects SpatialDataManager to get spatial values

Praxis3D/Source/CommonDefinitions.cpp → Praxis3D/Source/Definitions/Source/CommonDefinitions.cpp

@@ -1,4 +1,4 @@
-#include "CommonDefinitions.h"
+#include "Definitions/Include/CommonDefinitions.hpp"
 
 DEFINE_ENUM(ComponentType, COMPONENT_TYPE)
 DEFINE_ENUM(RenderPassType, RENDER_PASS_TYPE)

Praxis3D/Source/Engine.h → Praxis3D/Source/Engine/Include/Engine.hpp

@@ -1,15 +1,15 @@
 #pragma once
 
-#include "Clock.h"
-#include "Config.h"
-#include "EditorState.h"
-#include "ErrorCodes.h"
-#include "ErrorHandlerLocator.h"
-#include "GUIHandlerLocator.h"
-#include "MainMenuState.h"
-#include "PlayState.h"
-#include "TaskManager.h"
-#include "Window.h"
+#include "Common/Include/Clock.hpp"
+#include "Loaders/Include/Config.hpp"
+#include "Engine/States/Include/EditorState.hpp"
+#include "ErrorHandler/Include/ErrorCodes.hpp"
+#include "ServiceLocators/Include/ErrorHandlerLocator.hpp"
+#include "ServiceLocators/Include/GUIHandlerLocator.hpp"
+#include "Engine/States/Include/MainMenuState.hpp"
+#include "Engine/States/Include/PlayState.hpp"
+#include "Multithreading/Include/TaskManager.hpp"
+#include "Window/Include/Window.hpp"
 
 // Class containing a complete one instance of the engine.
 class Engine

Praxis3D/Source/Engine.cpp → Praxis3D/Source/Engine/Source/Engine.cpp

@@ -6,18 +6,18 @@
 #include <stdlib.h>     /* srand, rand */
 #include <time.h>       /* time */
 
-#include "AudioSystem.h"
-#include "ClockLocator.h"
-#include "Engine.h"
-#include "GUIHandlerLocator.h"
-#include "GUISystem.h"
-#include "ObjectDirectory.h"
-#include "PhysicsSystem.h"
-#include "RendererSystem.h"
-#include "ScriptSystem.h"
-#include "TaskManagerLocator.h"
-#include "WindowLocator.h"
-#include "WorldSystem.h"
+#include "Systems/AudioSystem/Include/AudioSystem.hpp"
+#include "ServiceLocators/Include/ClockLocator.hpp"
+#include "Engine/Include/Engine.hpp"
+#include "ServiceLocators/Include/GUIHandlerLocator.hpp"
+#include "Systems/GUISystem/Include/GUISystem.hpp"
+#include "ServiceLocators/Include/ObjectDirectory.hpp"
+#include "Systems/PhysicsSystem/Include/PhysicsSystem.hpp"
+#include "Systems/RendererSystem/Include/RendererSystem.hpp"
+#include "Systems/ScriptingSystem/Include/ScriptSystem.hpp"
+#include "ServiceLocators/Include/TaskManagerLocator.hpp"
+#include "ServiceLocators/Include/WindowLocator.hpp"
+#include "Systems/WorldSystem/Include/WorldSystem.hpp"
 
 // Try to run on a dedicated GPU (in cases where there's integrated and dedicated GPUs in the system),
 // by requesting the high performance power settings from both nVidia and AMD GPUs

Praxis3D/Source/EditorState.h → Praxis3D/Source/Engine/States/Include/EditorState.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "SceneLoader.h"
-#include "EngineState.h"
-#include "TaskManager.h"
-#include "TaskScheduler.h"
+#include "Loaders/Include/SceneLoader.hpp"
+#include "Engine/States/Include/EngineState.hpp"
+#include "Multithreading/Include/TaskManager.hpp"
+#include "Multithreading/Include/TaskScheduler.hpp"
 
 class EditorState : public EngineState
 {

Praxis3D/Source/EngineState.h → Praxis3D/Source/Engine/States/Include/EngineState.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
-#include "Config.h"
-#include "ErrorCodes.h"
-#include "SceneLoader.h"
-#include "TaskManager.h"
-#include "TaskScheduler.h"
+#include "Loaders/Include/Config.hpp"
+#include "ErrorHandler/Include/ErrorCodes.hpp"
+#include "Loaders/Include/SceneLoader.hpp"
+#include "Multithreading/Include/TaskManager.hpp"
+#include "Multithreading/Include/TaskScheduler.hpp"
 
 
 class Engine;

Praxis3D/Source/MainMenuState.h → Praxis3D/Source/Engine/States/Include/MainMenuState.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "SceneLoader.h"
-#include "EngineState.h"
-#include "TaskManager.h"
-#include "TaskScheduler.h"
+#include "Loaders/Include/SceneLoader.hpp"
+#include "Engine/States/Include/EngineState.hpp"
+#include "Multithreading/Include/TaskManager.hpp"
+#include "Multithreading/Include/TaskScheduler.hpp"
 
 class MainMenuState : public EngineState
 {

Praxis3D/Source/PlayState.h → Praxis3D/Source/Engine/States/Include/PlayState.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "SceneLoader.h"
-#include "EngineState.h"
-#include "TaskManager.h"
-#include "TaskScheduler.h"
+#include "Loaders/Include/SceneLoader.hpp"
+#include "Engine/States/Include/EngineState.hpp"
+#include "Multithreading/Include/TaskManager.hpp"
+#include "Multithreading/Include/TaskScheduler.hpp"
 
 class PlayState : public EngineState
 {

Praxis3D/Source/EditorState.cpp → Praxis3D/Source/Engine/States/Source/EditorState.cpp

@@ -1,11 +1,11 @@
-#include "ClockLocator.h"
-#include "EditorState.h"
-#include "GUISystem.h"
-#include "PhysicsSystem.h"
-#include "PropertySet.h"
-#include "ScriptSystem.h"
-#include "RendererSystem.h"
-#include "WorldSystem.h"
+#include "ServiceLocators/Include/ClockLocator.hpp"
+#include "Engine/States/Include/EditorState.hpp"
+#include "Systems/GUISystem/Include/GUISystem.hpp"
+#include "Systems/PhysicsSystem/Include/PhysicsSystem.hpp"
+#include "Common/Include/PropertySet.hpp"
+#include "Systems/ScriptingSystem/Include/ScriptSystem.hpp"
+#include "Systems/RendererSystem/Include/RendererSystem.hpp"
+#include "Systems/WorldSystem/Include/WorldSystem.hpp"
 
 EditorState::EditorState(Engine &p_engine) : EngineState(p_engine, EngineStateType::EngineStateType_Editor)
 {

Praxis3D/Source/EngineState.cpp → Praxis3D/Source/Engine/States/Source/EngineState.cpp

@@ -1,12 +1,12 @@
 
-#include "AudioSystem.h"
-#include "Engine.h"
-#include "EngineState.h"
-#include "GUISystem.h"
-#include "PhysicsSystem.h"
-#include "RendererSystem.h"
-#include "ScriptSystem.h"
-#include "WorldSystem.h"
+#include "Systems/AudioSystem/Include/AudioSystem.hpp"
+#include "Engine/Include/Engine.hpp"
+#include "Engine/States/Include/EngineState.hpp"
+#include "Systems/GUISystem/Include/GUISystem.hpp"
+#include "Systems/PhysicsSystem/Include/PhysicsSystem.hpp"
+#include "Systems/RendererSystem/Include/RendererSystem.hpp"
+#include "Systems/ScriptingSystem/Include/ScriptSystem.hpp"
+#include "Systems/WorldSystem/Include/WorldSystem.hpp"
 
 EngineState::EngineState(Engine &p_engine, EngineStateType p_engineState) : m_engine(p_engine), m_sceneLoader(p_engineState), m_engineStateType(p_engineState), m_initialized(false), m_loaded(false)
 {

Praxis3D/Source/MainMenuState.cpp → Praxis3D/Source/Engine/States/Source/MainMenuState.cpp

@@ -1,12 +1,12 @@
 
-#include "ClockLocator.h"
-#include "GUISystem.h"
-#include "MainMenuState.h"
-#include "PhysicsSystem.h"
-#include "PropertySet.h"
-#include "ScriptSystem.h"
-#include "RendererSystem.h"
-#include "WorldSystem.h"
+#include "ServiceLocators/Include/ClockLocator.hpp"
+#include "Systems/GUISystem/Include/GUISystem.hpp"
+#include "Engine/States/Include/MainMenuState.hpp"
+#include "Systems/PhysicsSystem/Include/PhysicsSystem.hpp"
+#include "Common/Include/PropertySet.hpp"
+#include "Systems/ScriptingSystem/Include/ScriptSystem.hpp"
+#include "Systems/RendererSystem/Include/RendererSystem.hpp"
+#include "Systems/WorldSystem/Include/WorldSystem.hpp"
 
 MainMenuState::MainMenuState(Engine &p_engine) : EngineState(p_engine, EngineStateType::EngineStateType_MainMenu)
 {

Praxis3D/Source/PlayState.cpp → Praxis3D/Source/Engine/States/Source/PlayState.cpp

@@ -1,12 +1,12 @@
 
-#include "ClockLocator.h"
-#include "GUISystem.h"
-#include "PhysicsSystem.h"
-#include "PlayState.h"
-#include "PropertySet.h"
-#include "ScriptSystem.h"
-#include "RendererSystem.h"
-#include "WorldSystem.h"
+#include "ServiceLocators/Include/ClockLocator.hpp"
+#include "Systems/GUISystem/Include/GUISystem.hpp"
+#include "Systems/PhysicsSystem/Include/PhysicsSystem.hpp"
+#include "Engine/States/Include/PlayState.hpp"
+#include "Common/Include/PropertySet.hpp"
+#include "Systems/ScriptingSystem/Include/ScriptSystem.hpp"
+#include "Systems/RendererSystem/Include/RendererSystem.hpp"
+#include "Systems/WorldSystem/Include/WorldSystem.hpp"
 
 PlayState::PlayState(Engine &p_engine) : EngineState(p_engine, EngineStateType::EngineStateType_Play)
 {

Praxis3D/Source/ErrorCodes.h → Praxis3D/Source/ErrorHandler/Include/ErrorCodes.hpp

@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "EnumFactory.h"
+#include "Common/Include/EnumFactory.hpp"
 
 /*   ___________________________________________________________________________________________________
 	|										|					 |										|

Praxis3D/Source/ErrorHandler.h → Praxis3D/Source/ErrorHandler/Include/ErrorHandler.hpp

@@ -4,8 +4,8 @@
 #include <string>
 #include <tbb/concurrent_vector.h>
 
-#include "Config.h"
-#include "ErrorCodes.h"
+#include "Loaders/Include/Config.hpp"
+#include "ErrorHandler/Include/ErrorCodes.hpp"
 
 struct SingleLog
 {

Praxis3D/Source/ErrorCodes.cpp → Praxis3D/Source/ErrorHandler/Source/ErrorCodes.cpp

@@ -1,4 +1,4 @@
-#include "ErrorCodes.h"
+#include "ErrorHandler/Include/ErrorCodes.hpp"
 
 DEFINE_ENUM(ErrorType, ERROR_TYPES)
 

Praxis3D/Source/ErrorHandler.cpp → Praxis3D/Source/ErrorHandler/Source/ErrorHandler.cpp

@@ -1,10 +1,10 @@
 
 #include <Windows.h>
 
-#include "Config.h"
-#include "ConfigLoader.h"
-#include "ErrorHandler.h"
-#include "WindowLocator.h"
+#include "Loaders/Include/Config.hpp"
+#include "Loaders/Include/ConfigLoader.hpp"
+#include "ErrorHandler/Include/ErrorHandler.hpp"
+#include "ServiceLocators/Include/WindowLocator.hpp"
 
 // Predefined variables for "AssignErrorType" macro
 #define ERR_TYP_PREDEF m_errorTypes

Praxis3D/Source/FmodErrorCodes.cpp

@@ -1,3 +0,0 @@
-#include "FmodErrorCodes.h"
-
-DEFINE_ENUM(FmodErrorCodes, FMOD_ERROR_CODES)

Praxis3D/Source/Input.cpp

@@ -1 +0,0 @@
-#include "Input.h"

Praxis3D/Source/LightComponent.cpp

@@ -1,2 +0,0 @@
-#include "GraphicsObject.h"
-#include "LightComponent.h"

Praxis3D/Source/Config.h → Praxis3D/Source/Loaders/Include/Config.hpp

@@ -6,10 +6,10 @@
 #include <unordered_map>
 #include <vector>
 
-#include "CommonDefinitions.h"
-#include "ErrorCodes.h"
-#include "EnumFactory.h"
-#include "Utilities.h"
+#include "Definitions/Include/CommonDefinitions.hpp"
+#include "ErrorHandler/Include/ErrorCodes.hpp"
+#include "Common/Include/EnumFactory.hpp"
+#include "Common/Include/Utilities.hpp"
 
 typedef uint64_t BitMask;
 

Praxis3D/Source/ConfigLoader.h → Praxis3D/Source/Loaders/Include/ConfigLoader.hpp

@@ -7,9 +7,9 @@
 #include <unordered_map>
 #include <vector>
 
-#include "ErrorCodes.h"
-#include "Math.h"
-#include "Utilities.h"
+#include "ErrorHandler/Include/ErrorCodes.hpp"
+#include "Math/Include/Math.hpp"
+#include "Common/Include/Utilities.hpp"
 
 // Forward declaration
 class NodeIterator;

Praxis3D/Source/LoaderBase.h → Praxis3D/Source/Loaders/Include/LoaderBase.hpp

@@ -6,8 +6,8 @@
 #include <tbb\atomic.h>
 #include <queue>
 
-#include "ErrorCodes.h"
-#include "TaskManagerLocator.h"
+#include "ErrorHandler/Include/ErrorCodes.hpp"
+#include "ServiceLocators/Include/TaskManagerLocator.hpp"
 
 template <class TDerived, class TObject>
 class LoaderBase

Praxis3D/Source/Loaders.h → Praxis3D/Source/Loaders/Include/Loaders.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
-#include "ModelLoader.h"
-#include "ShaderLoader.h"
-#include "TextureLoader.h"
+#include "Loaders/Include/ModelLoader.hpp"
+#include "Loaders/Include/ShaderLoader.hpp"
+#include "Loaders/Include/TextureLoader.hpp"
 
-#include "Universal.h"
+#include "Systems/Base/Include/Universal.hpp"
 
 class Loaders
 {

Praxis3D/Source/ModelLoader.h → Praxis3D/Source/Loaders/Include/ModelLoader.hpp

@@ -4,10 +4,10 @@
 #include <bitset>
 #include <GL\glew.h>
 
-#include "CommonDefinitions.h"
-#include "ErrorHandlerLocator.h"
-#include "LoaderBase.h"
-#include "Math.h"
+#include "Definitions/Include/CommonDefinitions.hpp"
+#include "ServiceLocators/Include/ErrorHandlerLocator.hpp"
+#include "LoaderBase.hpp"
+#include "Math/Include/Math.hpp"
 
 class ModelLoader;
 

Praxis3D/Source/PropertyLoader.h → Praxis3D/Source/Loaders/Include/PropertyLoader.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "PropertySet.h"
+#include "Common/Include/PropertySet.hpp"
 
 class PropertyLoader
 {

Praxis3D/Source/SceneLoader.h → Praxis3D/Source/Loaders/Include/SceneLoader.hpp

@@ -2,10 +2,10 @@
 
 #include <mutex>          // std::mutex
 
-#include "ErrorHandlerLocator.h"
-#include "NullSystemObjects.h"
-#include "PropertySet.h"
-#include "Universal.h"
+#include "ServiceLocators/Include/ErrorHandlerLocator.hpp"
+#include "Systems/Base/Include/NullSystemObjects.hpp"
+#include "Common/Include/PropertySet.hpp"
+#include "Systems/Base/Include/Universal.hpp"
 
 struct ComponentsConstructionInfo;
 struct AudioComponentsConstructionInfo;

Praxis3D/Source/ShaderLoader.h → Praxis3D/Source/Loaders/Include/ShaderLoader.hpp

@@ -7,10 +7,10 @@
 #include <sstream>
 #include <string>
 
-#include "CommonDefinitions.h"
-#include "ErrorCodes.h"
-#include "PropertySet.h"
-#include "SpinWait.h"
+#include "Definitions/Include/CommonDefinitions.hpp"
+#include "ErrorHandler/Include/ErrorCodes.hpp"
+#include "Common/Include/PropertySet.hpp"
+#include "Multithreading/Include/SpinWait.hpp"
 
 class ShaderUniformUpdater;
 

Praxis3D/Source/TextureLoader.h → Praxis3D/Source/Loaders/Include/TextureLoader.hpp

@@ -6,10 +6,10 @@
 #include <tbb/atomic.h>
 #include <vector>
 
-#include "Config.h"
-#include "ErrorCodes.h"
-#include "ErrorHandlerLocator.h"
-#include "LoaderBase.h"
+#include "Loaders/Include/Config.hpp"
+#include "ErrorHandler/Include/ErrorCodes.hpp"
+#include "ServiceLocators/Include/ErrorHandlerLocator.hpp"
+#include "LoaderBase.hpp"
 
 enum TextureColorChannelOffset : unsigned int
 {

Praxis3D/Source/Config.cpp → Praxis3D/Source/Loaders/Source/Config.cpp

@@ -1,8 +1,8 @@
 #include <fstream>
 
-#include "Config.h"
-#include "ErrorHandlerLocator.h"
-#include "Loaders.h"
+#include "Loaders/Include/Config.hpp"
+#include "ServiceLocators/Include/ErrorHandlerLocator.hpp"
+#include "Loaders/Include/Loaders.hpp"
 
 namespace Systems
 {

Praxis3D/Source/ConfigLoader.cpp → Praxis3D/Source/Loaders/Source/ConfigLoader.cpp

@@ -1,5 +1,5 @@
-#include "ConfigLoader.h"
-#include "ErrorHandlerLocator.h"
+#include "Loaders/Include/ConfigLoader.hpp"
+#include "ServiceLocators/Include/ErrorHandlerLocator.hpp"
 
 ConfigFile::NullValue ConfigFile::NodeBase::m_nullValue;
 std::vector<ConfigFile::NodeBase*> ConfigFile::NodeBase::m_nullArray;

Praxis3D/Source/ModelLoader.cpp → Praxis3D/Source/Loaders/Source/ModelLoader.cpp

@@ -4,13 +4,13 @@
 #include <functional>
 #include <iostream>
 
-#include "Config.h"
-#include "ErrorHandlerLocator.h"
-#include "ModelLoader.h"
-#include "SceneLoader.h"
-#include "TaskManagerLocator.h"
+#include "Loaders/Include/Config.hpp"
+#include "ServiceLocators/Include/ErrorHandlerLocator.hpp"
+#include "Loaders/Include/ModelLoader.hpp"
+#include "Loaders/Include/SceneLoader.hpp"
+#include "ServiceLocators/Include/TaskManagerLocator.hpp"
 
-#include "Loaders.h"
+#include "Loaders/Include/Loaders.hpp"
 
 // This initialization depends on the order of BufferType enum entries
 const int Model::m_numElements[ModelBuffer_NumAllTypes] = { 3, 3, 2, 3, 3, 0 };

Praxis3D/Source/PropertyLoader.cpp → Praxis3D/Source/Loaders/Source/PropertyLoader.cpp

@@ -2,9 +2,9 @@
 #include <fstream>
 //#include <sstream>
 
-#include "ErrorHandlerLocator.h"
-#include "Filesystem.h"
-#include "PropertyLoader.h"
+#include "ServiceLocators/Include/ErrorHandlerLocator.hpp"
+#include "Common/Include/Filesystem.hpp"
+#include "Loaders/Include/PropertyLoader.hpp"
 
 ErrorCode PropertyLoader::loadFromFile(std::string p_filename)
 {

Praxis3D/Source/SceneLoader.cpp → Praxis3D/Source/Loaders/Source/SceneLoader.cpp

@@ -4,10 +4,10 @@
 #include <utility>
 #include <vector>
 
-#include "ComponentConstructorInfo.h"
-#include "PropertyLoader.h"
-#include "SceneLoader.h"
-#include "Version.h"
+#include "Systems/WorldSystem/Components/Include/ComponentConstructorInfo.hpp"
+#include "Loaders/Include/PropertyLoader.hpp"
+#include "Loaders/Include/SceneLoader.hpp"
+#include "Common/Include/Version.hpp"
 
 SceneLoader::SceneLoader(const EngineStateType p_engineStateType) : m_engineStateType(p_engineStateType)
 {

Praxis3D/Source/ShaderLoader.cpp → Praxis3D/Source/Loaders/Source/ShaderLoader.cpp

@@ -1,9 +1,9 @@
 
-#include "Config.h"
-#include "ErrorHandlerLocator.h"
-#include "ShaderLoader.h"
-#include "ShaderUniformUpdater.h"
-#include "Utilities.h"
+#include "Loaders/Include/Config.hpp"
+#include "ServiceLocators/Include/ErrorHandlerLocator.hpp"
+#include "Loaders/Include/ShaderLoader.hpp"
+#include "Shaders/Include/ShaderUniformUpdater.hpp"
+#include "Common/Include/Utilities.hpp"
 
 unsigned int ShaderLoader::ShaderProgram::m_defaultProgramHandle = 0;
 

Praxis3D/Source/TextureLoader.cpp → Praxis3D/Source/Loaders/Source/TextureLoader.cpp

@@ -1,14 +1,13 @@
 
 #include <functional>
 
-#include "ErrorHandlerLocator.h"
-#include "Filesystem.h"
-#include "ModelLoader.h"
-#include "SceneLoader.h"
-#include "TaskManagerLocator.h"
-#include "TextureLoader.h"
-#include "Utilities.h"
-
+#include "ServiceLocators/Include/ErrorHandlerLocator.hpp"
+#include "Common/Include/Filesystem.hpp"
+#include "Loaders/Include/ModelLoader.hpp"
+#include "Loaders/Include/SceneLoader.hpp"
+#include "ServiceLocators/Include/TaskManagerLocator.hpp"
+#include "Loaders/Include/TextureLoader.hpp"
+#include "Common/Include/Utilities.hpp"
 
 TextureLoader2D::TextureLoader2D()
 {

Praxis3D/Source/Math.cpp → Praxis3D/Source/Math/Source/Math.cpp

@@ -1,4 +1,4 @@
-#include "Math.h"
+#include "Math/Include/Math.hpp"
 
 const glm::mat4 Math::createTransformMat(const glm::vec3 &p_position, const glm::vec3 &p_rotation, const glm::vec3 &p_scale) noexcept
 {

Praxis3D/Source/TaskManager.h → Praxis3D/Source/Multithreading/Include/TaskManager.hpp

@@ -9,11 +9,11 @@
 #include <tbb/tbb_thread.h>
 
 #include <vector>
-#include "Window.h"
+#include "Window/Include/Window.hpp"
 
-#include "EngineDefinitions.h"
-#include "System.h"
-#include "SpinWait.h"
+#include "Engine/Include/EngineDefinitions.hpp"
+#include "Systems/Base/Include/System.hpp"
+#include "Multithreading/Include/SpinWait.hpp"
 
 enum PerformanceHint
 {

Praxis3D/Source/TaskScheduler.h → Praxis3D/Source/Multithreading/Include/TaskScheduler.hpp

@@ -2,8 +2,8 @@
 
 #include <map>
 
-#include "System.h"
-#include "Universal.h"
+#include "Systems/Base/Include/System.hpp"
+#include "Systems/Base/Include/Universal.hpp"
 
 class SystemScene;
 class TaskManager;

Praxis3D/Source/SpinWait.cpp → Praxis3D/Source/Multithreading/Source/SpinWait.cpp

@@ -3,7 +3,7 @@
 
 #include <tbb\tbb.h>
 
-#include "SpinWait.h"
+#include "Multithreading/Include/SpinWait.hpp"
 
 SpinWait::SpinWait()
 {

Praxis3D/Source/TaskManager.cpp → Praxis3D/Source/Multithreading/Source/TaskManager.cpp

@@ -3,9 +3,9 @@
 #include <tbb/blocked_range.h>
 #include <tbb/parallel_for.h>
 
-#include "EngineDefinitions.h"
-#include "ClockLocator.h"
-#include "TaskManager.h"
+#include "Engine/Include/EngineDefinitions.hpp"
+#include "ServiceLocators/Include/ClockLocator.hpp"
+#include "Multithreading/Include/TaskManager.hpp"
 
 // Initialize static variables in TaskManagerGlobal namespace
 namespace TaskManagerGlobal

Praxis3D/Source/TaskScheduler.cpp → Praxis3D/Source/Multithreading/Source/TaskScheduler.cpp

@@ -1,6 +1,6 @@
 
-#include "TaskManager.h"
-#include "TaskScheduler.h"
+#include "Multithreading/Include/TaskManager.hpp"
+#include "Multithreading/Include/TaskScheduler.hpp"
 
 // TODO DATA DRIVEN
 //const float TaskScheduler::m_defaultClockFrequency = 1.0f / 120.0f;      // Set the timer to 120Hz

Praxis3D/Source/ObjectDirectorycpp.cpp

@@ -1,4 +0,0 @@
-#include "ObjectDirectory.h"
-
-std::vector<const SystemObject*> ObjectDirectory::m_systemObjectList;
-std::string ObjectDirectory::m_nullName;

Praxis3D/Source/Renderer.cpp

@@ -1,7 +0,0 @@
-#include "Renderer.h"
-#include "RendererScene.h"
-
-void Renderer::renderFrame(const SceneObjects &p_sceneObjects, float p_deltaTime)
-{
-
-}

Praxis3D/Source/RendererGL.h

@@ -1 +0,0 @@
-#pragma once

Praxis3D/Source/Scancodes.cpp

@@ -1,3 +0,0 @@
-#include "Scancodes.h"
-
-DEFINE_ENUM(Scancode, SCANCODES)

Praxis3D/Source/ClockLocator.h → Praxis3D/Source/ServiceLocators/Include/ClockLocator.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Clock.h"
+#include "Common/Include/Clock.hpp"
 
 // Service locator provides global access to specific instantiated classes (i.e. services),
 // but retains the ability to switch instances, and has fail-proof mechanism that returns 

Praxis3D/Source/ErrorHandlerLocator.h → Praxis3D/Source/ServiceLocators/Include/ErrorHandlerLocator.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "ErrorHandler.h"
+#include "ErrorHandler/Include/ErrorHandler.hpp"
 
 // Service locator provides global access to specific intanciated classes (i.e. services),
 // but retains the ability to switch instances, and has fail-proof mechanism that returns 

Praxis3D/Source/GUIHandlerLocator.h → Praxis3D/Source/ServiceLocators/Include/GUIHandlerLocator.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "GUIHandler.h"
+#include "Systems/GUISystem/Include/GUIHandler.hpp"
 
 // Service locator provides global access to specific intanciated classes (i.e. services),
 // but retains the ability to switch instances, and has fail-proof mechanism that returns 

Praxis3D/Source/ObjectDirectory.h → Praxis3D/Source/ServiceLocators/Include/ObjectDirectory.hpp

@@ -5,8 +5,8 @@
 #include <tbb/concurrent_vector.h>
 #include <vector>
 
-#include "NullSystemObjects.h"
-#include "System.h"
+#include "Systems/Base/Include/NullSystemObjects.hpp"
+#include "Systems/Base/Include/System.hpp"
 
 // A directory of all system objects, used to quickly get the name or the object itself.
 // Every newly created system object registers itself with the directory.

Praxis3D/Source/TaskManagerLocator.h → Praxis3D/Source/ServiceLocators/Include/TaskManagerLocator.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "EngineDefinitions.h"
-#include "TaskManager.h"
+#include "Engine/Include/EngineDefinitions.hpp"
+#include "Multithreading/Include/TaskManager.hpp"
 
 // Service locator provides global access to specific instantiated classes (i.e. services),
 // but retains the ability to switch instances. Uses dependency injection pattern.

Praxis3D/Source/WindowLocator.h → Praxis3D/Source/ServiceLocators/Include/WindowLocator.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Math.h"
-#include "Window.h"
+#include "Math/Include/Math.hpp"
+#include "Window/Include/Window.hpp"
 
 // Service locator provides global access to specific intanciated classes (i.e. services),
 // but retains the ability to switch instances. Uses dependency injection pattern.

Praxis3D/Source/ClockLocator.cpp → Praxis3D/Source/ServiceLocators/Source/ClockLocator.cpp

@@ -1,4 +1,4 @@
-#include "ClockLocator.h"
+#include "ServiceLocators/Include/ClockLocator.hpp"
 
 ClockNull ClockLocator::m_nullClock;
 ClockBase *ClockLocator::m_clock = &m_nullClock;

Praxis3D/Source/ErrorHandlerLocator.cpp → Praxis3D/Source/ServiceLocators/Source/ErrorHandlerLocator.cpp

@@ -1,4 +1,4 @@
-#include "ErrorHandlerLocator.h"
+#include "ServiceLocators/Include/ErrorHandlerLocator.hpp"
 
 NullErrorHandler ErrHandlerLoc::m_nullErrorHandler;
 ErrorHandlerBase *ErrHandlerLoc::m_errorHandler = &m_nullErrorHandler;

Praxis3D/Source/GUIHandlerLocator.cpp → Praxis3D/Source/ServiceLocators/Source/GUIHandlerLocator.cpp

@@ -1,4 +1,4 @@
-#include "GUIHandlerLocator.h"
+#include "ServiceLocators/Include/GUIHandlerLocator.hpp"
 
 GUIHandlerNull GUIHandlerLocator::m_nullGUIHandler;
 GUIHandlerBase *GUIHandlerLocator::m_GUIHandler = &m_nullGUIHandler;

Praxis3D/Source/Loaders.cpp → Praxis3D/Source/ServiceLocators/Source/Loaders.cpp

@@ -1,4 +1,4 @@
-#include "Loaders.h"
+#include "Loaders/Include/Loaders.hpp"
 
 ModelLoader Loaders::m_modelLoader;
 ShaderLoader Loaders::m_shaderLoader;

Praxis3D/Source/ObjectDirectory.cpp → Praxis3D/Source/ServiceLocators/Source/ObjectDirectory.cpp

@@ -1,4 +1,4 @@
-#include "ObjectDirectory.h"
+#include "ServiceLocators/Include/ObjectDirectory.hpp"
 
 tbb::concurrent_vector<const SystemObject*> ObjectDirectory::m_systemObjectPool;
 tbb::concurrent_queue<ObjectDirectory::ObjectListIndexType> ObjectDirectory::m_emptyObjectListElements;

Praxis3D/Source/TaskManagerLocator.cpp → Praxis3D/Source/ServiceLocators/Source/TaskManagerLocator.cpp

@@ -1,3 +1,3 @@
-#include "TaskManagerLocator.h"
+#include "ServiceLocators/Include/TaskManagerLocator.hpp"
 
 TaskManagerLocator::TaskManagerWrapper TaskManagerLocator::m_taskMgrWrapper;

Praxis3D/Source/WindowLocator.cpp → Praxis3D/Source/ServiceLocators/Source/WindowLocator.cpp

@@ -1,5 +1,5 @@
-#include "GUIHandler.h"
-#include "WindowLocator.h"
+#include "Systems/GUISystem/Include/GUIHandler.hpp"
+#include "ServiceLocators/Include/WindowLocator.hpp"
 
 WindowLocator::WindowWrapperBase WindowLocator::m_nullWindowWrapper;
 WindowLocator::WindowWrapperBase *WindowLocator::m_windowWrapper = &m_nullWindowWrapper;

Praxis3D/Source/ShaderUniformUpdater.h → Praxis3D/Source/Shaders/Include/ShaderUniformUpdater.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "ErrorCodes.h"
-#include "ShaderLoader.h"
-#include "ShaderUniforms.h"
+#include "ErrorHandler/Include/ErrorCodes.hpp"
+#include "Loaders/Include/ShaderLoader.hpp"
+#include "ShaderUniforms.hpp"
 
 //class BaseUniform;
 //class BaseUniformBlock;

Praxis3D/Source/ShaderUniforms.h → Praxis3D/Source/Shaders/Include/ShaderUniforms.hpp

@@ -3,11 +3,11 @@
 #include <GL/glew.h>
 #include <string>
 
-#include "ClockLocator.h"
-#include "CommonDefinitions.h"
-#include "Config.h"
-#include "GeometryBuffer.h"
-#include "UniformData.h"
+#include "ServiceLocators/Include/ClockLocator.hpp"
+#include "Definitions/Include/CommonDefinitions.hpp"
+#include "Loaders/Include/Config.hpp"
+#include "Systems/RendererSystem/Include/GeometryBuffer.hpp"
+#include "Systems/RendererSystem/Include/UniformData.hpp"
 
 // A class (derived from BaseUniform) per each uniform in a shader.
 // Designed to be adaptive, and update all the uniforms that are being used in a shader.

Praxis3D/Source/ShaderUniformUpdater.cpp → Praxis3D/Source/Shaders/Source/ShaderUniformUpdater.cpp

@@ -1,7 +1,7 @@
 
-#include "ErrorHandlerLocator.h"
-#include "ShaderUniforms.h"
-#include "ShaderUniformUpdater.h"
+#include "ServiceLocators/Include/ErrorHandlerLocator.hpp"
+#include "Shaders/Include/ShaderUniforms.hpp"
+#include "Shaders/Include/ShaderUniformUpdater.hpp"
 
 const UniformObjectData ShaderUniformUpdater::m_defaultObjectData;
 const UniformFrameData ShaderUniformUpdater::m_defaultFrameData;

Praxis3D/Source/ImpactSoundComponent.h → Praxis3D/Source/Systems/AudioSystem/Components/Include/ImpactSoundComponent.hpp

@@ -4,7 +4,7 @@
 #include <fmod/fmod_errors.h>
 #include <fmod/fmod_common.h>
 
-#include "InheritanceObjects.h"
+#include "Definitions/Include/InheritanceObjects.hpp"
 
 class ImpactSoundComponent : public SystemObject
 {

Praxis3D/Source/SoundComponent.h → Praxis3D/Source/Systems/AudioSystem/Components/Include/SoundComponent.hpp

@@ -4,7 +4,7 @@
 #include <fmod/fmod_errors.h>
 #include <fmod/fmod_common.h>
 
-#include "InheritanceObjects.h"
+#include "Definitions/Include/InheritanceObjects.hpp"
 
 class SoundComponent : public SystemObject
 {

Praxis3D/Source/SoundListenerComponent.h → Praxis3D/Source/Systems/AudioSystem/Components/Include/SoundListenerComponent.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "InheritanceObjects.h"
+#include "Definitions/Include/InheritanceObjects.hpp"
 
 class SoundListenerComponent : public SystemObject
 {

Praxis3D/Source/AudioScene.h → Praxis3D/Source/Systems/AudioSystem/Include/AudioScene.hpp

@@ -3,11 +3,11 @@
 #include <fmod/fmod_studio.hpp>
 #include <random>
 
-#include "AudioTask.h"
-#include "FmodErrorCodes.h"
-#include "SoundComponent.h"
-#include "SoundListenerComponent.h"
-#include "System.h"
+#include "Systems/AudioSystem/Include/AudioTask.hpp"
+#include "Systems/AudioSystem/Include/FmodErrorCodes.hpp"
+#include "Systems/AudioSystem/Components/Include/SoundComponent.hpp"
+#include "Systems/AudioSystem/Components/Include/SoundListenerComponent.hpp"
+#include "Systems/Base/Include/System.hpp"
 
 class AudioSystem;
 struct ComponentsConstructionInfo;

Praxis3D/Source/AudioSystem.h → Praxis3D/Source/Systems/AudioSystem/Include/AudioSystem.hpp

@@ -10,9 +10,9 @@
 #include <fmod/fmod_errors.h>
 #include <fmod/fmod_studio.hpp>
 
-#include "AudioScene.h"
-#include "ErrorHandlerLocator.h"
-#include "System.h"
+#include "Systems/AudioSystem/Include/AudioScene.hpp"
+#include "ServiceLocators/Include/ErrorHandlerLocator.hpp"
+#include "Systems/Base/Include/System.hpp"
 
 class AudioSystem : public SystemBase
 {

Praxis3D/Source/AudioTask.h → Praxis3D/Source/Systems/AudioSystem/Include/AudioTask.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "System.h"
+#include "Systems/Base/Include/System.hpp"
 
 class AudioScene;
 

Praxis3D/Source/FmodErrorCodes.h → Praxis3D/Source/Systems/AudioSystem/Include/FmodErrorCodes.hpp

@@ -2,7 +2,7 @@
 
 #include <fmod/fmod_common.h>
 
-#include "EnumFactory.h"
+#include "Common/Include/EnumFactory.hpp"
 
 #define FMOD_ERROR_CODES(Code) \
 	Code(OK, = FMOD_RESULT::FMOD_OK) \