diff --git a/Templates/BaseGame/game/core/Core.cs b/Templates/BaseGame/game/core/Core.cs
new file mode 100644
index 000000000..5559760ae
--- /dev/null
+++ b/Templates/BaseGame/game/core/Core.cs
@@ -0,0 +1,143 @@
+
+function CoreModule::onCreate(%this)
+{
+   
+   // ----------------------------------------------------------------------------
+   // Initialize core sub system functionality such as audio, the Canvas, PostFX,
+   // rendermanager, light managers, etc.
+   //
+   // Note that not all of these need to be initialized before the client, although
+   // the audio should and the canvas definitely needs to be.  I've put things here
+   // to distinguish between the purpose and functionality of the various client
+   // scripts.  Game specific script isn't needed until we reach the shell menus
+   // and start a game or connect to a server. We get the various subsystems ready
+   // to go, and then use initClient() to handle the rest of the startup sequence.
+   //
+   // If this is too convoluted we can reduce this complexity after futher testing
+   // to find exactly which subsystems should be readied before kicking things off. 
+   // ----------------------------------------------------------------------------
+   
+   ModuleDatabase.LoadExplicit( "Core_Rendering" );
+   ModuleDatabase.LoadExplicit( "Core_Utility" );
+   ModuleDatabase.LoadExplicit( "Core_GUI" );
+   ModuleDatabase.LoadExplicit( "CoreModule" );
+   ModuleDatabase.LoadExplicit( "Core_Lighting" );
+   ModuleDatabase.LoadExplicit( "Core_SFX" );
+   ModuleDatabase.LoadExplicit( "Core_PostFX" );
+   ModuleDatabase.LoadExplicit( "Core_ClientServer" );
+   
+   %prefPath = getPrefpath();
+   if ( isFile( %prefPath @ "/clientPrefs.cs" ) )
+      exec( %prefPath @ "/clientPrefs.cs" );
+   else
+      exec("data/defaults.cs");
+      
+   %der = $pref::Video::displayDevice;
+   
+   //We need to hook the missing/warn material stuff early, so do it here
+   /*$Core::MissingTexturePath = "core/images/missingTexture";
+   $Core::UnAvailableTexturePath = "core/images/unavailable";
+   $Core::WarningTexturePath = "core/images/warnMat";
+   $Core::CommonShaderPath = "core/shaders";
+   
+   /*%classList = enumerateConsoleClasses( "Component" );
+
+   foreach$( %componentClass in %classList )
+   {
+      echo("Native Component of type: " @ %componentClass);
+   }*/
+
+   //exec("./helperFunctions.cs");
+
+   // We need some of the default GUI profiles in order to get the canvas and
+   // other aspects of the GUI system ready.
+   //exec("./profiles.cs");
+
+   //This is a bit of a shortcut, but we'll load the client's default settings to ensure all the prefs get initialized correctly
+   
+
+   // Initialization of the various subsystems requires some of the preferences
+   // to be loaded... so do that first.
+   /*exec("./globals.cs");
+
+   exec("./canvas.cs");
+   exec("./cursor.cs");
+
+   exec("./renderManager.cs");
+   exec("./lighting.cs");
+
+   exec("./audio.cs");
+   exec("./sfx/audioAmbience.cs");
+   exec("./sfx/audioData.cs");
+   exec("./sfx/audioDescriptions.cs");
+   exec("./sfx/audioEnvironments.cs");
+   exec("./sfx/audioStates.cs");
+
+   exec("./parseArgs.cs");
+
+   // Materials and Shaders for rendering various object types
+   exec("./gfxData/commonMaterialData.cs");
+   exec("./gfxData/shaders.cs");
+   exec("./gfxData/terrainBlock.cs");
+   exec("./gfxData/water.cs");
+   exec("./gfxData/scatterSky.cs");
+   exec("./gfxData/clouds.cs");
+
+   // Initialize all core post effects.   
+   exec("./postFx.cs");
+
+   //VR stuff
+   exec("./oculusVR.cs");*/
+
+   // Seed the random number generator.
+   setRandomSeed();
+   
+   // Parse the command line arguments
+   echo("\n--------- Parsing Arguments ---------");
+   parseArgs();
+   
+   // The canvas needs to be initialized before any gui scripts are run since
+   // some of the controls assume that the canvas exists at load time.
+   createCanvas($appName);
+
+   //load canvas
+   //exec("./console/main.cs");
+
+   ModuleDatabase.LoadExplicit( "Core_Console" );
+   
+   // Init the physics plugin.
+   physicsInit();
+
+   sfxStartup();
+
+   // Set up networking.
+   setNetPort(0);
+
+   // Start processing file change events.   
+   startFileChangeNotifications();
+   
+   // If we have editors, initialize them here as well
+   if (isToolBuild())
+   {
+      if(isFile("tools/main.cs") && !$isDedicated)
+         exec("tools/main.cs");
+         
+      ModuleDatabase.scanModules( "tools", false );
+      ModuleDatabase.LoadGroup( "Tools" );
+   }
+}
+
+function CoreModule::onDestroy(%this)
+{
+
+}
+
+//-----------------------------------------------------------------------------
+// Called when the engine is shutting down.
+function onExit() 
+{
+   // Stop file change events.
+   stopFileChangeNotifications();
+   
+   ModuleDatabase.UnloadExplicit( "Game" );
+}
\ No newline at end of file
diff --git a/Templates/BaseGame/game/core/CoreComponents.module b/Templates/BaseGame/game/core/Core.module
similarity index 69%
rename from Templates/BaseGame/game/core/CoreComponents.module
rename to Templates/BaseGame/game/core/Core.module
index 0636e3bb5..c7ab7b64b 100644
--- a/Templates/BaseGame/game/core/CoreComponents.module
+++ b/Templates/BaseGame/game/core/Core.module
@@ -1,11 +1,11 @@
 <ModuleDefinition
-	ModuleId="CoreComponentsModule"
+	ModuleId="CoreModule"
 	VersionId="1"
-	Description="Module that implements the core engine-level components for the game."
-	ScriptFile="CoreComponents.cs"
+	Description="Module that implements the core engine-level setup for the game."
+	ScriptFile="Core.cs"
 	CreateFunction="onCreate"
 	DestroyFunction="onDestroy"
-	Group="Game">
+	Group="Core">
 	<DeclaredAssets
            canSave="true"
            canSaveDynamicFields="true"
diff --git a/Templates/BaseGame/game/core/CoreComponents.cs b/Templates/BaseGame/game/core/CoreComponents.cs
deleted file mode 100644
index 5bdca8cd3..000000000
--- a/Templates/BaseGame/game/core/CoreComponents.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-
-function CoreComponentsModule::onCreate(%this)
-{
-   %classList = enumerateConsoleClasses( "Component" );
-
-   foreach$( %componentClass in %classList )
-   {
-      echo("Native Component of type: " @ %componentClass);
-   }  
-}
\ No newline at end of file
diff --git a/Templates/BaseGame/game/data/clientServer/ClientServer.cs b/Templates/BaseGame/game/core/clientServer/Core_ClientServer.cs
similarity index 97%
rename from Templates/BaseGame/game/data/clientServer/ClientServer.cs
rename to Templates/BaseGame/game/core/clientServer/Core_ClientServer.cs
index e8530f22e..51a7fbe76 100644
--- a/Templates/BaseGame/game/data/clientServer/ClientServer.cs
+++ b/Templates/BaseGame/game/core/clientServer/Core_ClientServer.cs
@@ -12,7 +12,7 @@
 // When a local game is started - a listen server - via calling StartGame() a server is created and then the client is
 // connected to it via createAndConnectToLocalServer().
 
-function ClientServer::create( %this )
+function Core_ClientServer::create( %this )
 {
    echo("\n--------- Initializing Directory: scripts ---------");
    exec( "./scripts/client/client.cs" );
@@ -35,7 +35,7 @@ function ClientServer::create( %this )
    }
 }
 
