diff --git a/Templates/BaseGame/game/core/Core.cs b/Templates/BaseGame/game/core/Core.cs
index 480c0331c..5559760ae 100644
--- a/Templates/BaseGame/game/core/Core.cs
+++ b/Templates/BaseGame/game/core/Core.cs
@@ -24,8 +24,6 @@ function CoreModule::onCreate(%this)
    ModuleDatabase.LoadExplicit( "Core_Lighting" );
    ModuleDatabase.LoadExplicit( "Core_SFX" );
    ModuleDatabase.LoadExplicit( "Core_PostFX" );
-   ModuleDatabase.LoadExplicit( "Core_VR" );
-   ModuleDatabase.LoadExplicit( "Core_VR" );
    ModuleDatabase.LoadExplicit( "Core_ClientServer" );
    
    %prefPath = getPrefpath();
diff --git a/Templates/BaseGame/game/core/vr/Core_VR.cs b/Templates/BaseGame/game/core/vr/Core_VR.cs
deleted file mode 100644
index 42b2df7e0..000000000
--- a/Templates/BaseGame/game/core/vr/Core_VR.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-
-function Core_VR::onCreate(%this)
-{
-   exec("./scripts/oculusVR.cs");
-}
-
-function Core_VR::onDestroy(%this)
-{
-}
\ No newline at end of file
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/BaseGame/game/core/vr/Core_VR.module b/Templates/Modules/vr/VR.module
similarity index 75%
rename from Templates/BaseGame/game/core/vr/Core_VR.module
rename to Templates/Modules/vr/VR.module
index 960a5a85a..14ccec0e0 100644
--- a/Templates/BaseGame/game/core/vr/Core_VR.module
+++ b/Templates/Modules/vr/VR.module
@@ -1,9 +1,9 @@
 <ModuleDefinition
-	ModuleId="Core_VR"
+	ModuleId="VR"
 	VersionId="1"
 	Description="Module that implements the core engine-level setup for the game."
-	ScriptFile="Core_VR.cs"
+	ScriptFile="VR.cs"
 	CreateFunction="onCreate"
 	DestroyFunction="onDestroy"
-	Group="Core">
+	Group="Game">
 </ModuleDefinition>
\ No newline at end of file
diff --git a/Templates/BaseGame/game/core/vr/guis/oculusVROverlay.gui b/Templates/Modules/vr/guis/oculusVROverlay.gui
similarity index 100%
rename from Templates/BaseGame/game/core/vr/guis/oculusVROverlay.gui
rename to Templates/Modules/vr/guis/oculusVROverlay.gui
diff --git a/Templates/BaseGame/game/core/vr/scripts/oculusVR.cs b/Templates/Modules/vr/scripts/oculusVR.cs
similarity index 100%
rename from Templates/BaseGame/game/core/vr/scripts/oculusVR.cs
rename to Templates/Modules/vr/scripts/oculusVR.cs