-function ClientServer::destroy( %this )
+function Core_ClientServer::destroy( %this )
 {
    // Ensure that we are disconnected and/or the server is destroyed.
    // This prevents crashes due to the SceneGraph being deleted before
diff --git a/Templates/BaseGame/game/data/clientServer/ClientServer.module b/Templates/BaseGame/game/core/clientServer/Core_ClientServer.module
similarity index 64%
rename from Templates/BaseGame/game/data/clientServer/ClientServer.module
rename to Templates/BaseGame/game/core/clientServer/Core_ClientServer.module
index 05c70a90d..ac86bbcd5 100644
--- a/Templates/BaseGame/game/data/clientServer/ClientServer.module
+++ b/Templates/BaseGame/game/core/clientServer/Core_ClientServer.module
@@ -1,9 +1,9 @@
 <ModuleDefinition
-	ModuleId="ClientServer"
+	ModuleId="Core_ClientServer"
 	VersionId="1"
 	Description="Default module for the game."
-	ScriptFile="ClientServer.cs"
+	ScriptFile="Core_ClientServer.cs"
 	CreateFunction="create"
 	DestroyFunction="destroy"
-	Group="Game">
+	Group="Core">
 </ModuleDefinition>
\ No newline at end of file
diff --git a/Templates/BaseGame/game/data/clientServer/scripts/client/client.cs b/Templates/BaseGame/game/core/clientServer/scripts/client/client.cs
similarity index 72%
rename from Templates/BaseGame/game/data/clientServer/scripts/client/client.cs
rename to Templates/BaseGame/game/core/clientServer/scripts/client/client.cs
index 0b18d81aa..590119935 100644
--- a/Templates/BaseGame/game/data/clientServer/scripts/client/client.cs
+++ b/Templates/BaseGame/game/core/clientServer/scripts/client/client.cs
@@ -9,10 +9,10 @@ function initClient()
    $Client::GameTypeQuery = $appName;
    $Client::MissionTypeQuery = "Any";
    
-   exec( "data/clientServer/scripts/client/message.cs" );
-   exec( "data/clientServer/scripts/client/connectionToServer.cs" );
-   exec( "data/clientServer/scripts/client/levelDownload.cs" );
-   exec( "data/clientServer/scripts/client/levelLoad.cs" );
+   exec( "./message.cs" );
+   exec( "./connectionToServer.cs" );
+   exec( "./levelDownload.cs" );
+   exec( "./levelLoad.cs" );
    
    //load prefs
    %prefPath = getPrefpath();
diff --git a/Templates/BaseGame/game/data/clientServer/scripts/client/connectionToServer.cs b/Templates/BaseGame/game/core/clientServer/scripts/client/connectionToServer.cs
similarity index 100%
rename from Templates/BaseGame/game/data/clientServer/scripts/client/connectionToServer.cs
rename to Templates/BaseGame/game/core/clientServer/scripts/client/connectionToServer.cs
diff --git a/Templates/BaseGame/game/data/clientServer/scripts/client/levelDownload.cs b/Templates/BaseGame/game/core/clientServer/scripts/client/levelDownload.cs
similarity index 100%
rename from Templates/BaseGame/game/data/clientServer/scripts/client/levelDownload.cs
rename to Templates/BaseGame/game/core/clientServer/scripts/client/levelDownload.cs
diff --git a/Templates/BaseGame/game/data/clientServer/scripts/client/levelLoad.cs b/Templates/BaseGame/game/core/clientServer/scripts/client/levelLoad.cs
similarity index 100%
rename from Templates/BaseGame/game/data/clientServer/scripts/client/levelLoad.cs
rename to Templates/BaseGame/game/core/clientServer/scripts/client/levelLoad.cs
diff --git a/Templates/BaseGame/game/data/clientServer/scripts/client/message.cs b/Templates/BaseGame/game/core/clientServer/scripts/client/message.cs
similarity index 100%
rename from Templates/BaseGame/game/data/clientServer/scripts/client/message.cs
rename to Templates/BaseGame/game/core/clientServer/scripts/client/message.cs
diff --git a/Templates/BaseGame/game/data/clientServer/scripts/server/audio.cs b/Templates/BaseGame/game/core/clientServer/scripts/server/audio.cs
similarity index 100%
rename from Templates/BaseGame/game/data/clientServer/scripts/server/audio.cs
rename to Templates/BaseGame/game/core/clientServer/scripts/server/audio.cs
diff --git a/Templates/BaseGame/game/data/clientServer/scripts/server/commands.cs b/Templates/BaseGame/game/core/clientServer/scripts/server/commands.cs
similarity index 100%
rename from Templates/BaseGame/game/data/clientServer/scripts/server/commands.cs
rename to Templates/BaseGame/game/core/clientServer/scripts/server/commands.cs
diff --git a/Templates/BaseGame/game/data/clientServer/scripts/server/connectionToClient.cs b/Templates/BaseGame/game/core/clientServer/scripts/server/connectionToClient.cs
similarity index 100%
rename from Templates/BaseGame/game/data/clientServer/scripts/server/connectionToClient.cs
rename to Templates/BaseGame/game/core/clientServer/scripts/server/connectionToClient.cs
diff --git a/Templates/BaseGame/game/data/clientServer/scripts/server/defaults.cs b/Templates/BaseGame/game/core/clientServer/scripts/server/defaults.cs
similarity index 100%
rename from Templates/BaseGame/game/data/clientServer/scripts/server/defaults.cs
rename to Templates/BaseGame/game/core/clientServer/scripts/server/defaults.cs
diff --git a/Templates/BaseGame/game/data/clientServer/scripts/server/kickban.cs b/Templates/BaseGame/game/core/clientServer/scripts/server/kickban.cs
similarity index 100%
rename from Templates/BaseGame/game/data/clientServer/scripts/server/kickban.cs
rename to Templates/BaseGame/game/core/clientServer/scripts/server/kickban.cs
diff --git a/Templates/BaseGame/game/data/clientServer/scripts/server/levelDownload.cs b/Templates/BaseGame/game/core/clientServer/scripts/server/levelDownload.cs
similarity index 100%
rename from Templates/BaseGame/game/data/clientServer/scripts/server/levelDownload.cs
rename to Templates/BaseGame/game/core/clientServer/scripts/server/levelDownload.cs
diff --git a/Templates/BaseGame/game/data/clientServer/scripts/server/levelInfo.cs b/Templates/BaseGame/game/core/clientServer/scripts/server/levelInfo.cs
similarity index 100%
rename from Templates/BaseGame/game/data/clientServer/scripts/server/levelInfo.cs
rename to Templates/BaseGame/game/core/clientServer/scripts/server/levelInfo.cs
diff --git a/Templates/BaseGame/game/data/clientServer/scripts/server/levelLoad.cs b/Templates/BaseGame/game/core/clientServer/scripts/server/levelLoad.cs
similarity index 100%
rename from Templates/BaseGame/game/data/clientServer/scripts/server/levelLoad.cs
rename to Templates/BaseGame/game/core/clientServer/scripts/server/levelLoad.cs
diff --git a/Templates/BaseGame/game/data/clientServer/scripts/server/message.cs b/Templates/BaseGame/game/core/clientServer/scripts/server/message.cs
similarity index 100%
rename from Templates/BaseGame/game/data/clientServer/scripts/server/message.cs
rename to Templates/BaseGame/game/core/clientServer/scripts/server/message.cs
diff --git a/Templates/BaseGame/game/data/clientServer/scripts/server/server.cs b/Templates/BaseGame/game/core/clientServer/scripts/server/server.cs
similarity index 93%
rename from Templates/BaseGame/game/data/clientServer/scripts/server/server.cs
rename to Templates/BaseGame/game/core/clientServer/scripts/server/server.cs
index 9f30ecf5d..17f127314 100644
--- a/Templates/BaseGame/game/data/clientServer/scripts/server/server.cs
+++ b/Templates/BaseGame/game/core/clientServer/scripts/server/server.cs
@@ -27,21 +27,21 @@ function initServer()
    //load prefs
 
    //Force-load the defaults just so we don't have any mistakes
-   exec( "data/clientServer/scripts/server/defaults.cs" );   
+   exec( "./defaults.cs" );   
    
    //Then, if the user has saved preferences, we load those over-top the defaults
    %prefPath = getPrefpath();
    if ( isFile( %prefPath @ "/serverPrefs.cs" ) )
       exec( %prefPath @ "/serverPrefs.cs" );
    
-   exec( "data/clientServer/scripts/server/audio.cs" );
-   exec( "data/clientServer/scripts/server/commands.cs" );
-   exec( "data/clientServer/scripts/server/kickban.cs" );
-   exec( "data/clientServer/scripts/server/message.cs" );
-   exec( "data/clientServer/scripts/server/levelDownload.cs" );
-   exec( "data/clientServer/scripts/server/levelLoad.cs" );
-   exec( "data/clientServer/scripts/server/levelInfo.cs" );
-   exec( "data/clientServer/scripts/server/connectionToClient.cs" );
+   exec( "./audio.cs" );
+   exec( "./commands.cs" );
+   exec( "./kickban.cs" );
+   exec( "./message.cs" );
+   exec( "./levelDownload.cs" );
+   exec( "./levelLoad.cs" );
+   exec( "./levelInfo.cs" );
+   exec( "./connectionToClient.cs" );
 
    // Server::Status is returned in the Game Info Query and represents the
    // current status of the server. This string sould be very short.
diff --git a/Templates/BaseGame/game/core/components/Core_Components.cs b/Templates/BaseGame/game/core/components/Core_Components.cs
new file mode 100644
index 000000000..0b32d9d6b
--- /dev/null
+++ b/Templates/BaseGame/game/core/components/Core_Components.cs
@@ -0,0 +1,8 @@
+
+function Core_Components::onCreate(%this)
+{
+}
+
+function Core_Components::onDestroy(%this)
+{
+}
\ No newline at end of file
diff --git a/Templates/BaseGame/game/core/components/Core_Components.module b/Templates/BaseGame/game/core/components/Core_Components.module
new file mode 100644
index 000000000..2c98b8091
--- /dev/null
+++ b/Templates/BaseGame/game/core/components/Core_Components.module
@@ -0,0 +1,14 @@
+<ModuleDefinition
+	ModuleId="Core_Components"
+	VersionId="1"
+	Description="Module that implements the core engine-level setup for the game."
+	ScriptFile="Core_Components.cs"
+	CreateFunction="onCreate"
+	DestroyFunction="onDestroy"
+	Group="Core">
+	<DeclaredAssets
+           canSave="true"
+           canSaveDynamicFields="true"
+           Extension="asset.taml"
+           Recurse="true" />
+</ModuleDefinition>
\ No newline at end of file
diff --git a/Templates/BaseGame/game/core/components/collisionComponent.asset.taml b/Templates/BaseGame/game/core/components/collisionComponent.asset.taml
deleted file mode 100644
index 1a4f99a0d..000000000
--- a/Templates/BaseGame/game/core/components/collisionComponent.asset.taml
+++ /dev/null
@@ -1,8 +0,0 @@
-<ComponentAsset
-    canSave="true"
-    canSaveDynamicFields="true"
-    AssetName="CollisionComponentAsset"
-    componentClass="CollisionComponent"
-    friendlyName="Collision"
-    componentType="Collision"
-    description="Enables an entity to collide with things." />
diff --git a/Templates/BaseGame/game/core/components/RigidBodyComponent.asset.taml b/Templates/BaseGame/game/core/components/components/RigidBodyComponent.asset.taml
similarity index 100%
rename from Templates/BaseGame/game/core/components/RigidBodyComponent.asset.taml
rename to Templates/BaseGame/game/core/components/components/RigidBodyComponent.asset.taml
diff --git a/Templates/BaseGame/game/core/components/animationComponent.asset.taml b/Templates/BaseGame/game/core/components/components/animationComponent.asset.taml
similarity index 100%
rename from Templates/BaseGame/game/core/components/animationComponent.asset.taml
rename to Templates/BaseGame/game/core/components/components/animationComponent.asset.taml
diff --git a/Templates/BaseGame/game/core/components/cameraOrbiterComponent.asset.taml b/Templates/BaseGame/game/core/components/components/cameraOrbiterComponent.asset.taml
similarity index 100%
rename from Templates/BaseGame/game/core/components/cameraOrbiterComponent.asset.taml
rename to Templates/BaseGame/game/core/components/components/cameraOrbiterComponent.asset.taml
diff --git a/Templates/BaseGame/game/core/components/components/collisionComponent.asset.taml b/Templates/BaseGame/game/core/components/components/collisionComponent.asset.taml
new file mode 100644
index 000000000..624bf9583
--- /dev/null
+++ b/Templates/BaseGame/game/core/components/components/collisionComponent.asset.taml
@@ -0,0 +1,8 @@
+<ComponentAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="ShapeCollisionComponentAsset"
+    componentClass="ShapeCollisionComponent"
+    friendlyName="Shape Collision"
+    componentType="Collision"
+    description="Enables an entity to collide with things with bounds, collision or visible meshes" />
diff --git a/Templates/BaseGame/game/core/components/game/camera.asset.taml b/Templates/BaseGame/game/core/components/components/game/camera.asset.taml
similarity index 80%
rename from Templates/BaseGame/game/core/components/game/camera.asset.taml
rename to Templates/BaseGame/game/core/components/components/game/camera.asset.taml
index f59e429e2..ace880f7c 100644
--- a/Templates/BaseGame/game/core/components/game/camera.asset.taml
+++ b/Templates/BaseGame/game/core/components/components/game/camera.asset.taml
@@ -6,4 +6,4 @@
     friendlyName="Camera"
     componentType="Game"
     description="Allows the component owner to operate as a camera."
-    scriptFile="core/components/game/camera.cs" />
+    scriptFile="core/components/components/game/camera.cs" />
diff --git a/Templates/BaseGame/game/core/components/game/camera.cs b/Templates/BaseGame/game/core/components/components/game/camera.cs
similarity index 100%
rename from Templates/BaseGame/game/core/components/game/camera.cs
rename to Templates/BaseGame/game/core/components/components/game/camera.cs
diff --git a/Templates/BaseGame/game/core/components/game/controlObject.asset.taml b/Templates/BaseGame/game/core/components/components/game/controlObject.asset.taml
similarity index 82%
rename from Templates/BaseGame/game/core/components/game/controlObject.asset.taml
rename to Templates/BaseGame/game/core/components/components/game/controlObject.asset.taml
index 19515e833..7efa2d3a2 100644
--- a/Templates/BaseGame/game/core/components/game/controlObject.asset.taml
+++ b/Templates/BaseGame/game/core/components/components/game/controlObject.asset.taml
@@ -7,4 +7,4 @@
     friendlyName="Control Object"
     componentType="Game"
     description="Allows the component owner to be controlled by a client."
-    scriptFile="core/components/game/controlObject.cs" />
+    scriptFile="core/components/components/game/controlObject.cs" />
diff --git a/Templates/BaseGame/game/core/components/game/controlObject.cs b/Templates/BaseGame/game/core/components/components/game/controlObject.cs
similarity index 100%
rename from Templates/BaseGame/game/core/components/game/controlObject.cs
rename to Templates/BaseGame/game/core/components/components/game/controlObject.cs
diff --git a/Templates/BaseGame/game/core/components/game/itemRotate.asset.taml b/Templates/BaseGame/game/core/components/components/game/itemRotate.asset.taml
similarity index 82%
rename from Templates/BaseGame/game/core/components/game/itemRotate.asset.taml
rename to Templates/BaseGame/game/core/components/components/game/itemRotate.asset.taml
index 4c0c1bec4..3509f9153 100644
--- a/Templates/BaseGame/game/core/components/game/itemRotate.asset.taml
+++ b/Templates/BaseGame/game/core/components/components/game/itemRotate.asset.taml
@@ -7,4 +7,4 @@
     friendlyName="Item Rotation"
     componentType="Game"
     description="Rotates the entity around an axis, like an item pickup."
-    scriptFile="core/components/game/itemRotate.cs" />
+    scriptFile="core/components/components/game/itemRotate.cs" />
diff --git a/Templates/BaseGame/game/core/components/game/itemRotate.cs b/Templates/BaseGame/game/core/components/components/game/itemRotate.cs
similarity index 100%
rename from Templates/BaseGame/game/core/components/game/itemRotate.cs
rename to Templates/BaseGame/game/core/components/components/game/itemRotate.cs
diff --git a/Templates/BaseGame/game/core/components/game/playerSpawner.asset.taml b/Templates/BaseGame/game/core/components/components/game/playerSpawner.asset.taml
similarity index 83%
rename from Templates/BaseGame/game/core/components/game/playerSpawner.asset.taml
rename to Templates/BaseGame/game/core/components/components/game/playerSpawner.asset.taml
index 8a597aca4..e0024b8fb 100644
--- a/Templates/BaseGame/game/core/components/game/playerSpawner.asset.taml
+++ b/Templates/BaseGame/game/core/components/components/game/playerSpawner.asset.taml
@@ -7,4 +7,4 @@
     friendlyName="Player Spawner"
     componentType="Game"
     description="When a client connects, it spawns a player object for them and attaches them to it."
-    scriptFile="core/components/game/playerSpawner.cs" />
+    scriptFile="core/components/components/game/playerSpawner.cs" />
diff --git a/Templates/BaseGame/game/core/components/game/playerSpawner.cs b/Templates/BaseGame/game/core/components/components/game/playerSpawner.cs
similarity index 100%
rename from Templates/BaseGame/game/core/components/game/playerSpawner.cs
rename to Templates/BaseGame/game/core/components/components/game/playerSpawner.cs
diff --git a/Templates/BaseGame/game/core/components/input/fpsControls.asset.taml b/Templates/BaseGame/game/core/components/components/input/fpsControls.asset.taml
similarity index 100%
rename from Templates/BaseGame/game/core/components/input/fpsControls.asset.taml
rename to Templates/BaseGame/game/core/components/components/input/fpsControls.asset.taml
diff --git a/Templates/BaseGame/game/core/components/input/fpsControls.cs b/Templates/BaseGame/game/core/components/components/input/fpsControls.cs
similarity index 100%
rename from Templates/BaseGame/game/core/components/input/fpsControls.cs
rename to Templates/BaseGame/game/core/components/components/input/fpsControls.cs
diff --git a/Templates/BaseGame/game/core/components/input/inputManager.cs b/Templates/BaseGame/game/core/components/components/input/inputManager.cs
similarity index 100%
rename from Templates/BaseGame/game/core/components/input/inputManager.cs
rename to Templates/BaseGame/game/core/components/components/input/inputManager.cs
diff --git a/Templates/BaseGame/game/core/components/meshComponent.asset.taml b/Templates/BaseGame/game/core/components/components/meshComponent.asset.taml
similarity index 100%
rename from Templates/BaseGame/game/core/components/meshComponent.asset.taml
rename to Templates/BaseGame/game/core/components/components/meshComponent.asset.taml
diff --git a/Templates/BaseGame/game/core/components/playerControllerComponent.asset.taml b/Templates/BaseGame/game/core/components/components/playerControllerComponent.asset.taml
similarity index 100%
rename from Templates/BaseGame/game/core/components/playerControllerComponent.asset.taml
rename to Templates/BaseGame/game/core/components/components/playerControllerComponent.asset.taml
diff --git a/Templates/BaseGame/game/core/components/soundComponent.asset.taml b/Templates/BaseGame/game/core/components/components/soundComponent.asset.taml
similarity index 100%
rename from Templates/BaseGame/game/core/components/soundComponent.asset.taml
rename to Templates/BaseGame/game/core/components/components/soundComponent.asset.taml
diff --git a/Templates/BaseGame/game/core/components/stateMachineComponent.asset.taml b/Templates/BaseGame/game/core/components/components/stateMachineComponent.asset.taml
similarity index 100%
rename from Templates/BaseGame/game/core/components/stateMachineComponent.asset.taml
rename to Templates/BaseGame/game/core/components/components/stateMachineComponent.asset.taml
diff --git a/Templates/BaseGame/game/core/components/components/triggerComponent.asset.taml b/Templates/BaseGame/game/core/components/components/triggerComponent.asset.taml
new file mode 100644
index 000000000..4fabc200c
--- /dev/null
+++ b/Templates/BaseGame/game/core/components/components/triggerComponent.asset.taml
@@ -0,0 +1,8 @@
+<ComponentAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="TriggerComponentAsset"
+    componentClass="TriggerComponent"
+    friendlyName="Trigger Component"
+    componentType="Collision"
+    description="Enables callback and event behaviors on collision with the entity." />
diff --git a/Templates/BaseGame/game/core/console/Core_Console.cs b/Templates/BaseGame/game/core/console/Core_Console.cs
new file mode 100644
index 000000000..a93b149f4
--- /dev/null
+++ b/Templates/BaseGame/game/core/console/Core_Console.cs
@@ -0,0 +1,12 @@
+
+function Core_Console::onCreate(%this)
+{
+    exec("./scripts/profiles.cs");
+    exec("./scripts/console.cs");
+
+    exec("./guis/console.gui");
+}
+
+function Core_Console::onDestroy(%this)
+{
+}
\ No newline at end of file
diff --git a/Templates/BaseGame/game/core/console/Core_Console.module b/Templates/BaseGame/game/core/console/Core_Console.module
new file mode 100644
index 000000000..6927ba40e
--- /dev/null
+++ b/Templates/BaseGame/game/core/console/Core_Console.module
@@ -0,0 +1,10 @@
+<ModuleDefinition
+	ModuleId="Core_Console"
+	VersionId="1"
+	Description="Module that implements the core engine-level setup for the game."
+	ScriptFile="Core_Console.cs"
+	CreateFunction="onCreate"
+	DestroyFunction="onDestroy"
+	Group="Core"
+	Dependencies="Core_GUI=1">
+</ModuleDefinition>
\ No newline at end of file
diff --git a/Templates/BaseGame/game/core/console/console.gui b/Templates/BaseGame/game/core/console/guis/console.gui
similarity index 100%
rename from Templates/BaseGame/game/core/console/console.gui
rename to Templates/BaseGame/game/core/console/guis/console.gui
diff --git a/Templates/BaseGame/game/core/console/main.cs b/Templates/BaseGame/game/core/console/scripts/console.cs
similarity index 98%
rename from Templates/BaseGame/game/core/console/main.cs
rename to Templates/BaseGame/game/core/console/scripts/console.cs
index 3d89234b8..201bcfb92 100644
--- a/Templates/BaseGame/game/core/console/main.cs
+++ b/Templates/BaseGame/game/core/console/scripts/console.cs
@@ -20,9 +20,6 @@
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 
-exec("./profiles.cs");
-exec("./console.gui");
-
 GlobalActionMap.bind("keyboard", "tilde", "toggleConsole");
 
 function ConsoleEntry::eval()
diff --git a/Templates/BaseGame/game/core/console/profiles.cs b/Templates/BaseGame/game/core/console/scripts/profiles.cs
similarity index 100%
rename from Templates/BaseGame/game/core/console/profiles.cs
rename to Templates/BaseGame/game/core/console/scripts/profiles.cs
diff --git a/Templates/BaseGame/game/core/fonts/Arial 12 (ansi).uft b/Templates/BaseGame/game/core/fonts/Arial 12 (ansi).uft
index 67a177016..5592716dd 100644
Binary files a/Templates/BaseGame/game/core/fonts/Arial 12 (ansi).uft and b/Templates/BaseGame/game/core/fonts/Arial 12 (ansi).uft differ
diff --git a/Templates/BaseGame/game/core/fonts/Arial Bold 16 (ansi).uft b/Templates/BaseGame/game/core/fonts/Arial Bold 16 (ansi).uft
index f1f94acb3..f2140c4c4 100644
Binary files a/Templates/BaseGame/game/core/fonts/Arial Bold 16 (ansi).uft and b/Templates/BaseGame/game/core/fonts/Arial Bold 16 (ansi).uft differ
diff --git a/Templates/BaseGame/game/core/fonts/ArialBold 14 (ansi).uft b/Templates/BaseGame/game/core/fonts/ArialBold 14 (ansi).uft
index 9b103b3f7..93ea13d02 100644
Binary files a/Templates/BaseGame/game/core/fonts/ArialBold 14 (ansi).uft and b/Templates/BaseGame/game/core/fonts/ArialBold 14 (ansi).uft differ
diff --git a/Templates/BaseGame/game/core/fonts/ArialItalic 14 (ansi).uft b/Templates/BaseGame/game/core/fonts/ArialItalic 14 (ansi).uft
index ca4a222cf..d4418f692 100644
Binary files a/Templates/BaseGame/game/core/fonts/ArialItalic 14 (ansi).uft and b/Templates/BaseGame/game/core/fonts/ArialItalic 14 (ansi).uft differ
diff --git a/Templates/BaseGame/game/core/gui/Core_GUI.cs b/Templates/BaseGame/game/core/gui/Core_GUI.cs
new file mode 100644
index 000000000..dd15bf9ca
--- /dev/null
+++ b/Templates/BaseGame/game/core/gui/Core_GUI.cs
@@ -0,0 +1,11 @@
+
+function Core_GUI::onCreate(%this)
+{
+   exec("./scripts/profiles.cs");
+   exec("./scripts/canvas.cs");
+   exec("./scripts/cursor.cs");
+}
+
+function Core_GUI::onDestroy(%this)
+{
+}
\ No newline at end of file
diff --git a/Templates/BaseGame/game/core/gui/Core_GUI.module b/Templates/BaseGame/game/core/gui/Core_GUI.module
new file mode 100644
index 000000000..323d7cff2
--- /dev/null
+++ b/Templates/BaseGame/game/core/gui/Core_GUI.module
@@ -0,0 +1,10 @@
+<ModuleDefinition
+	ModuleId="Core_GUI"
+	VersionId="1"
+	Description="Module that implements the core engine-level setup for the game."
+	ScriptFile="Core_GUI.cs"
+	CreateFunction="onCreate"
+	DestroyFunction="onDestroy"
+	Group="Core"
+	Dependencies="Core_Rendering=1">
+</ModuleDefinition>
\ No newline at end of file
diff --git a/Templates/BaseGame/game/core/images/button.png b/Templates/BaseGame/game/core/gui/images/button.png
similarity index 100%
rename from Templates/BaseGame/game/core/images/button.png
rename to Templates/BaseGame/game/core/gui/images/button.png
diff --git a/Templates/BaseGame/game/core/images/checkbox.png b/Templates/BaseGame/game/core/gui/images/checkbox.png
similarity index 100%
rename from Templates/BaseGame/game/core/images/checkbox.png
rename to Templates/BaseGame/game/core/gui/images/checkbox.png
diff --git a/Templates/BaseGame/game/core/images/group-border.png b/Templates/BaseGame/game/core/gui/images/group-border.png
similarity index 100%
rename from Templates/BaseGame/game/core/images/group-border.png
rename to Templates/BaseGame/game/core/gui/images/group-border.png
diff --git a/Templates/BaseGame/game/core/images/inactive-overlay.png b/Templates/BaseGame/game/core/gui/images/inactive-overlay.png
similarity index 100%
rename from Templates/BaseGame/game/core/images/inactive-overlay.png
rename to Templates/BaseGame/game/core/gui/images/inactive-overlay.png
diff --git a/Templates/BaseGame/game/core/images/loadingbar.png b/Templates/BaseGame/game/core/gui/images/loadingbar.png
similarity index 100%
rename from Templates/BaseGame/game/core/images/loadingbar.png
rename to Templates/BaseGame/game/core/gui/images/loadingbar.png
diff --git a/Templates/BaseGame/game/core/images/scrollBar.png b/Templates/BaseGame/game/core/gui/images/scrollBar.png
similarity index 100%
rename from Templates/BaseGame/game/core/images/scrollBar.png
rename to Templates/BaseGame/game/core/gui/images/scrollBar.png
diff --git a/Templates/BaseGame/game/core/images/textEdit.png b/Templates/BaseGame/game/core/gui/images/textEdit.png
similarity index 100%
rename from Templates/BaseGame/game/core/images/textEdit.png
rename to Templates/BaseGame/game/core/gui/images/textEdit.png
diff --git a/Templates/BaseGame/game/core/images/thumbHighlightButton.png b/Templates/BaseGame/game/core/gui/images/thumbHighlightButton.png
similarity index 100%
rename from Templates/BaseGame/game/core/images/thumbHighlightButton.png
rename to Templates/BaseGame/game/core/gui/images/thumbHighlightButton.png
diff --git a/Templates/BaseGame/game/core/images/window.png b/Templates/BaseGame/game/core/gui/images/window.png
similarity index 100%
rename from Templates/BaseGame/game/core/images/window.png
rename to Templates/BaseGame/game/core/gui/images/window.png
diff --git a/Templates/BaseGame/game/core/canvas.cs b/Templates/BaseGame/game/core/gui/scripts/canvas.cs
similarity index 100%
rename from Templates/BaseGame/game/core/canvas.cs
rename to Templates/BaseGame/game/core/gui/scripts/canvas.cs
diff --git a/Templates/BaseGame/game/core/cursor.cs b/Templates/BaseGame/game/core/gui/scripts/cursor.cs
similarity index 100%
rename from Templates/BaseGame/game/core/cursor.cs
rename to Templates/BaseGame/game/core/gui/scripts/cursor.cs
diff --git a/Templates/BaseGame/game/core/gui/scripts/fonts/Arial 10 (ansi).uft b/Templates/BaseGame/game/core/gui/scripts/fonts/Arial 10 (ansi).uft
new file mode 100644
index 000000000..2b5649500
Binary files /dev/null and b/Templates/BaseGame/game/core/gui/scripts/fonts/Arial 10 (ansi).uft differ
diff --git a/Templates/BaseGame/game/core/gui/scripts/fonts/Arial 12 (ansi).uft b/Templates/BaseGame/game/core/gui/scripts/fonts/Arial 12 (ansi).uft
new file mode 100644
index 000000000..67a177016
Binary files /dev/null and b/Templates/BaseGame/game/core/gui/scripts/fonts/Arial 12 (ansi).uft differ
diff --git a/Templates/BaseGame/game/core/gui/scripts/fonts/Arial 14 (ansi).uft b/Templates/BaseGame/game/core/gui/scripts/fonts/Arial 14 (ansi).uft
new file mode 100644
index 000000000..f4f19745f
Binary files /dev/null and b/Templates/BaseGame/game/core/gui/scripts/fonts/Arial 14 (ansi).uft differ
diff --git a/Templates/BaseGame/game/core/gui/scripts/fonts/Arial 16 (ansi).uft b/Templates/BaseGame/game/core/gui/scripts/fonts/Arial 16 (ansi).uft
new file mode 100644
index 000000000..ec996019d
Binary files /dev/null and b/Templates/BaseGame/game/core/gui/scripts/fonts/Arial 16 (ansi).uft differ
diff --git a/Templates/BaseGame/game/core/gui/scripts/fonts/Arial 36 (ansi).uft b/Templates/BaseGame/game/core/gui/scripts/fonts/Arial 36 (ansi).uft
new file mode 100644
index 000000000..c0aa8165c
Binary files /dev/null and b/Templates/BaseGame/game/core/gui/scripts/fonts/Arial 36 (ansi).uft differ
diff --git a/Templates/BaseGame/game/core/gui/scripts/fonts/Arial Bold 14 (ansi).uft b/Templates/BaseGame/game/core/gui/scripts/fonts/Arial Bold 14 (ansi).uft
new file mode 100644
index 000000000..4dbbddede
Binary files /dev/null and b/Templates/BaseGame/game/core/gui/scripts/fonts/Arial Bold 14 (ansi).uft differ
diff --git a/Templates/BaseGame/game/core/gui/scripts/fonts/Arial Bold 16 (ansi).uft b/Templates/BaseGame/game/core/gui/scripts/fonts/Arial Bold 16 (ansi).uft
new file mode 100644
index 000000000..fb096776f
Binary files /dev/null and b/Templates/BaseGame/game/core/gui/scripts/fonts/Arial Bold 16 (ansi).uft differ
diff --git a/Templates/BaseGame/game/core/gui/scripts/fonts/Arial Bold 18 (ansi).uft b/Templates/BaseGame/game/core/gui/scripts/fonts/Arial Bold 18 (ansi).uft
new file mode 100644
index 000000000..1f8fdedd3
Binary files /dev/null and b/Templates/BaseGame/game/core/gui/scripts/fonts/Arial Bold 18 (ansi).uft differ
diff --git a/Templates/BaseGame/game/core/gui/scripts/fonts/ArialItalic 14 (ansi).uft b/Templates/BaseGame/game/core/gui/scripts/fonts/ArialItalic 14 (ansi).uft
new file mode 100644
index 000000000..5bac0316e
Binary files /dev/null and b/Templates/BaseGame/game/core/gui/scripts/fonts/ArialItalic 14 (ansi).uft differ
diff --git a/Templates/BaseGame/game/core/gui/scripts/fonts/Lucida Console 12 (ansi).uft b/Templates/BaseGame/game/core/gui/scripts/fonts/Lucida Console 12 (ansi).uft
new file mode 100644
index 000000000..e06fa806c
Binary files /dev/null and b/Templates/BaseGame/game/core/gui/scripts/fonts/Lucida Console 12 (ansi).uft differ
diff --git a/Templates/BaseGame/game/core/profiles.cs b/Templates/BaseGame/game/core/gui/scripts/profiles.cs
similarity index 95%
rename from Templates/BaseGame/game/core/profiles.cs
rename to Templates/BaseGame/game/core/gui/scripts/profiles.cs
index fa9d9b72a..a06ab94da 100644
--- a/Templates/BaseGame/game/core/profiles.cs
+++ b/Templates/BaseGame/game/core/gui/scripts/profiles.cs
@@ -107,7 +107,7 @@ new GuiControlProfile (GuiWindowProfile)
    bevelColorHL = "255 255 255";
    bevelColorLL = "0 0 0";
    text = "untitled";
-   bitmap = "./images/window";
+   bitmap = "core/gui/images/window";
    textOffset = "8 4";
    hasBitmapArray = true;
    justify = "left";
@@ -119,7 +119,7 @@ if(!isObject(GuiTextEditProfile))
 new GuiControlProfile(GuiTextEditProfile)
 {
    opaque = true;
-   bitmap = "./images/textEdit";
+   bitmap = "core/gui/images/textEdit";
    hasBitmapArray = true; 
    border = -2;
    fillColor = "242 241 240 0";
@@ -145,7 +145,7 @@ new GuiControlProfile(GuiScrollProfile)
    fontColor = "0 0 0";
    fontColorHL = "150 150 150";
    border = true;
-   bitmap = "./images/scrollBar";
+   bitmap = "core/gui/images/scrollBar";
    hasBitmapArray = true;
    category = "Core";
 };
@@ -173,7 +173,7 @@ new GuiControlProfile(GuiCheckBoxProfile)
 	fontColorNA = "200 200 200";
    fixedExtent = true;
    justify = "left";
-   bitmap = "./images/checkbox";
+   bitmap = "core/gui/images/checkbox";
    hasBitmapArray = true;
    category = "Tools";
 };
@@ -193,7 +193,7 @@ new GuiControlProfile( GuiProgressBitmapProfile )
 {
    border = false;
    hasBitmapArray = true;
-   bitmap = "./images/loadingbar";
+   bitmap = "core/gui/images/loadingbar";
    category = "Core";
 };
 
@@ -220,7 +220,7 @@ new GuiControlProfile( GuiButtonProfile )
    fixedExtent = false;
    justify = "center";
    canKeyFocus = false;
-	bitmap = "./images/button";
+	bitmap = "core/gui/images/button";
    hasBitmapArray = false;
    category = "Core";
 };
diff --git a/Templates/BaseGame/game/core/lighting/Core_Lighting.cs b/Templates/BaseGame/game/core/lighting/Core_Lighting.cs
new file mode 100644
index 000000000..dc5680b84
--- /dev/null
+++ b/Templates/BaseGame/game/core/lighting/Core_Lighting.cs
@@ -0,0 +1,20 @@
+
+function Core_Lighting::onCreate(%this)
+{
+   exec("./scripts/lighting.cs");
+   
+   //Advanced/Deferred
+   exec("./scripts/advancedLighting_Shaders.cs");
+   exec("./scripts/deferredShading.cs");
+   exec("./scripts/advancedLighting_Init.cs");
+   
+   //Basic/Forward
+   exec("./scripts/basicLighting_shadowFilter.cs");
+   exec("./scripts/shadowMaps_Init.cs");
+   exec("./scripts/basicLighting_Init.cs");
+   
+}
+
+function Core_Lighting::onDestroy(%this)
+{
+}
\ No newline at end of file
diff --git a/Templates/BaseGame/game/core/lighting/Core_Lighting.module b/Templates/BaseGame/game/core/lighting/Core_Lighting.module
new file mode 100644
index 000000000..b4619a64a
--- /dev/null
+++ b/Templates/BaseGame/game/core/lighting/Core_Lighting.module
@@ -0,0 +1,9 @@
+<ModuleDefinition
+	ModuleId="Core_Lighting"
+	VersionId="1"
+	Description="Module that implements the core engine-level setup for the game."
+	ScriptFile="Core_Lighting.cs"
+	CreateFunction="onCreate"
+	DestroyFunction="onDestroy"
+	Group="Core">
+</ModuleDefinition>
\ No newline at end of file
diff --git a/Templates/BaseGame/game/core/lighting/advanced/init.cs b/Templates/BaseGame/game/core/lighting/scripts/advancedLighting_Init.cs
similarity index 97%
rename from Templates/BaseGame/game/core/lighting/advanced/init.cs
rename to Templates/BaseGame/game/core/lighting/scripts/advancedLighting_Init.cs
index db2175278..c7d357bb8 100644
--- a/Templates/BaseGame/game/core/lighting/advanced/init.cs
+++ b/Templates/BaseGame/game/core/lighting/scripts/advancedLighting_Init.cs
@@ -39,8 +39,8 @@ $pref::LightManager::sgUseDynamicShadows = "1";
 $pref::LightManager::sgUseToneMapping = "";
 */
 
-exec( "./shaders.cs" );
-exec( "./deferredShading.cs" );
+//exec( "./shaders.cs" );
+//exec( "./deferredShading.cs" );
 
 function onActivateAdvancedLM()
 {
diff --git a/Templates/BaseGame/game/core/lighting/advanced/shaders.cs b/Templates/BaseGame/game/core/lighting/scripts/advancedLighting_Shaders.cs
similarity index 100%
rename from Templates/BaseGame/game/core/lighting/advanced/shaders.cs
rename to Templates/BaseGame/game/core/lighting/scripts/advancedLighting_Shaders.cs
diff --git a/Templates/BaseGame/game/core/lighting/basic/init.cs b/Templates/BaseGame/game/core/lighting/scripts/basicLighting_Init.cs
similarity index 99%
rename from Templates/BaseGame/game/core/lighting/basic/init.cs
rename to Templates/BaseGame/game/core/lighting/scripts/basicLighting_Init.cs
index f298dfad2..99be20c5c 100644
--- a/Templates/BaseGame/game/core/lighting/basic/init.cs
+++ b/Templates/BaseGame/game/core/lighting/scripts/basicLighting_Init.cs
@@ -20,7 +20,7 @@
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 
-exec( "./shadowFilter.cs" );
+//exec( "./shadowFilter.cs" );
 
 singleton GFXStateBlockData( BL_ProjectedShadowSBData )
 {
diff --git a/Templates/BaseGame/game/core/lighting/basic/shadowFilter.cs b/Templates/BaseGame/game/core/lighting/scripts/basicLighting_shadowFilter.cs
similarity index 100%
rename from Templates/BaseGame/game/core/lighting/basic/shadowFilter.cs
rename to Templates/BaseGame/game/core/lighting/scripts/basicLighting_shadowFilter.cs
diff --git a/Templates/BaseGame/game/core/lighting/advanced/deferredShading.cs b/Templates/BaseGame/game/core/lighting/scripts/deferredShading.cs
similarity index 100%
rename from Templates/BaseGame/game/core/lighting/advanced/deferredShading.cs
rename to Templates/BaseGame/game/core/lighting/scripts/deferredShading.cs
diff --git a/Templates/BaseGame/game/core/lighting.cs b/Templates/BaseGame/game/core/lighting/scripts/lighting.cs
similarity index 96%
rename from Templates/BaseGame/game/core/lighting.cs
rename to Templates/BaseGame/game/core/lighting/scripts/lighting.cs
index 9ece7d1a0..b7d4034ff 100644
--- a/Templates/BaseGame/game/core/lighting.cs
+++ b/Templates/BaseGame/game/core/lighting/scripts/lighting.cs
@@ -26,12 +26,12 @@ function initLightingSystems(%manager)
 
    // First exec the scripts for the different light managers
    // in the lighting folder.
-   %pattern = "./lighting/*/init.cs";   
+   /*%pattern = "./lighting/*//*init.cs";   
    %file = findFirstFile( %pattern );
    if ( %file $= "" )
    {
       // Try for DSOs next.
-      %pattern = "./lighting/*/init.cs.dso";
+      %pattern = "./lighting/*//*init.cs.dso";
       %file = findFirstFile( %pattern );
    }
 
@@ -39,7 +39,7 @@ function initLightingSystems(%manager)
    {      
       exec( %file );
       %file = findNextFile( %pattern );
-   }
+   }*/
 
    // Try the perfered one first.
    %success = setLightManager(%manager);
diff --git a/Templates/BaseGame/game/core/lighting/shadowMaps/init.cs b/Templates/BaseGame/game/core/lighting/scripts/shadowMaps_Init.cs
similarity index 100%
rename from Templates/BaseGame/game/core/lighting/shadowMaps/init.cs
rename to Templates/BaseGame/game/core/lighting/scripts/shadowMaps_Init.cs
diff --git a/Templates/BaseGame/game/core/main.cs b/Templates/BaseGame/game/core/main.cs
deleted file mode 100644
index 8058c1f90..000000000
--- a/Templates/BaseGame/game/core/main.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2012 GarageGames, LLC
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to
-// deal in the Software without restriction, including without limitation the
-// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-// sell copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-// IN THE SOFTWARE.
-//-----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// Initialize core sub system functionality such as audio, the Canvas, PostFX,
-// rendermanager, light managers, etc.
-//
-// Note that not all of these need to be initialized before the client, although
-// the audio should and the canvas definitely needs to be.  I've put things here
-// to distinguish between the purpose and functionality of the various client
-// scripts.  Game specific script isn't needed until we reach the shell menus
-// and start a game or connect to a server. We get the various subsystems ready
-// to go, and then use initClient() to handle the rest of the startup sequence.
-//
-// If this is too convoluted we can reduce this complexity after futher testing
-// to find exactly which subsystems should be readied before kicking things off. 
-// ----------------------------------------------------------------------------
-
-//We need to hook the missing/warn material stuff early, so do it here
-$Core::MissingTexturePath = "core/images/missingTexture";
-$Core::UnAvailableTexturePath = "core/images/unavailable";
-$Core::WarningTexturePath = "core/images/warnMat";
-$Core::CommonShaderPath = "core/shaders";
-
-ModuleDatabase.setModuleExtension("module");
-
-//Core components
-ModuleDatabase.scanModules( "core", false );
-ModuleDatabase.LoadExplicit( "CoreComponentsModule" );
-
-exec("./helperFunctions.cs");
-
-// We need some of the default GUI profiles in order to get the canvas and
-// other aspects of the GUI system ready.
-exec("./profiles.cs");
-
-//This is a bit of a shortcut, but we'll load the client's default settings to ensure all the prefs get initialized correctly
-%prefPath = getPrefpath();
-if ( isFile( %prefPath @ "/clientPrefs.cs" ) )
-   exec( %prefPath @ "/clientPrefs.cs" );
-else
-   exec("data/defaults.cs");
-   
-%der = $pref::Video::displayDevice;
-
-// Initialization of the various subsystems requires some of the preferences
-// to be loaded... so do that first.
-exec("./globals.cs");
-
-exec("./canvas.cs");
-exec("./cursor.cs");
-
-exec("./renderManager.cs");
-exec("./lighting.cs");
-
-exec("./audio.cs");
-exec("./sfx/audioAmbience.cs");
-exec("./sfx/audioData.cs");
-exec("./sfx/audioDescriptions.cs");
-exec("./sfx/audioEnvironments.cs");
-exec("./sfx/audioStates.cs");
-
-exec("./parseArgs.cs");
-
-// Materials and Shaders for rendering various object types
-exec("./gfxData/commonMaterialData.cs");
-exec("./gfxData/shaders.cs");
-exec("./gfxData/terrainBlock.cs");
-exec("./gfxData/water.cs");
-exec("./gfxData/scatterSky.cs");
-exec("./gfxData/clouds.cs");
-
-// Initialize all core post effects.   
-exec("./postFx.cs");
-
-//VR stuff
-exec("./oculusVR.cs");
-
-// Seed the random number generator.
-setRandomSeed();
\ No newline at end of file
diff --git a/Templates/BaseGame/game/core/postFX/Core_PostFX.cs b/Templates/BaseGame/game/core/postFX/Core_PostFX.cs
new file mode 100644
index 000000000..d36d912ab
--- /dev/null
+++ b/Templates/BaseGame/game/core/postFX/Core_PostFX.cs
@@ -0,0 +1,33 @@
+
+function Core_PostFX::onCreate(%this)
+{
+   //
+   exec("./scripts/postFx.cs");
+   /*exec("./scripts/postFxManager.gui.cs");
+   exec("./scripts/postFxManager.gui.settings.cs");
+   exec("./scripts/postFxManager.persistance.cs");
+   
+   exec("./scripts/default.postfxpreset.cs");
+   
+   exec("./scripts/caustics.cs");
+   exec("./scripts/chromaticLens.cs");
+   exec("./scripts/dof.cs");
+   exec("./scripts/edgeAA.cs");
+   exec("./scripts/flash.cs");
+   exec("./scripts/fog.cs");
+   exec("./scripts/fxaa.cs");
+   exec("./scripts/GammaPostFX.cs");
+   exec("./scripts/glow.cs");
+   exec("./scripts/hdr.cs");
+   exec("./scripts/lightRay.cs");
+   exec("./scripts/MLAA.cs");
+   exec("./scripts/MotionBlurFx.cs");
+   exec("./scripts/ovrBarrelDistortion.cs");
+   exec("./scripts/ssao.cs");
+   exec("./scripts/turbulence.cs");
+   exec("./scripts/vignette.cs");*/
+}
+
+function Core_PostFX::onDestroy(%this)
+{
+}
\ No newline at end of file
diff --git a/Templates/BaseGame/game/core/postFX/Core_PostFX.module b/Templates/BaseGame/game/core/postFX/Core_PostFX.module
new file mode 100644
index 000000000..627a32d94
--- /dev/null
+++ b/Templates/BaseGame/game/core/postFX/Core_PostFX.module
@@ -0,0 +1,10 @@
+<ModuleDefinition
+	ModuleId="Core_PostFX"
+	VersionId="1"
+	Description="Module that implements the core engine-level setup for the game."
+	ScriptFile="Core_PostFX.cs"
+	CreateFunction="onCreate"
+	DestroyFunction="onDestroy"
+	Group="Core"
+	Dependencies="Core_Rendering=1,Core_Lighting=1">
+</ModuleDefinition>
\ No newline at end of file
diff --git a/Templates/BaseGame/game/core/postFX/postFxManager.gui b/Templates/BaseGame/game/core/postFX/guis/postFxManager.gui
similarity index 99%
rename from Templates/BaseGame/game/core/postFX/postFxManager.gui
rename to Templates/BaseGame/game/core/postFX/guis/postFxManager.gui
index e74179374..6a704eb65 100644
--- a/Templates/BaseGame/game/core/postFX/postFxManager.gui
+++ b/Templates/BaseGame/game/core/postFX/guis/postFxManager.gui
@@ -2526,7 +2526,7 @@
                sinkAllKeyEvents = "0";
                password = "0";
                passwordMask = "*";
-               text = "core/images/null_color_ramp.png";
+               text = "core/postFX/images/null_color_ramp.png";
                maxLength = "1024";
                margin = "0 0 0 0";
                padding = "0 0 0 0";
diff --git a/Templates/BaseGame/game/core/images/AreaMap33.dds b/Templates/BaseGame/game/core/postFX/images/AreaMap33.dds
similarity index 100%
rename from Templates/BaseGame/game/core/images/AreaMap33.dds
rename to Templates/BaseGame/game/core/postFX/images/AreaMap33.dds
diff --git a/Templates/BaseGame/game/core/images/caustics_1.png b/Templates/BaseGame/game/core/postFX/images/caustics_1.png
similarity index 100%
rename from Templates/BaseGame/game/core/images/caustics_1.png
rename to Templates/BaseGame/game/core/postFX/images/caustics_1.png
diff --git a/Templates/BaseGame/game/core/images/caustics_2.png b/Templates/BaseGame/game/core/postFX/images/caustics_2.png
similarity index 100%
rename from Templates/BaseGame/game/core/images/caustics_2.png
rename to Templates/BaseGame/game/core/postFX/images/caustics_2.png
diff --git a/Templates/BaseGame/game/core/postFX/images/inactive-overlay.png b/Templates/BaseGame/game/core/postFX/images/inactive-overlay.png
new file mode 100644
index 000000000..feab83209
Binary files /dev/null and b/Templates/BaseGame/game/core/postFX/images/inactive-overlay.png differ
diff --git a/Templates/BaseGame/game/core/images/materials.cs b/Templates/BaseGame/game/core/postFX/images/materials.cs
similarity index 100%
rename from Templates/BaseGame/game/core/images/materials.cs
rename to Templates/BaseGame/game/core/postFX/images/materials.cs
diff --git a/Templates/BaseGame/game/core/images/missingTexture.png b/Templates/BaseGame/game/core/postFX/images/missingTexture.png
similarity index 100%
rename from Templates/BaseGame/game/core/images/missingTexture.png
rename to Templates/BaseGame/game/core/postFX/images/missingTexture.png
diff --git a/Templates/BaseGame/game/core/images/noise.png b/Templates/BaseGame/game/core/postFX/images/noise.png
similarity index 100%
rename from Templates/BaseGame/game/core/images/noise.png
rename to Templates/BaseGame/game/core/postFX/images/noise.png
diff --git a/Templates/BaseGame/game/core/images/null_color_ramp.png b/Templates/BaseGame/game/core/postFX/images/null_color_ramp.png
similarity index 100%
rename from Templates/BaseGame/game/core/images/null_color_ramp.png
rename to Templates/BaseGame/game/core/postFX/images/null_color_ramp.png
diff --git a/Templates/BaseGame/game/core/images/unavailable.png b/Templates/BaseGame/game/core/postFX/images/unavailable.png
similarity index 100%
rename from Templates/BaseGame/game/core/images/unavailable.png
rename to Templates/BaseGame/game/core/postFX/images/unavailable.png
diff --git a/Templates/BaseGame/game/core/images/warnMat.dds b/Templates/BaseGame/game/core/postFX/images/warnMat.dds
similarity index 100%
rename from Templates/BaseGame/game/core/images/warnMat.dds
rename to Templates/BaseGame/game/core/postFX/images/warnMat.dds
diff --git a/Templates/BaseGame/game/core/postFX/GammaPostFX.cs b/Templates/BaseGame/game/core/postFX/scripts/GammaPostFX.cs
similarity index 100%
rename from Templates/BaseGame/game/core/postFX/GammaPostFX.cs
rename to Templates/BaseGame/game/core/postFX/scripts/GammaPostFX.cs
diff --git a/Templates/BaseGame/game/core/postFX/MLAA.cs b/Templates/BaseGame/game/core/postFX/scripts/MLAA.cs
similarity index 99%
rename from Templates/BaseGame/game/core/postFX/MLAA.cs
rename to Templates/BaseGame/game/core/postFX/scripts/MLAA.cs
index ee07427ee..491c98e4e 100644
--- a/Templates/BaseGame/game/core/postFX/MLAA.cs
+++ b/Templates/BaseGame/game/core/postFX/scripts/MLAA.cs
@@ -162,7 +162,7 @@ singleton PostEffect( MLAAFx )
 
       texture[0] = "$inTex"; // Edges mask    
       texture[1] = "$inTex"; // Edges mask 
-      texture[2] = "core/images/AreaMap33.dds";
+      texture[2] = "core/postFX/images/AreaMap33.dds";
    };
 
    new PostEffect()
diff --git a/Templates/BaseGame/game/core/postFX/MotionBlurFx.cs b/Templates/BaseGame/game/core/postFX/scripts/MotionBlurFx.cs
similarity index 100%
rename from Templates/BaseGame/game/core/postFX/MotionBlurFx.cs
rename to Templates/BaseGame/game/core/postFX/scripts/MotionBlurFx.cs
diff --git a/Templates/BaseGame/game/core/postFX/caustics.cs b/Templates/BaseGame/game/core/postFX/scripts/caustics.cs
similarity index 96%
rename from Templates/BaseGame/game/core/postFX/caustics.cs
rename to Templates/BaseGame/game/core/postFX/scripts/caustics.cs
index f391ec67a..7dcea20a5 100644
--- a/Templates/BaseGame/game/core/postFX/caustics.cs
+++ b/Templates/BaseGame/game/core/postFX/scripts/caustics.cs
@@ -58,7 +58,7 @@ singleton PostEffect( CausticsPFX )
    shader = PFX_CausticsShader;
    stateBlock = PFX_CausticsStateBlock;
    texture[0] = "#deferred";
-   texture[1] = "core/images/caustics_1";
-   texture[2] = "core/images/caustics_2";
+   texture[1] = "core/postFX/images/caustics_1";
+   texture[2] = "core/postFX/images/caustics_2";
    target = "$backBuffer";
 };
diff --git a/Templates/BaseGame/game/core/postFX/chromaticLens.cs b/Templates/BaseGame/game/core/postFX/scripts/chromaticLens.cs
similarity index 100%
rename from Templates/BaseGame/game/core/postFX/chromaticLens.cs
rename to Templates/BaseGame/game/core/postFX/scripts/chromaticLens.cs
diff --git a/Templates/BaseGame/game/core/postFX/default.postfxpreset.cs b/Templates/BaseGame/game/core/postFX/scripts/default.postfxpreset.cs
similarity index 97%
rename from Templates/BaseGame/game/core/postFX/default.postfxpreset.cs
rename to Templates/BaseGame/game/core/postFX/scripts/default.postfxpreset.cs
index 077908ee8..6054d52ee 100644
--- a/Templates/BaseGame/game/core/postFX/default.postfxpreset.cs
+++ b/Templates/BaseGame/game/core/postFX/scripts/default.postfxpreset.cs
@@ -69,4 +69,4 @@ $PostFXManager::Settings::SSAO::sNormalPow = "1";
 $PostFXManager::Settings::SSAO::sNormalTol = "0";
 $PostFXManager::Settings::SSAO::sRadius = "0.1";
 $PostFXManager::Settings::SSAO::sStrength = "6";
-$PostFXManager::Settings::ColorCorrectionRamp = "core/images/null_color_ramp.png";
+$PostFXManager::Settings::ColorCorrectionRamp = "core/postFX/images/null_color_ramp.png";
diff --git a/Templates/BaseGame/game/core/postFX/dof.cs b/Templates/BaseGame/game/core/postFX/scripts/dof.cs
similarity index 99%
rename from Templates/BaseGame/game/core/postFX/dof.cs
rename to Templates/BaseGame/game/core/postFX/scripts/dof.cs
index 1767a9c86..736c288b2 100644
--- a/Templates/BaseGame/game/core/postFX/dof.cs
+++ b/Templates/BaseGame/game/core/postFX/scripts/dof.cs
@@ -556,8 +556,8 @@ function DOFPostEffect::autoFocus( %this )
    %mask = $TypeMasks::StaticObjectType | $TypeMasks::TerrainObjectType;               
    %control = ServerConnection.getCameraObject();
 
-   %fvec = %control.getEyeVector();      
-   %start = %control.getEyePoint();
+   %fvec = %control.getForwardVector();      
+   %start = %control.getPosition();
       
    %end = VectorAdd( %start, VectorScale( %fvec, $Param::FarDist ) );
       
diff --git a/Templates/BaseGame/game/core/postFX/edgeAA.cs b/Templates/BaseGame/game/core/postFX/scripts/edgeAA.cs
similarity index 100%
rename from Templates/BaseGame/game/core/postFX/edgeAA.cs
rename to Templates/BaseGame/game/core/postFX/scripts/edgeAA.cs
diff --git a/Templates/BaseGame/game/core/postFX/flash.cs b/Templates/BaseGame/game/core/postFX/scripts/flash.cs
similarity index 100%
rename from Templates/BaseGame/game/core/postFX/flash.cs
rename to Templates/BaseGame/game/core/postFX/scripts/flash.cs
diff --git a/Templates/BaseGame/game/core/postFX/fog.cs b/Templates/BaseGame/game/core/postFX/scripts/fog.cs
similarity index 100%
rename from Templates/BaseGame/game/core/postFX/fog.cs
rename to Templates/BaseGame/game/core/postFX/scripts/fog.cs
diff --git a/Templates/BaseGame/game/core/postFX/fxaa.cs b/Templates/BaseGame/game/core/postFX/scripts/fxaa.cs
similarity index 100%
rename from Templates/BaseGame/game/core/postFX/fxaa.cs
rename to Templates/BaseGame/game/core/postFX/scripts/fxaa.cs
diff --git a/Templates/BaseGame/game/core/postFX/glow.cs b/Templates/BaseGame/game/core/postFX/scripts/glow.cs
similarity index 100%
rename from Templates/BaseGame/game/core/postFX/glow.cs
rename to Templates/BaseGame/game/core/postFX/scripts/glow.cs
diff --git a/Templates/BaseGame/game/core/postFX/hdr.cs b/Templates/BaseGame/game/core/postFX/scripts/hdr.cs
similarity index 99%
rename from Templates/BaseGame/game/core/postFX/hdr.cs
rename to Templates/BaseGame/game/core/postFX/scripts/hdr.cs
index 837d8e6c8..3b2de8b7b 100644
--- a/Templates/BaseGame/game/core/postFX/hdr.cs
+++ b/Templates/BaseGame/game/core/postFX/scripts/hdr.cs
@@ -70,7 +70,7 @@ $HDRPostFX::gaussStdDev = 0.8;
 /// The 1x255 color correction ramp texture used
 /// by both the HDR shader and the GammaPostFx shader
 /// for doing full screen color correction. 
-$HDRPostFX::colorCorrectionRamp = "core/images/null_color_ramp.png";
+$HDRPostFX::colorCorrectionRamp = "core/postFX/images/null_color_ramp.png";
 
 
 singleton ShaderData( HDR_BrightPassShader )
diff --git a/Templates/BaseGame/game/core/postFX/lightRay.cs b/Templates/BaseGame/game/core/postFX/scripts/lightRay.cs
similarity index 100%
rename from Templates/BaseGame/game/core/postFX/lightRay.cs
rename to Templates/BaseGame/game/core/postFX/scripts/lightRay.cs
diff --git a/Templates/BaseGame/game/core/postFX/ovrBarrelDistortion.cs b/Templates/BaseGame/game/core/postFX/scripts/ovrBarrelDistortion.cs
similarity index 100%
rename from Templates/BaseGame/game/core/postFX/ovrBarrelDistortion.cs
rename to Templates/BaseGame/game/core/postFX/scripts/ovrBarrelDistortion.cs
diff --git a/Templates/BaseGame/game/core/postFx.cs b/Templates/BaseGame/game/core/postFX/scripts/postFx.cs
similarity index 97%
rename from Templates/BaseGame/game/core/postFx.cs
rename to Templates/BaseGame/game/core/postFX/scripts/postFx.cs
index aa65262d8..fe931a994 100644
--- a/Templates/BaseGame/game/core/postFx.cs
+++ b/Templates/BaseGame/game/core/postFX/scripts/postFx.cs
@@ -35,13 +35,13 @@ singleton ShaderData( PFX_PassthruShader )
 
 function postFXInit()
 {
-   exec("./postFX/postFxManager.gui");
+   exec("core/postFX/guis/postFxManager.gui");
    
    //Load the core postFX files themselves
    if (!$Server::Dedicated)
    {
       //init the postFX
-      %pattern = "core/postFX/*.cs";   
+      %pattern = "./*.cs";   
       %file = findFirstFile( %pattern );
       if ( %file $= "" )
       {
diff --git a/Templates/BaseGame/game/core/postFX/postFxManager.gui.cs b/Templates/BaseGame/game/core/postFX/scripts/postFxManager.gui.cs
similarity index 99%
rename from Templates/BaseGame/game/core/postFX/postFxManager.gui.cs
rename to Templates/BaseGame/game/core/postFX/scripts/postFxManager.gui.cs
index 73dbec8b0..a6b0f0f01 100644
--- a/Templates/BaseGame/game/core/postFX/postFxManager.gui.cs
+++ b/Templates/BaseGame/game/core/postFX/scripts/postFxManager.gui.cs
@@ -437,7 +437,7 @@ function ppColorCorrection_selectFile()
 function ppColorCorrection_selectFileHandler( %filename )
 {
    if ( %filename $= "" || !isFile( %filename ) )
-      %filename = "core/images/null_color_ramp.png";
+      %filename = "core/postFX/images/null_color_ramp.png";
    else
       %filename = makeRelativePath( %filename, getMainDotCsDir() );
             
diff --git a/Templates/BaseGame/game/core/postFX/postFxManager.gui.settings.cs b/Templates/BaseGame/game/core/postFX/scripts/postFxManager.gui.settings.cs
similarity index 99%
rename from Templates/BaseGame/game/core/postFX/postFxManager.gui.settings.cs
rename to Templates/BaseGame/game/core/postFX/scripts/postFxManager.gui.settings.cs
index d0ba2c4ea..eefcd9b7e 100644
--- a/Templates/BaseGame/game/core/postFX/postFxManager.gui.settings.cs
+++ b/Templates/BaseGame/game/core/postFX/scripts/postFxManager.gui.settings.cs
@@ -20,7 +20,7 @@
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 
-$PostFXManager::defaultPreset  = "core/postFX/default.postfxpreset.cs";
+$PostFXManager::defaultPreset  = "./default.postfxpreset.cs";
 
 function PostFXManager::settingsSetEnabled(%this, %bEnablePostFX)
 {
diff --git a/Templates/BaseGame/game/core/postFX/postFxManager.persistance.cs b/Templates/BaseGame/game/core/postFX/scripts/postFxManager.persistance.cs
similarity index 100%
rename from Templates/BaseGame/game/core/postFX/postFxManager.persistance.cs
rename to Templates/BaseGame/game/core/postFX/scripts/postFxManager.persistance.cs
diff --git a/Templates/BaseGame/game/core/postFX/ssao.cs b/Templates/BaseGame/game/core/postFX/scripts/ssao.cs
similarity index 99%
rename from Templates/BaseGame/game/core/postFX/ssao.cs
rename to Templates/BaseGame/game/core/postFX/scripts/ssao.cs
index 3165b263d..5fe405a82 100644
--- a/Templates/BaseGame/game/core/postFX/ssao.cs
+++ b/Templates/BaseGame/game/core/postFX/scripts/ssao.cs
@@ -200,7 +200,7 @@ singleton PostEffect( SSAOPostFx )
    stateBlock = SSAOStateBlock;
          
    texture[0] = "#deferred";         
-   texture[1] = "core/images/noise.png";
+   texture[1] = "core/postFX/images/noise.png";
    texture[2] = "#ssao_pow_table";
    
    target = "$outTex";
diff --git a/Templates/BaseGame/game/core/postFX/turbulence.cs b/Templates/BaseGame/game/core/postFX/scripts/turbulence.cs
similarity index 100%
rename from Templates/BaseGame/game/core/postFX/turbulence.cs
rename to Templates/BaseGame/game/core/postFX/scripts/turbulence.cs
diff --git a/Templates/BaseGame/game/core/postFX/vignette.cs b/Templates/BaseGame/game/core/postFX/scripts/vignette.cs
similarity index 100%
rename from Templates/BaseGame/game/core/postFX/vignette.cs
rename to Templates/BaseGame/game/core/postFX/scripts/vignette.cs
diff --git a/Templates/BaseGame/game/core/rendering/Core_Rendering.cs b/Templates/BaseGame/game/core/rendering/Core_Rendering.cs
new file mode 100644
index 000000000..d09e0cbe3
--- /dev/null
+++ b/Templates/BaseGame/game/core/rendering/Core_Rendering.cs
@@ -0,0 +1,20 @@
+
+function Core_Rendering::onCreate(%this)
+{
+   $Core::MissingTexturePath = "core/rendering/images/missingTexture";
+   $Core::UnAvailableTexturePath = "core/rendering/images/unavailable";
+   $Core::WarningTexturePath = "core/rendering/images/warnMat";
+   $Core::CommonShaderPath = "core/rendering/shaders";
+   
+   exec("./scripts/renderManager.cs");
+   exec("./scripts/gfxData/clouds.cs");
+   exec("./scripts/gfxData/commonMaterialData.cs");
+   exec("./scripts/gfxData/scatterSky.cs");
+   exec("./scripts/gfxData/shaders.cs");
+   exec("./scripts/gfxData/terrainBlock.cs");
+   exec("./scripts/gfxData/water.cs");
+}
+
+function Core_Rendering::onDestroy(%this)
+{
+}
\ No newline at end of file
diff --git a/Templates/BaseGame/game/core/rendering/Core_Rendering.module b/Templates/BaseGame/game/core/rendering/Core_Rendering.module
new file mode 100644
index 000000000..9dbbfc33a
--- /dev/null
+++ b/Templates/BaseGame/game/core/rendering/Core_Rendering.module
@@ -0,0 +1,9 @@
+<ModuleDefinition
+	ModuleId="Core_Rendering"
+	VersionId="1"
+	Description="Module that implements the core engine-level setup for the game."
+	ScriptFile="Core_Rendering.cs"
+	CreateFunction="onCreate"
+	DestroyFunction="onDestroy"
+	Group="Core">
+</ModuleDefinition>
\ No newline at end of file
diff --git a/Templates/BaseGame/game/core/rendering/images/materials.cs b/Templates/BaseGame/game/core/rendering/images/materials.cs
new file mode 100644
index 000000000..a13c751b3
--- /dev/null
+++ b/Templates/BaseGame/game/core/rendering/images/materials.cs
@@ -0,0 +1,32 @@
+//-----------------------------------------------------------------------------
+// Copyright (c) 2012 GarageGames, LLC
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+//-----------------------------------------------------------------------------
+
+singleton Material( Empty )
+{
+};
+
+singleton Material(WarningMaterial) {
+   detailMap[0] = "missingTexture";
+   diffuseColor[0] = "25 16 0";
+   emissive[0] = false;
+   translucent = false;
+};
diff --git a/Templates/BaseGame/game/core/rendering/images/missingTexture.png b/Templates/BaseGame/game/core/rendering/images/missingTexture.png
new file mode 100644
index 000000000..80a7874da
Binary files /dev/null and b/Templates/BaseGame/game/core/rendering/images/missingTexture.png differ
diff --git a/Templates/BaseGame/game/core/rendering/images/unavailable.png b/Templates/BaseGame/game/core/rendering/images/unavailable.png
new file mode 100644
index 000000000..9d818a376
Binary files /dev/null and b/Templates/BaseGame/game/core/rendering/images/unavailable.png differ
diff --git a/Templates/BaseGame/game/core/rendering/images/warnMat.dds b/Templates/BaseGame/game/core/rendering/images/warnMat.dds
new file mode 100644
index 000000000..ea99dcbd7
Binary files /dev/null and b/Templates/BaseGame/game/core/rendering/images/warnMat.dds differ
diff --git a/Templates/BaseGame/game/core/gfxData/clouds.cs b/Templates/BaseGame/game/core/rendering/scripts/gfxData/clouds.cs
similarity index 100%
rename from Templates/BaseGame/game/core/gfxData/clouds.cs
rename to Templates/BaseGame/game/core/rendering/scripts/gfxData/clouds.cs
diff --git a/Templates/BaseGame/game/core/gfxData/commonMaterialData.cs b/Templates/BaseGame/game/core/rendering/scripts/gfxData/commonMaterialData.cs
similarity index 100%
rename from Templates/BaseGame/game/core/gfxData/commonMaterialData.cs
rename to Templates/BaseGame/game/core/rendering/scripts/gfxData/commonMaterialData.cs
diff --git a/Templates/BaseGame/game/core/gfxData/scatterSky.cs b/Templates/BaseGame/game/core/rendering/scripts/gfxData/scatterSky.cs
similarity index 100%
rename from Templates/BaseGame/game/core/gfxData/scatterSky.cs
rename to Templates/BaseGame/game/core/rendering/scripts/gfxData/scatterSky.cs
diff --git a/Templates/BaseGame/game/core/gfxData/shaders.cs b/Templates/BaseGame/game/core/rendering/scripts/gfxData/shaders.cs
similarity index 100%
rename from Templates/BaseGame/game/core/gfxData/shaders.cs
rename to Templates/BaseGame/game/core/rendering/scripts/gfxData/shaders.cs
diff --git a/Templates/BaseGame/game/core/gfxData/terrainBlock.cs b/Templates/BaseGame/game/core/rendering/scripts/gfxData/terrainBlock.cs
similarity index 100%
rename from Templates/BaseGame/game/core/gfxData/terrainBlock.cs
rename to Templates/BaseGame/game/core/rendering/scripts/gfxData/terrainBlock.cs
diff --git a/Templates/BaseGame/game/core/gfxData/water.cs b/Templates/BaseGame/game/core/rendering/scripts/gfxData/water.cs
similarity index 100%
rename from Templates/BaseGame/game/core/gfxData/water.cs
rename to Templates/BaseGame/game/core/rendering/scripts/gfxData/water.cs
diff --git a/Templates/BaseGame/game/core/gfxprofile/D3D9.ATITechnologiesInc.cs b/Templates/BaseGame/game/core/rendering/scripts/gfxprofile/D3D9.ATITechnologiesInc.cs
similarity index 100%
rename from Templates/BaseGame/game/core/gfxprofile/D3D9.ATITechnologiesInc.cs
rename to Templates/BaseGame/game/core/rendering/scripts/gfxprofile/D3D9.ATITechnologiesInc.cs
diff --git a/Templates/BaseGame/game/core/gfxprofile/D3D9.NVIDIA.GeForce8600.cs b/Templates/BaseGame/game/core/rendering/scripts/gfxprofile/D3D9.NVIDIA.GeForce8600.cs
similarity index 100%
rename from Templates/BaseGame/game/core/gfxprofile/D3D9.NVIDIA.GeForce8600.cs
rename to Templates/BaseGame/game/core/rendering/scripts/gfxprofile/D3D9.NVIDIA.GeForce8600.cs
diff --git a/Templates/BaseGame/game/core/gfxprofile/D3D9.NVIDIA.QuadroFXGo1000.cs b/Templates/BaseGame/game/core/rendering/scripts/gfxprofile/D3D9.NVIDIA.QuadroFXGo1000.cs
similarity index 100%
rename from Templates/BaseGame/game/core/gfxprofile/D3D9.NVIDIA.QuadroFXGo1000.cs
rename to Templates/BaseGame/game/core/rendering/scripts/gfxprofile/D3D9.NVIDIA.QuadroFXGo1000.cs
diff --git a/Templates/BaseGame/game/core/gfxprofile/D3D9.NVIDIA.cs b/Templates/BaseGame/game/core/rendering/scripts/gfxprofile/D3D9.NVIDIA.cs
similarity index 100%
rename from Templates/BaseGame/game/core/gfxprofile/D3D9.NVIDIA.cs
rename to Templates/BaseGame/game/core/rendering/scripts/gfxprofile/D3D9.NVIDIA.cs
diff --git a/Templates/BaseGame/game/core/gfxprofile/D3D9.cs b/Templates/BaseGame/game/core/rendering/scripts/gfxprofile/D3D9.cs
similarity index 100%
rename from Templates/BaseGame/game/core/gfxprofile/D3D9.cs
rename to Templates/BaseGame/game/core/rendering/scripts/gfxprofile/D3D9.cs
diff --git a/Templates/BaseGame/game/core/renderManager.cs b/Templates/BaseGame/game/core/rendering/scripts/renderManager.cs
similarity index 88%
rename from Templates/BaseGame/game/core/renderManager.cs
rename to Templates/BaseGame/game/core/rendering/scripts/renderManager.cs
index e9644c1ea..4a80a45b1 100644
--- a/Templates/BaseGame/game/core/renderManager.cs
+++ b/Templates/BaseGame/game/core/rendering/scripts/renderManager.cs
@@ -88,16 +88,6 @@ function initRenderManager()
                
    // Resolve format change token last.
    DiffuseRenderPassManager.addManager( new RenderPassStateBin(FinalBin)       { renderOrder = 1.7; stateToken = AL_FormatToken; } );
-
-   // AFX CODE BLOCK (interior-zodiacs)(polysoup-zodiacs) <<
-   if(isObject(afxZodiacTerrainRenderer))
-   {
-      DiffuseRenderPassManager.addManager( new afxZodiacTerrainRenderer() { bintype = "TerrainZodiac"; renderOrder = 1.41; processAddOrder = 1.41; } );
-      DiffuseRenderPassManager.addManager( new afxZodiacPolysoupRenderer() { bintype = "PolysoupZodiac"; renderOrder = 1.42; processAddOrder = 1.42; } );
-      DiffuseRenderPassManager.addManager( new afxZodiacGroundPlaneRenderer() { bintype = "GroundPlaneZodiac"; renderOrder = 1.43; processAddOrder = 1.43; } );
-      DiffuseRenderPassManager.addManager( new afxZodiacMeshRoadRenderer() { bintype = "MeshRoadZodiac"; renderOrder = 1.44; processAddOrder = 1.44; } );
-      DiffuseRenderPassManager.addManager( new afxRenderHighlightMgr() { renderOrder = 1.55; processAddOrder = 1.55; } );  // for selection-highlighting
-   }
 }
 
 /// This is the Default PostFX state block. Put here to prevent any missing object  
diff --git a/Templates/BaseGame/game/core/shaders/VolumetricFog/VFogP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/VolumetricFog/VFogP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/VolumetricFog/VFogP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/VolumetricFog/VFogP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/VolumetricFog/VFogPreP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/VolumetricFog/VFogPreP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/VolumetricFog/VFogPreP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/VolumetricFog/VFogPreP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/VolumetricFog/VFogPreV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/VolumetricFog/VFogPreV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/VolumetricFog/VFogPreV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/VolumetricFog/VFogPreV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/VolumetricFog/VFogRefl.hlsl b/Templates/BaseGame/game/core/rendering/shaders/VolumetricFog/VFogRefl.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/VolumetricFog/VFogRefl.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/VolumetricFog/VFogRefl.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/VolumetricFog/VFogV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/VolumetricFog/VFogV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/VolumetricFog/VFogV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/VolumetricFog/VFogV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/VolumetricFog/gl/VFogP.glsl b/Templates/BaseGame/game/core/rendering/shaders/VolumetricFog/gl/VFogP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/VolumetricFog/gl/VFogP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/VolumetricFog/gl/VFogP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/VolumetricFog/gl/VFogPreP.glsl b/Templates/BaseGame/game/core/rendering/shaders/VolumetricFog/gl/VFogPreP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/VolumetricFog/gl/VFogPreP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/VolumetricFog/gl/VFogPreP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/VolumetricFog/gl/VFogPreV.glsl b/Templates/BaseGame/game/core/rendering/shaders/VolumetricFog/gl/VFogPreV.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/VolumetricFog/gl/VFogPreV.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/VolumetricFog/gl/VFogPreV.glsl
diff --git a/Templates/BaseGame/game/core/shaders/VolumetricFog/gl/VFogRefl.glsl b/Templates/BaseGame/game/core/rendering/shaders/VolumetricFog/gl/VFogRefl.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/VolumetricFog/gl/VFogRefl.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/VolumetricFog/gl/VFogRefl.glsl
diff --git a/Templates/BaseGame/game/core/shaders/VolumetricFog/gl/VFogV.glsl b/Templates/BaseGame/game/core/rendering/shaders/VolumetricFog/gl/VFogV.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/VolumetricFog/gl/VFogV.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/VolumetricFog/gl/VFogV.glsl
diff --git a/Templates/BaseGame/game/core/shaders/basicCloudsP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/basicCloudsP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/basicCloudsP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/basicCloudsP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/basicCloudsV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/basicCloudsV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/basicCloudsV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/basicCloudsV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/cloudLayerP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/cloudLayerP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/cloudLayerP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/cloudLayerP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/cloudLayerV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/cloudLayerV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/cloudLayerV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/cloudLayerV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/fixedFunction/addColorTextureP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/fixedFunction/addColorTextureP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/fixedFunction/addColorTextureP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/fixedFunction/addColorTextureP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/fixedFunction/addColorTextureV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/fixedFunction/addColorTextureV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/fixedFunction/addColorTextureV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/fixedFunction/addColorTextureV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/fixedFunction/colorP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/fixedFunction/colorP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/fixedFunction/colorP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/fixedFunction/colorP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/fixedFunction/colorV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/fixedFunction/colorV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/fixedFunction/colorV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/fixedFunction/colorV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/fixedFunction/gl/addColorTextureP.glsl b/Templates/BaseGame/game/core/rendering/shaders/fixedFunction/gl/addColorTextureP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/fixedFunction/gl/addColorTextureP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/fixedFunction/gl/addColorTextureP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/fixedFunction/gl/addColorTextureV.glsl b/Templates/BaseGame/game/core/rendering/shaders/fixedFunction/gl/addColorTextureV.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/fixedFunction/gl/addColorTextureV.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/fixedFunction/gl/addColorTextureV.glsl
diff --git a/Templates/BaseGame/game/core/shaders/fixedFunction/gl/colorP.glsl b/Templates/BaseGame/game/core/rendering/shaders/fixedFunction/gl/colorP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/fixedFunction/gl/colorP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/fixedFunction/gl/colorP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/fixedFunction/gl/colorV.glsl b/Templates/BaseGame/game/core/rendering/shaders/fixedFunction/gl/colorV.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/fixedFunction/gl/colorV.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/fixedFunction/gl/colorV.glsl
diff --git a/Templates/BaseGame/game/core/shaders/fixedFunction/gl/modColorTextureP.glsl b/Templates/BaseGame/game/core/rendering/shaders/fixedFunction/gl/modColorTextureP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/fixedFunction/gl/modColorTextureP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/fixedFunction/gl/modColorTextureP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/fixedFunction/gl/modColorTextureV.glsl b/Templates/BaseGame/game/core/rendering/shaders/fixedFunction/gl/modColorTextureV.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/fixedFunction/gl/modColorTextureV.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/fixedFunction/gl/modColorTextureV.glsl
diff --git a/Templates/BaseGame/game/core/shaders/fixedFunction/gl/targetRestoreP.glsl b/Templates/BaseGame/game/core/rendering/shaders/fixedFunction/gl/targetRestoreP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/fixedFunction/gl/targetRestoreP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/fixedFunction/gl/targetRestoreP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/fixedFunction/gl/targetRestoreV.glsl b/Templates/BaseGame/game/core/rendering/shaders/fixedFunction/gl/targetRestoreV.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/fixedFunction/gl/targetRestoreV.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/fixedFunction/gl/targetRestoreV.glsl
diff --git a/Templates/BaseGame/game/core/shaders/fixedFunction/gl/textureP.glsl b/Templates/BaseGame/game/core/rendering/shaders/fixedFunction/gl/textureP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/fixedFunction/gl/textureP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/fixedFunction/gl/textureP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/fixedFunction/gl/textureV.glsl b/Templates/BaseGame/game/core/rendering/shaders/fixedFunction/gl/textureV.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/fixedFunction/gl/textureV.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/fixedFunction/gl/textureV.glsl
diff --git a/Templates/BaseGame/game/core/shaders/fixedFunction/modColorTextureP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/fixedFunction/modColorTextureP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/fixedFunction/modColorTextureP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/fixedFunction/modColorTextureP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/fixedFunction/modColorTextureV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/fixedFunction/modColorTextureV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/fixedFunction/modColorTextureV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/fixedFunction/modColorTextureV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/fixedFunction/targetRestoreP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/fixedFunction/targetRestoreP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/fixedFunction/targetRestoreP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/fixedFunction/targetRestoreP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/fixedFunction/targetRestoreV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/fixedFunction/targetRestoreV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/fixedFunction/targetRestoreV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/fixedFunction/targetRestoreV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/fixedFunction/textureP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/fixedFunction/textureP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/fixedFunction/textureP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/fixedFunction/textureP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/fixedFunction/textureV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/fixedFunction/textureV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/fixedFunction/textureV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/fixedFunction/textureV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/foliage.hlsl b/Templates/BaseGame/game/core/rendering/shaders/foliage.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/foliage.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/foliage.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/fxFoliageReplicatorP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/fxFoliageReplicatorP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/fxFoliageReplicatorP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/fxFoliageReplicatorP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/fxFoliageReplicatorV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/fxFoliageReplicatorV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/fxFoliageReplicatorV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/fxFoliageReplicatorV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/gl/basicCloudsP.glsl b/Templates/BaseGame/game/core/rendering/shaders/gl/basicCloudsP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/gl/basicCloudsP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/gl/basicCloudsP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/gl/basicCloudsV.glsl b/Templates/BaseGame/game/core/rendering/shaders/gl/basicCloudsV.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/gl/basicCloudsV.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/gl/basicCloudsV.glsl
diff --git a/Templates/BaseGame/game/core/shaders/gl/blurP.glsl b/Templates/BaseGame/game/core/rendering/shaders/gl/blurP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/gl/blurP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/gl/blurP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/gl/blurV.glsl b/Templates/BaseGame/game/core/rendering/shaders/gl/blurV.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/gl/blurV.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/gl/blurV.glsl
diff --git a/Templates/BaseGame/game/core/shaders/gl/cloudLayerP.glsl b/Templates/BaseGame/game/core/rendering/shaders/gl/cloudLayerP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/gl/cloudLayerP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/gl/cloudLayerP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/gl/cloudLayerV.glsl b/Templates/BaseGame/game/core/rendering/shaders/gl/cloudLayerV.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/gl/cloudLayerV.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/gl/cloudLayerV.glsl
diff --git a/Templates/BaseGame/game/core/shaders/gl/foliage.glsl b/Templates/BaseGame/game/core/rendering/shaders/gl/foliage.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/gl/foliage.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/gl/foliage.glsl
diff --git a/Templates/BaseGame/game/core/shaders/gl/fxFoliageReplicatorP.glsl b/Templates/BaseGame/game/core/rendering/shaders/gl/fxFoliageReplicatorP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/gl/fxFoliageReplicatorP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/gl/fxFoliageReplicatorP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/gl/fxFoliageReplicatorV.glsl b/Templates/BaseGame/game/core/rendering/shaders/gl/fxFoliageReplicatorV.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/gl/fxFoliageReplicatorV.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/gl/fxFoliageReplicatorV.glsl
diff --git a/Templates/BaseGame/game/core/shaders/gl/guiMaterialV.glsl b/Templates/BaseGame/game/core/rendering/shaders/gl/guiMaterialV.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/gl/guiMaterialV.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/gl/guiMaterialV.glsl
diff --git a/Templates/BaseGame/game/core/shaders/gl/hlslCompat.glsl b/Templates/BaseGame/game/core/rendering/shaders/gl/hlslCompat.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/gl/hlslCompat.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/gl/hlslCompat.glsl
diff --git a/Templates/BaseGame/game/core/shaders/gl/imposter.glsl b/Templates/BaseGame/game/core/rendering/shaders/gl/imposter.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/gl/imposter.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/gl/imposter.glsl
diff --git a/Templates/BaseGame/game/core/shaders/gl/lighting.glsl b/Templates/BaseGame/game/core/rendering/shaders/gl/lighting.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/gl/lighting.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/gl/lighting.glsl
diff --git a/Templates/BaseGame/game/core/shaders/gl/particleCompositeP.glsl b/Templates/BaseGame/game/core/rendering/shaders/gl/particleCompositeP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/gl/particleCompositeP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/gl/particleCompositeP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/gl/particleCompositeV.glsl b/Templates/BaseGame/game/core/rendering/shaders/gl/particleCompositeV.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/gl/particleCompositeV.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/gl/particleCompositeV.glsl
diff --git a/Templates/BaseGame/game/core/shaders/gl/particlesP.glsl b/Templates/BaseGame/game/core/rendering/shaders/gl/particlesP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/gl/particlesP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/gl/particlesP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/gl/particlesV.glsl b/Templates/BaseGame/game/core/rendering/shaders/gl/particlesV.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/gl/particlesV.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/gl/particlesV.glsl
diff --git a/Templates/BaseGame/game/core/shaders/gl/planarReflectBumpP.glsl b/Templates/BaseGame/game/core/rendering/shaders/gl/planarReflectBumpP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/gl/planarReflectBumpP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/gl/planarReflectBumpP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/gl/planarReflectBumpV.glsl b/Templates/BaseGame/game/core/rendering/shaders/gl/planarReflectBumpV.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/gl/planarReflectBumpV.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/gl/planarReflectBumpV.glsl
diff --git a/Templates/BaseGame/game/core/shaders/gl/planarReflectP.glsl b/Templates/BaseGame/game/core/rendering/shaders/gl/planarReflectP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/gl/planarReflectP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/gl/planarReflectP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/gl/planarReflectV.glsl b/Templates/BaseGame/game/core/rendering/shaders/gl/planarReflectV.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/gl/planarReflectV.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/gl/planarReflectV.glsl
diff --git a/Templates/BaseGame/game/core/shaders/gl/precipP.glsl b/Templates/BaseGame/game/core/rendering/shaders/gl/precipP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/gl/precipP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/gl/precipP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/gl/precipV.glsl b/Templates/BaseGame/game/core/rendering/shaders/gl/precipV.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/gl/precipV.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/gl/precipV.glsl
diff --git a/Templates/BaseGame/game/core/shaders/gl/projectedShadowP.glsl b/Templates/BaseGame/game/core/rendering/shaders/gl/projectedShadowP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/gl/projectedShadowP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/gl/projectedShadowP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/gl/projectedShadowV.glsl b/Templates/BaseGame/game/core/rendering/shaders/gl/projectedShadowV.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/gl/projectedShadowV.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/gl/projectedShadowV.glsl
diff --git a/Templates/BaseGame/game/core/shaders/gl/scatterSkyP.glsl b/Templates/BaseGame/game/core/rendering/shaders/gl/scatterSkyP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/gl/scatterSkyP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/gl/scatterSkyP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/gl/scatterSkyV.glsl b/Templates/BaseGame/game/core/rendering/shaders/gl/scatterSkyV.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/gl/scatterSkyV.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/gl/scatterSkyV.glsl
diff --git a/Templates/BaseGame/game/core/shaders/gl/torque.glsl b/Templates/BaseGame/game/core/rendering/shaders/gl/torque.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/gl/torque.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/gl/torque.glsl
diff --git a/Templates/BaseGame/game/core/shaders/gl/wavesP.glsl b/Templates/BaseGame/game/core/rendering/shaders/gl/wavesP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/gl/wavesP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/gl/wavesP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/gl/wind.glsl b/Templates/BaseGame/game/core/rendering/shaders/gl/wind.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/gl/wind.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/gl/wind.glsl
diff --git a/Templates/BaseGame/game/core/shaders/guiMaterialV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/guiMaterialV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/guiMaterialV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/guiMaterialV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/hlslStructs.h b/Templates/BaseGame/game/core/rendering/shaders/hlslStructs.h
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/hlslStructs.h
rename to Templates/BaseGame/game/core/rendering/shaders/hlslStructs.h
diff --git a/Templates/BaseGame/game/core/shaders/hlslStructs.hlsl b/Templates/BaseGame/game/core/rendering/shaders/hlslStructs.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/hlslStructs.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/hlslStructs.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/imposter.hlsl b/Templates/BaseGame/game/core/rendering/shaders/imposter.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/imposter.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/imposter.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/lighting.hlsl b/Templates/BaseGame/game/core/rendering/shaders/lighting.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/lighting.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/lighting/advanced/convexGeometryV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/convexGeometryV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/advanced/convexGeometryV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/convexGeometryV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/lighting/advanced/deferredClearGBufferP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/deferredClearGBufferP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/advanced/deferredClearGBufferP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/deferredClearGBufferP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/lighting/advanced/deferredClearGBufferV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/deferredClearGBufferV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/advanced/deferredClearGBufferV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/deferredClearGBufferV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/lighting/advanced/deferredColorShaderP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/deferredColorShaderP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/advanced/deferredColorShaderP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/deferredColorShaderP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/lighting/advanced/deferredShadingP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/deferredShadingP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/advanced/deferredShadingP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/deferredShadingP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/lighting/advanced/farFrustumQuad.hlsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/farFrustumQuad.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/advanced/farFrustumQuad.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/farFrustumQuad.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/lighting/advanced/farFrustumQuadV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/farFrustumQuadV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/advanced/farFrustumQuadV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/farFrustumQuadV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/lighting/advanced/gl/convexGeometryV.glsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/convexGeometryV.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/advanced/gl/convexGeometryV.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/convexGeometryV.glsl
diff --git a/Templates/BaseGame/game/core/shaders/lighting/advanced/gl/deferredClearGBufferP.glsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/deferredClearGBufferP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/advanced/gl/deferredClearGBufferP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/deferredClearGBufferP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/lighting/advanced/gl/deferredColorShaderP.glsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/deferredColorShaderP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/advanced/gl/deferredColorShaderP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/deferredColorShaderP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/lighting/advanced/gl/deferredShadingP.glsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/deferredShadingP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/advanced/gl/deferredShadingP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/deferredShadingP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/lighting/advanced/gl/farFrustumQuad.glsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/farFrustumQuad.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/advanced/gl/farFrustumQuad.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/farFrustumQuad.glsl
diff --git a/Templates/BaseGame/game/core/shaders/lighting/advanced/gl/farFrustumQuadV.glsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/farFrustumQuadV.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/advanced/gl/farFrustumQuadV.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/farFrustumQuadV.glsl
diff --git a/Templates/BaseGame/game/core/shaders/lighting/advanced/gl/lightingUtils.glsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/lightingUtils.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/advanced/gl/lightingUtils.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/lightingUtils.glsl
diff --git a/Templates/BaseGame/game/core/shaders/lighting/advanced/gl/pointLightP.glsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/pointLightP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/advanced/gl/pointLightP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/pointLightP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/lighting/advanced/gl/softShadow.glsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/softShadow.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/advanced/gl/softShadow.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/softShadow.glsl
diff --git a/Templates/BaseGame/game/core/shaders/lighting/advanced/gl/spotLightP.glsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/spotLightP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/advanced/gl/spotLightP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/spotLightP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/lighting/advanced/gl/vectorLightP.glsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/vectorLightP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/advanced/gl/vectorLightP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/vectorLightP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/lighting/advanced/lightingUtils.hlsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/lightingUtils.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/advanced/lightingUtils.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/lightingUtils.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/lighting/advanced/particlePointLightP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/particlePointLightP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/advanced/particlePointLightP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/particlePointLightP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/lighting/advanced/particlePointLightV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/particlePointLightV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/advanced/particlePointLightV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/particlePointLightV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/lighting/advanced/pointLightP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/pointLightP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/advanced/pointLightP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/pointLightP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/lighting/advanced/softShadow.hlsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/softShadow.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/advanced/softShadow.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/softShadow.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/lighting/advanced/spotLightP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/spotLightP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/advanced/spotLightP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/spotLightP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/lighting/advanced/vectorLightP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/vectorLightP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/advanced/vectorLightP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/vectorLightP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/lighting/basic/gl/shadowFilterP.glsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/basic/gl/shadowFilterP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/basic/gl/shadowFilterP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/basic/gl/shadowFilterP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/lighting/basic/gl/shadowFilterV.glsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/basic/gl/shadowFilterV.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/basic/gl/shadowFilterV.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/basic/gl/shadowFilterV.glsl
diff --git a/Templates/BaseGame/game/core/shaders/lighting/basic/shadowFilterP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/basic/shadowFilterP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/basic/shadowFilterP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/basic/shadowFilterP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/lighting/basic/shadowFilterV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/basic/shadowFilterV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/basic/shadowFilterV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/basic/shadowFilterV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/lighting/shadowMap/boxFilterP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/shadowMap/boxFilterP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/shadowMap/boxFilterP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/shadowMap/boxFilterP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/lighting/shadowMap/boxFilterV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/shadowMap/boxFilterV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/shadowMap/boxFilterV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/shadowMap/boxFilterV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/lighting/shadowMap/gl/boxFilterP.glsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/shadowMap/gl/boxFilterP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/shadowMap/gl/boxFilterP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/shadowMap/gl/boxFilterP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/lighting/shadowMap/gl/boxFilterV.glsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/shadowMap/gl/boxFilterV.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/shadowMap/gl/boxFilterV.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/shadowMap/gl/boxFilterV.glsl
diff --git a/Templates/BaseGame/game/core/shaders/lighting/shadowMap/shadowMapIO.h b/Templates/BaseGame/game/core/rendering/shaders/lighting/shadowMap/shadowMapIO.h
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/shadowMap/shadowMapIO.h
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/shadowMap/shadowMapIO.h
diff --git a/Templates/BaseGame/game/core/shaders/lighting/shadowMap/shadowMapIO_GLSL.h b/Templates/BaseGame/game/core/rendering/shaders/lighting/shadowMap/shadowMapIO_GLSL.h
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/shadowMap/shadowMapIO_GLSL.h
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/shadowMap/shadowMapIO_GLSL.h
diff --git a/Templates/BaseGame/game/core/shaders/lighting/shadowMap/shadowMapIO_HLSL.h b/Templates/BaseGame/game/core/rendering/shaders/lighting/shadowMap/shadowMapIO_HLSL.h
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/lighting/shadowMap/shadowMapIO_HLSL.h
rename to Templates/BaseGame/game/core/rendering/shaders/lighting/shadowMap/shadowMapIO_HLSL.h
diff --git a/Templates/BaseGame/game/core/shaders/particleCompositeP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/particleCompositeP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/particleCompositeP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/particleCompositeP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/particleCompositeV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/particleCompositeV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/particleCompositeV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/particleCompositeV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/particlesP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/particlesP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/particlesP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/particlesP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/particlesV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/particlesV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/particlesV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/particlesV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/planarReflectBumpP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/planarReflectBumpP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/planarReflectBumpP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/planarReflectBumpP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/planarReflectBumpV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/planarReflectBumpV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/planarReflectBumpV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/planarReflectBumpV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/planarReflectP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/planarReflectP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/planarReflectP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/planarReflectP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/planarReflectV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/planarReflectV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/planarReflectV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/planarReflectV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/VolFogGlowP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/VolFogGlowP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/VolFogGlowP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/VolFogGlowP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/caustics/causticsP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/caustics/causticsP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/caustics/causticsP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/caustics/causticsP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/caustics/gl/causticsP.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/caustics/gl/causticsP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/caustics/gl/causticsP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/caustics/gl/causticsP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/chromaticLens.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/chromaticLens.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/chromaticLens.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/chromaticLens.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/dof/DOF_CalcCoC_P.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/dof/DOF_CalcCoC_P.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/dof/DOF_CalcCoC_P.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/dof/DOF_CalcCoC_P.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/dof/DOF_CalcCoC_V.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/dof/DOF_CalcCoC_V.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/dof/DOF_CalcCoC_V.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/dof/DOF_CalcCoC_V.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/dof/DOF_DownSample_P.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/dof/DOF_DownSample_P.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/dof/DOF_DownSample_P.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/dof/DOF_DownSample_P.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/dof/DOF_DownSample_V.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/dof/DOF_DownSample_V.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/dof/DOF_DownSample_V.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/dof/DOF_DownSample_V.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/dof/DOF_Final_P.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/dof/DOF_Final_P.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/dof/DOF_Final_P.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/dof/DOF_Final_P.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/dof/DOF_Final_V.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/dof/DOF_Final_V.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/dof/DOF_Final_V.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/dof/DOF_Final_V.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/dof/DOF_Gausian_P.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/dof/DOF_Gausian_P.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/dof/DOF_Gausian_P.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/dof/DOF_Gausian_P.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/dof/DOF_Gausian_V.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/dof/DOF_Gausian_V.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/dof/DOF_Gausian_V.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/dof/DOF_Gausian_V.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/dof/DOF_Passthrough_V.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/dof/DOF_Passthrough_V.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/dof/DOF_Passthrough_V.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/dof/DOF_Passthrough_V.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/dof/DOF_SmallBlur_P.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/dof/DOF_SmallBlur_P.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/dof/DOF_SmallBlur_P.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/dof/DOF_SmallBlur_P.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/dof/DOF_SmallBlur_V.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/dof/DOF_SmallBlur_V.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/dof/DOF_SmallBlur_V.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/dof/DOF_SmallBlur_V.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_CalcCoC_P.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/dof/gl/DOF_CalcCoC_P.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_CalcCoC_P.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/dof/gl/DOF_CalcCoC_P.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_CalcCoC_V.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/dof/gl/DOF_CalcCoC_V.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_CalcCoC_V.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/dof/gl/DOF_CalcCoC_V.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_DownSample_P.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/dof/gl/DOF_DownSample_P.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_DownSample_P.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/dof/gl/DOF_DownSample_P.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_DownSample_V.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/dof/gl/DOF_DownSample_V.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_DownSample_V.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/dof/gl/DOF_DownSample_V.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_Final_P.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/dof/gl/DOF_Final_P.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_Final_P.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/dof/gl/DOF_Final_P.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_Final_V.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/dof/gl/DOF_Final_V.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_Final_V.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/dof/gl/DOF_Final_V.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_Gausian_P.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/dof/gl/DOF_Gausian_P.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_Gausian_P.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/dof/gl/DOF_Gausian_P.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_Gausian_V.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/dof/gl/DOF_Gausian_V.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_Gausian_V.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/dof/gl/DOF_Gausian_V.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_Passthrough_V.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/dof/gl/DOF_Passthrough_V.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_Passthrough_V.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/dof/gl/DOF_Passthrough_V.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_SmallBlur_P.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/dof/gl/DOF_SmallBlur_P.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_SmallBlur_P.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/dof/gl/DOF_SmallBlur_P.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_SmallBlur_V.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/dof/gl/DOF_SmallBlur_V.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_SmallBlur_V.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/dof/gl/DOF_SmallBlur_V.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/edgeaa/dbgEdgeDisplayP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/edgeaa/dbgEdgeDisplayP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/edgeaa/dbgEdgeDisplayP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/edgeaa/dbgEdgeDisplayP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/edgeaa/edgeAAP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/edgeaa/edgeAAP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/edgeaa/edgeAAP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/edgeaa/edgeAAP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/edgeaa/edgeAAV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/edgeaa/edgeAAV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/edgeaa/edgeAAV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/edgeaa/edgeAAV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/edgeaa/edgeDetectP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/edgeaa/edgeDetectP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/edgeaa/edgeDetectP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/edgeaa/edgeDetectP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/edgeaa/gl/dbgEdgeDisplayP.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/edgeaa/gl/dbgEdgeDisplayP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/edgeaa/gl/dbgEdgeDisplayP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/edgeaa/gl/dbgEdgeDisplayP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/edgeaa/gl/edgeAAP.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/edgeaa/gl/edgeAAP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/edgeaa/gl/edgeAAP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/edgeaa/gl/edgeAAP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/edgeaa/gl/edgeAAV.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/edgeaa/gl/edgeAAV.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/edgeaa/gl/edgeAAV.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/edgeaa/gl/edgeAAV.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/edgeaa/gl/edgeDetectP.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/edgeaa/gl/edgeDetectP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/edgeaa/gl/edgeDetectP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/edgeaa/gl/edgeDetectP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/flashP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/flashP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/flashP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/flashP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/fogP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/fogP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/fogP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/fogP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/fxaa/Fxaa3_11.h b/Templates/BaseGame/game/core/rendering/shaders/postFX/fxaa/Fxaa3_11.h
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/fxaa/Fxaa3_11.h
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/fxaa/Fxaa3_11.h
diff --git a/Templates/BaseGame/game/core/shaders/postFX/fxaa/fxaaP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/fxaa/fxaaP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/fxaa/fxaaP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/fxaa/fxaaP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/fxaa/fxaaV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/fxaa/fxaaV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/fxaa/fxaaV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/fxaa/fxaaV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/fxaa/gl/fxaaP.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/fxaa/gl/fxaaP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/fxaa/gl/fxaaP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/fxaa/gl/fxaaP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/fxaa/gl/fxaaV.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/fxaa/gl/fxaaV.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/fxaa/gl/fxaaV.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/fxaa/gl/fxaaV.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/gammaP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/gammaP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/gammaP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/gammaP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/gl/VolFogGlowP.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/gl/VolFogGlowP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/gl/VolFogGlowP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/gl/VolFogGlowP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/gl/chromaticLens.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/gl/chromaticLens.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/gl/chromaticLens.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/gl/chromaticLens.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/gl/flashP.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/gl/flashP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/gl/flashP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/gl/flashP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/gl/fogP.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/gl/fogP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/gl/fogP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/gl/fogP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/gl/gammaP.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/gl/gammaP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/gl/gammaP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/gl/gammaP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/gl/glowBlurP.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/gl/glowBlurP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/gl/glowBlurP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/gl/glowBlurP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/gl/glowBlurV.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/gl/glowBlurV.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/gl/glowBlurV.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/gl/glowBlurV.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/gl/motionBlurP.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/gl/motionBlurP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/gl/motionBlurP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/gl/motionBlurP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/gl/passthruP.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/gl/passthruP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/gl/passthruP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/gl/passthruP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/gl/postFX.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/gl/postFX.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/gl/postFX.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/gl/postFX.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/gl/postFxV.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/gl/postFxV.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/gl/postFxV.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/gl/postFxV.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/gl/turbulenceP.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/gl/turbulenceP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/gl/turbulenceP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/gl/turbulenceP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/gl/underwaterFogP.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/gl/underwaterFogP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/gl/underwaterFogP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/gl/underwaterFogP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/glowBlurP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/glowBlurP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/glowBlurP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/glowBlurP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/glowBlurV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/glowBlurV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/glowBlurV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/glowBlurV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/hdr/bloomGaussBlurHP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/bloomGaussBlurHP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/hdr/bloomGaussBlurHP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/bloomGaussBlurHP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/hdr/bloomGaussBlurVP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/bloomGaussBlurVP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/hdr/bloomGaussBlurVP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/bloomGaussBlurVP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/hdr/brightPassFilterP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/brightPassFilterP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/hdr/brightPassFilterP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/brightPassFilterP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/hdr/calculateAdaptedLumP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/calculateAdaptedLumP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/hdr/calculateAdaptedLumP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/calculateAdaptedLumP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/hdr/downScale4x4P.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/downScale4x4P.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/hdr/downScale4x4P.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/downScale4x4P.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/hdr/downScale4x4V.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/downScale4x4V.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/hdr/downScale4x4V.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/downScale4x4V.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/hdr/finalPassCombineP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/finalPassCombineP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/hdr/finalPassCombineP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/finalPassCombineP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/hdr/gl/bloomGaussBlurHP.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/gl/bloomGaussBlurHP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/hdr/gl/bloomGaussBlurHP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/gl/bloomGaussBlurHP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/hdr/gl/bloomGaussBlurVP.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/gl/bloomGaussBlurVP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/hdr/gl/bloomGaussBlurVP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/gl/bloomGaussBlurVP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/hdr/gl/brightPassFilterP.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/gl/brightPassFilterP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/hdr/gl/brightPassFilterP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/gl/brightPassFilterP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/hdr/gl/calculateAdaptedLumP.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/gl/calculateAdaptedLumP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/hdr/gl/calculateAdaptedLumP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/gl/calculateAdaptedLumP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/hdr/gl/downScale4x4P.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/gl/downScale4x4P.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/hdr/gl/downScale4x4P.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/gl/downScale4x4P.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/hdr/gl/downScale4x4V.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/gl/downScale4x4V.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/hdr/gl/downScale4x4V.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/gl/downScale4x4V.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/hdr/gl/finalPassCombineP.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/gl/finalPassCombineP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/hdr/gl/finalPassCombineP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/gl/finalPassCombineP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/hdr/gl/luminanceVisP.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/gl/luminanceVisP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/hdr/gl/luminanceVisP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/gl/luminanceVisP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/hdr/gl/sampleLumInitialP.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/gl/sampleLumInitialP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/hdr/gl/sampleLumInitialP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/gl/sampleLumInitialP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/hdr/gl/sampleLumIterativeP.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/gl/sampleLumIterativeP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/hdr/gl/sampleLumIterativeP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/gl/sampleLumIterativeP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/hdr/luminanceVisP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/luminanceVisP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/hdr/luminanceVisP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/luminanceVisP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/hdr/sampleLumInitialP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/sampleLumInitialP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/hdr/sampleLumInitialP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/sampleLumInitialP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/hdr/sampleLumIterativeP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/sampleLumIterativeP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/hdr/sampleLumIterativeP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/hdr/sampleLumIterativeP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/lightRay/gl/lightRayOccludeP.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/lightRay/gl/lightRayOccludeP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/lightRay/gl/lightRayOccludeP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/lightRay/gl/lightRayOccludeP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/lightRay/gl/lightRayP.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/lightRay/gl/lightRayP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/lightRay/gl/lightRayP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/lightRay/gl/lightRayP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/lightRay/lightRayOccludeP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/lightRay/lightRayOccludeP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/lightRay/lightRayOccludeP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/lightRay/lightRayOccludeP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/lightRay/lightRayP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/lightRay/lightRayP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/lightRay/lightRayP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/lightRay/lightRayP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/mlaa/blendWeightCalculationP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/mlaa/blendWeightCalculationP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/mlaa/blendWeightCalculationP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/mlaa/blendWeightCalculationP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/mlaa/edgeDetectionP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/mlaa/edgeDetectionP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/mlaa/edgeDetectionP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/mlaa/edgeDetectionP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/mlaa/functions.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/mlaa/functions.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/mlaa/functions.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/mlaa/functions.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/mlaa/gl/blendWeightCalculationP.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/mlaa/gl/blendWeightCalculationP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/mlaa/gl/blendWeightCalculationP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/mlaa/gl/blendWeightCalculationP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/mlaa/gl/edgeDetectionP.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/mlaa/gl/edgeDetectionP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/mlaa/gl/edgeDetectionP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/mlaa/gl/edgeDetectionP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/mlaa/gl/functions.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/mlaa/gl/functions.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/mlaa/gl/functions.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/mlaa/gl/functions.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/mlaa/gl/neighborhoodBlendingP.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/mlaa/gl/neighborhoodBlendingP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/mlaa/gl/neighborhoodBlendingP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/mlaa/gl/neighborhoodBlendingP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/mlaa/gl/offsetV.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/mlaa/gl/offsetV.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/mlaa/gl/offsetV.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/mlaa/gl/offsetV.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/mlaa/gl/passthruV.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/mlaa/gl/passthruV.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/mlaa/gl/passthruV.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/mlaa/gl/passthruV.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/mlaa/neighborhoodBlendingP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/mlaa/neighborhoodBlendingP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/mlaa/neighborhoodBlendingP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/mlaa/neighborhoodBlendingP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/mlaa/offsetV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/mlaa/offsetV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/mlaa/offsetV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/mlaa/offsetV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/mlaa/passthruV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/mlaa/passthruV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/mlaa/passthruV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/mlaa/passthruV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/motionBlurP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/motionBlurP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/motionBlurP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/motionBlurP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/oculusvr/barrelDistortionChromaP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/oculusvr/barrelDistortionChromaP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/oculusvr/barrelDistortionChromaP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/oculusvr/barrelDistortionChromaP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/oculusvr/barrelDistortionP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/oculusvr/barrelDistortionP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/oculusvr/barrelDistortionP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/oculusvr/barrelDistortionP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/oculusvr/gl/barrelDistortionChromaP.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/oculusvr/gl/barrelDistortionChromaP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/oculusvr/gl/barrelDistortionChromaP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/oculusvr/gl/barrelDistortionChromaP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/oculusvr/gl/barrelDistortionP.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/oculusvr/gl/barrelDistortionP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/oculusvr/gl/barrelDistortionP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/oculusvr/gl/barrelDistortionP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/oculusvr/gl/monoToStereoP.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/oculusvr/gl/monoToStereoP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/oculusvr/gl/monoToStereoP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/oculusvr/gl/monoToStereoP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/oculusvr/monoToStereoP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/oculusvr/monoToStereoP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/oculusvr/monoToStereoP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/oculusvr/monoToStereoP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/passthruP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/passthruP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/passthruP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/passthruP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/postFx.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/postFx.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/postFx.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/postFx.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/postFxV.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/postFxV.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/postFxV.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/postFxV.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/postFxV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/postFxV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/postFxV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/postFxV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/ssao/SSAO_Blur_P.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/ssao/SSAO_Blur_P.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/ssao/SSAO_Blur_P.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/ssao/SSAO_Blur_P.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/ssao/SSAO_Blur_V.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/ssao/SSAO_Blur_V.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/ssao/SSAO_Blur_V.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/ssao/SSAO_Blur_V.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/ssao/SSAO_P.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/ssao/SSAO_P.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/ssao/SSAO_P.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/ssao/SSAO_P.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/ssao/SSAO_PowerTable_P.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/ssao/SSAO_PowerTable_P.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/ssao/SSAO_PowerTable_P.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/ssao/SSAO_PowerTable_P.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/ssao/SSAO_PowerTable_V.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/ssao/SSAO_PowerTable_V.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/ssao/SSAO_PowerTable_V.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/ssao/SSAO_PowerTable_V.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/ssao/gl/SSAO_Blur_P.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/ssao/gl/SSAO_Blur_P.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/ssao/gl/SSAO_Blur_P.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/ssao/gl/SSAO_Blur_P.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/ssao/gl/SSAO_Blur_V.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/ssao/gl/SSAO_Blur_V.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/ssao/gl/SSAO_Blur_V.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/ssao/gl/SSAO_Blur_V.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/ssao/gl/SSAO_P.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/ssao/gl/SSAO_P.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/ssao/gl/SSAO_P.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/ssao/gl/SSAO_P.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/ssao/gl/SSAO_PowerTable_P.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/ssao/gl/SSAO_PowerTable_P.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/ssao/gl/SSAO_PowerTable_P.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/ssao/gl/SSAO_PowerTable_P.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/ssao/gl/SSAO_PowerTable_V.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/ssao/gl/SSAO_PowerTable_V.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/ssao/gl/SSAO_PowerTable_V.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/ssao/gl/SSAO_PowerTable_V.glsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/turbulenceP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/turbulenceP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/turbulenceP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/turbulenceP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/underwaterFogP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/underwaterFogP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/underwaterFogP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/underwaterFogP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/vignette/VignetteP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/vignette/VignetteP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/vignette/VignetteP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/vignette/VignetteP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/postFX/vignette/gl/VignetteP.glsl b/Templates/BaseGame/game/core/rendering/shaders/postFX/vignette/gl/VignetteP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/postFX/vignette/gl/VignetteP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/postFX/vignette/gl/VignetteP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/precipP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/precipP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/precipP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/precipP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/precipV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/precipV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/precipV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/precipV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/projectedShadowP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/projectedShadowP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/projectedShadowP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/projectedShadowP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/projectedShadowV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/projectedShadowV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/projectedShadowV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/projectedShadowV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/ribbons/basicRibbonShaderP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/ribbons/basicRibbonShaderP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/ribbons/basicRibbonShaderP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/ribbons/basicRibbonShaderP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/ribbons/basicRibbonShaderV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/ribbons/basicRibbonShaderV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/ribbons/basicRibbonShaderV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/ribbons/basicRibbonShaderV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/ribbons/gl/basicRibbonShaderP.glsl b/Templates/BaseGame/game/core/rendering/shaders/ribbons/gl/basicRibbonShaderP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/ribbons/gl/basicRibbonShaderP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/ribbons/gl/basicRibbonShaderP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/ribbons/gl/basicRibbonShaderV.glsl b/Templates/BaseGame/game/core/rendering/shaders/ribbons/gl/basicRibbonShaderV.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/ribbons/gl/basicRibbonShaderV.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/ribbons/gl/basicRibbonShaderV.glsl
diff --git a/Templates/BaseGame/game/core/shaders/ribbons/gl/texRibbonShaderP.glsl b/Templates/BaseGame/game/core/rendering/shaders/ribbons/gl/texRibbonShaderP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/ribbons/gl/texRibbonShaderP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/ribbons/gl/texRibbonShaderP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/ribbons/gl/texRibbonShaderV.glsl b/Templates/BaseGame/game/core/rendering/shaders/ribbons/gl/texRibbonShaderV.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/ribbons/gl/texRibbonShaderV.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/ribbons/gl/texRibbonShaderV.glsl
diff --git a/Templates/BaseGame/game/core/shaders/ribbons/texRibbonShaderP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/ribbons/texRibbonShaderP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/ribbons/texRibbonShaderP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/ribbons/texRibbonShaderP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/ribbons/texRibbonShaderV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/ribbons/texRibbonShaderV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/ribbons/texRibbonShaderV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/ribbons/texRibbonShaderV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/scatterSkyP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/scatterSkyP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/scatterSkyP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/scatterSkyP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/scatterSkyV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/scatterSkyV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/scatterSkyV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/scatterSkyV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/shaderModel.hlsl b/Templates/BaseGame/game/core/rendering/shaders/shaderModel.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/shaderModel.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/shaderModel.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/shaderModelAutoGen.hlsl b/Templates/BaseGame/game/core/rendering/shaders/shaderModelAutoGen.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/shaderModelAutoGen.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/shaderModelAutoGen.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/shdrConsts.h b/Templates/BaseGame/game/core/rendering/shaders/shdrConsts.h
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/shdrConsts.h
rename to Templates/BaseGame/game/core/rendering/shaders/shdrConsts.h
diff --git a/Templates/BaseGame/game/core/shaders/terrain/blendP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/terrain/blendP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/terrain/blendP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/terrain/blendP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/terrain/blendV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/terrain/blendV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/terrain/blendV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/terrain/blendV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/terrain/gl/blendP.glsl b/Templates/BaseGame/game/core/rendering/shaders/terrain/gl/blendP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/terrain/gl/blendP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/terrain/gl/blendP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/terrain/gl/blendV.glsl b/Templates/BaseGame/game/core/rendering/shaders/terrain/gl/blendV.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/terrain/gl/blendV.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/terrain/gl/blendV.glsl
diff --git a/Templates/BaseGame/game/core/shaders/terrain/terrain.glsl b/Templates/BaseGame/game/core/rendering/shaders/terrain/terrain.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/terrain/terrain.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/terrain/terrain.glsl
diff --git a/Templates/BaseGame/game/core/shaders/terrain/terrain.hlsl b/Templates/BaseGame/game/core/rendering/shaders/terrain/terrain.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/terrain/terrain.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/terrain/terrain.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/torque.hlsl b/Templates/BaseGame/game/core/rendering/shaders/torque.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/torque.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/torque.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/water/gl/waterBasicP.glsl b/Templates/BaseGame/game/core/rendering/shaders/water/gl/waterBasicP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/water/gl/waterBasicP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/water/gl/waterBasicP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/water/gl/waterBasicV.glsl b/Templates/BaseGame/game/core/rendering/shaders/water/gl/waterBasicV.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/water/gl/waterBasicV.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/water/gl/waterBasicV.glsl
diff --git a/Templates/BaseGame/game/core/shaders/water/gl/waterP.glsl b/Templates/BaseGame/game/core/rendering/shaders/water/gl/waterP.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/water/gl/waterP.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/water/gl/waterP.glsl
diff --git a/Templates/BaseGame/game/core/shaders/water/gl/waterV.glsl b/Templates/BaseGame/game/core/rendering/shaders/water/gl/waterV.glsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/water/gl/waterV.glsl
rename to Templates/BaseGame/game/core/rendering/shaders/water/gl/waterV.glsl
diff --git a/Templates/BaseGame/game/core/shaders/water/waterBasicP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/water/waterBasicP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/water/waterBasicP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/water/waterBasicP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/water/waterBasicV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/water/waterBasicV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/water/waterBasicV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/water/waterBasicV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/water/waterP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/water/waterP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/water/waterP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/water/waterP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/water/waterV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/water/waterV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/water/waterV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/water/waterV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/wavesP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/wavesP.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/wavesP.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/wavesP.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/wavesV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/wavesV.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/wavesV.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/wavesV.hlsl
diff --git a/Templates/BaseGame/game/core/shaders/wind.hlsl b/Templates/BaseGame/game/core/rendering/shaders/wind.hlsl
similarity index 100%
rename from Templates/BaseGame/game/core/shaders/wind.hlsl
rename to Templates/BaseGame/game/core/rendering/shaders/wind.hlsl
diff --git a/Templates/BaseGame/game/core/sfx/Core_SFX.cs b/Templates/BaseGame/game/core/sfx/Core_SFX.cs
new file mode 100644
index 000000000..acd5c6e08
--- /dev/null
+++ b/Templates/BaseGame/game/core/sfx/Core_SFX.cs
@@ -0,0 +1,15 @@
+
+function Core_SFX::onCreate(%this)
+{
+   exec("./scripts/audio.cs");
+   exec("./scripts/audioData.cs");
+   exec("./scripts/audioAmbience.cs");
+   exec("./scripts/audioDescriptions.cs");
+   exec("./scripts/audioEnvironments.cs");
+   exec("./scripts/audioStates.cs");
+
+}
+
+function Core_SFX::onDestroy(%this)
+{
+}
\ No newline at end of file
diff --git a/Templates/BaseGame/game/core/sfx/Core_SFX.module b/Templates/BaseGame/game/core/sfx/Core_SFX.module
new file mode 100644
index 000000000..855fe2a11
--- /dev/null
+++ b/Templates/BaseGame/game/core/sfx/Core_SFX.module
@@ -0,0 +1,9 @@
+<ModuleDefinition
+	ModuleId="Core_SFX"
+	VersionId="1"
+	Description="Module that implements the core engine-level setup for the game."
+	ScriptFile="Core_SFX.cs"
+	CreateFunction="onCreate"
+	DestroyFunction="onDestroy"
+	Group="Core">
+</ModuleDefinition>
\ No newline at end of file
diff --git a/Templates/BaseGame/game/core/audio.cs b/Templates/BaseGame/game/core/sfx/scripts/audio.cs
similarity index 100%
rename from Templates/BaseGame/game/core/audio.cs
rename to Templates/BaseGame/game/core/sfx/scripts/audio.cs
diff --git a/Templates/BaseGame/game/core/sfx/audioAmbience.cs b/Templates/BaseGame/game/core/sfx/scripts/audioAmbience.cs
similarity index 100%
rename from Templates/BaseGame/game/core/sfx/audioAmbience.cs
rename to Templates/BaseGame/game/core/sfx/scripts/audioAmbience.cs
diff --git a/Templates/BaseGame/game/core/sfx/audioData.cs b/Templates/BaseGame/game/core/sfx/scripts/audioData.cs
similarity index 100%
rename from Templates/BaseGame/game/core/sfx/audioData.cs
rename to Templates/BaseGame/game/core/sfx/scripts/audioData.cs
diff --git a/Templates/BaseGame/game/core/sfx/audioDescriptions.cs b/Templates/BaseGame/game/core/sfx/scripts/audioDescriptions.cs
similarity index 100%
rename from Templates/BaseGame/game/core/sfx/audioDescriptions.cs
rename to Templates/BaseGame/game/core/sfx/scripts/audioDescriptions.cs
diff --git a/Templates/BaseGame/game/core/sfx/audioEnvironments.cs b/Templates/BaseGame/game/core/sfx/scripts/audioEnvironments.cs
similarity index 100%
rename from Templates/BaseGame/game/core/sfx/audioEnvironments.cs
rename to Templates/BaseGame/game/core/sfx/scripts/audioEnvironments.cs
diff --git a/Templates/BaseGame/game/core/sfx/audioStates.cs b/Templates/BaseGame/game/core/sfx/scripts/audioStates.cs
similarity index 100%
rename from Templates/BaseGame/game/core/sfx/audioStates.cs
rename to Templates/BaseGame/game/core/sfx/scripts/audioStates.cs
diff --git a/Templates/BaseGame/game/core/utility/Core_Utility.cs b/Templates/BaseGame/game/core/utility/Core_Utility.cs
new file mode 100644
index 000000000..d412f3544
--- /dev/null
+++ b/Templates/BaseGame/game/core/utility/Core_Utility.cs
@@ -0,0 +1,11 @@
+
+function Core_Utility::onCreate(%this)
+{
+   exec("./scripts/parseArgs.cs");
+   exec("./scripts/globals.cs");
+   exec("./scripts/helperFunctions.cs");
+}
+
+function Core_Utility::onDestroy(%this)
+{
+}
\ No newline at end of file
diff --git a/Templates/BaseGame/game/core/utility/Core_Utility.module b/Templates/BaseGame/game/core/utility/Core_Utility.module
new file mode 100644
index 000000000..cb6539040
--- /dev/null
+++ b/Templates/BaseGame/game/core/utility/Core_Utility.module
@@ -0,0 +1,9 @@
+<ModuleDefinition
+	ModuleId="Core_Utility"
+	VersionId="1"
+	Description="Module that implements the core engine-level setup for the game."
+	ScriptFile="Core_Utility.cs"
+	CreateFunction="onCreate"
+	DestroyFunction="onDestroy"
+	Group="Core">
+</ModuleDefinition>
\ No newline at end of file
diff --git a/Templates/BaseGame/game/core/globals.cs b/Templates/BaseGame/game/core/utility/scripts/globals.cs
similarity index 95%
rename from Templates/BaseGame/game/core/globals.cs
rename to Templates/BaseGame/game/core/utility/scripts/globals.cs
index d4e4f1ca3..fcf52390a 100644
--- a/Templates/BaseGame/game/core/globals.cs
+++ b/Templates/BaseGame/game/core/utility/scripts/globals.cs
@@ -35,10 +35,10 @@ $pref::Input::JoystickEnabled = 0;
 // ----------------------------------------------------------------------------
 
 // Set directory paths for various data or default images.
-$pref::Video::ProfilePath = "core/gfxprofile";
-$pref::Video::missingTexturePath = "core/images/missingTexture.png";
+$pref::Video::ProfilePath = "core/rendering/scripts/gfxprofile";
+/*$pref::Video::missingTexturePath = "core/images/missingTexture.png";
 $pref::Video::unavailableTexturePath = "core/images/unavailable.png";
-$pref::Video::warningTexturePath = "core/images/warnMat.dds";
+$pref::Video::warningTexturePath = "core/images/warnMat.dds";*/
 
 $pref::Video::disableVerticalSync = 1;
 $pref::Video::mode = "800 600 false 32 60 4";
diff --git a/Templates/BaseGame/game/core/helperFunctions.cs b/Templates/BaseGame/game/core/utility/scripts/helperFunctions.cs
similarity index 99%
rename from Templates/BaseGame/game/core/helperFunctions.cs
rename to Templates/BaseGame/game/core/utility/scripts/helperFunctions.cs
index 1b98f1ea5..8abe3e6e6 100644
--- a/Templates/BaseGame/game/core/helperFunctions.cs
+++ b/Templates/BaseGame/game/core/utility/scripts/helperFunctions.cs
@@ -966,9 +966,9 @@ function findGameObject(%name)
 	{
 	   %assetId = %assetQuery.getAsset(%i);
 	   
-	   %assetName = AssetDatabase.getAssetName(%assetId);
+	   //%assetName = AssetDatabase.getAssetName(%assetId);
       
-      if(%assetName $= %name)
+        if(%assetId $= %name)
 		{
 		   %gameObjectAsset = AssetDatabase.acquireAsset(%assetId);
 
diff --git a/Templates/BaseGame/game/core/parseArgs.cs b/Templates/BaseGame/game/core/utility/scripts/parseArgs.cs
similarity index 100%
rename from Templates/BaseGame/game/core/parseArgs.cs
rename to Templates/BaseGame/game/core/utility/scripts/parseArgs.cs
diff --git a/Templates/BaseGame/game/main.cs.in b/Templates/BaseGame/game/main.cs.in
index 3eed267df..1e3e37c44 100644
--- a/Templates/BaseGame/game/main.cs.in
+++ b/Templates/BaseGame/game/main.cs.in
@@ -16,39 +16,12 @@ $appName = "@TORQUE_APP_NAME@";
 
 //-----------------------------------------------------------------------------
 // Load up scripts to initialise subsystems.
-exec("core/main.cs");
-
-// Parse the command line arguments
-echo("\n--------- Parsing Arguments ---------");
-parseArgs();
-
-// The canvas needs to be initialized before any gui scripts are run since
-// some of the controls assume that the canvas exists at load time.
-createCanvas($appName);
+ModuleDatabase.setModuleExtension("module");
+ModuleDatabase.scanModules( "core", false );
+ModuleDatabase.LoadExplicit( "CoreModule" );
 
 //-----------------------------------------------------------------------------
-// Load console.
-exec("core/console/main.cs");
-
-// Init the physics plugin.
-physicsInit();
-
-sfxStartup();
-
-// Set up networking.
-setNetPort(0);
-
-// Start processing file change events.   
-startFileChangeNotifications();
-
-// If we have editors, initialize them here as well
-if (isToolBuild())
-{
-   if(isFile("tools/main.cs") && !$isDedicated)
-      exec("tools/main.cs");
-}
-	
-ModuleDatabase.setModuleExtension("module");
+// Load any gameplay modules
 ModuleDatabase.scanModules( "data", false );
 ModuleDatabase.LoadGroup( "Game" );
 
@@ -85,14 +58,4 @@ else
    closeSplashWindow();
 }
 
-echo("Engine initialized...");
-
-//-----------------------------------------------------------------------------
-// Called when the engine is shutting down.
-function onExit() 
-{
-   // Stop file change events.
-   stopFileChangeNotifications();
-   
-   ModuleDatabase.UnloadExplicit( "Game" );
-}
\ No newline at end of file
+echo("Engine initialized...");
\ No newline at end of file
diff --git a/Templates/BaseGame/game/tools/levels/BlankRoom.postfxpreset.cs b/Templates/BaseGame/game/tools/levels/BlankRoom.postfxpreset.cs
index 8b616a84a..23a6c3ced 100644
--- a/Templates/BaseGame/game/tools/levels/BlankRoom.postfxpreset.cs
+++ b/Templates/BaseGame/game/tools/levels/BlankRoom.postfxpreset.cs
@@ -1,4 +1,4 @@
-$PostFXManager::Settings::ColorCorrectionRamp = "core/images/null_color_ramp.png";
+$PostFXManager::Settings::ColorCorrectionRamp = "core/postFX/images/null_color_ramp.png";
 $PostFXManager::Settings::DOF::BlurCurveFar = "";
 $PostFXManager::Settings::DOF::BlurCurveNear = "";
 $PostFXManager::Settings::DOF::BlurMax = "";
diff --git a/Templates/Modules/vr/VR.cs b/Templates/Modules/vr/VR.cs
new file mode 100644
index 000000000..ea0ffd7a5
--- /dev/null
+++ b/Templates/Modules/vr/VR.cs
@@ -0,0 +1,9 @@
+
+function VR::onCreate(%this)
+{
+   exec("./scripts/oculusVR.cs");
+}
+
+function VR::onDestroy(%this)
+{
+}
\ No newline at end of file
diff --git a/Templates/Modules/vr/VR.module b/Templates/Modules/vr/VR.module
new file mode 100644
index 000000000..14ccec0e0
--- /dev/null
+++ b/Templates/Modules/vr/VR.module
@@ -0,0 +1,9 @@
+<ModuleDefinition
+	ModuleId="VR"
+	VersionId="1"
+	Description="Module that implements the core engine-level setup for the game."
+	ScriptFile="VR.cs"
+	CreateFunction="onCreate"
+	DestroyFunction="onDestroy"
+	Group="Game">
+</ModuleDefinition>
\ No newline at end of file
diff --git a/Templates/BaseGame/game/core/oculusVROverlay.gui b/Templates/Modules/vr/guis/oculusVROverlay.gui
similarity index 100%
rename from Templates/BaseGame/game/core/oculusVROverlay.gui
rename to Templates/Modules/vr/guis/oculusVROverlay.gui
diff --git a/Templates/BaseGame/game/core/oculusVR.cs b/Templates/Modules/vr/scripts/oculusVR.cs
similarity index 99%
rename from Templates/BaseGame/game/core/oculusVR.cs
rename to Templates/Modules/vr/scripts/oculusVR.cs
index b0d7eb0b8..fa9562c18 100644
--- a/Templates/BaseGame/game/core/oculusVR.cs
+++ b/Templates/Modules/vr/scripts/oculusVR.cs
@@ -164,7 +164,7 @@ function enableOculusVRDisplay(%gameConnection, %trueStereoRendering)
 
    if (!isObject(OculusVROverlay))
    {
-      exec("./oculusVROverlay.gui");
+      exec("core/vr/guis/oculusVROverlay.gui");
    }
 
    OculusCanvas.setContent(OculusVROverlay);