diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7f7b4dc463966f26d45aa42b201d381d6e3d9edc..40fc531792446aa76222e7803a663cb27292095a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@
 #Reference the Gitlab CI website for this
 
 include:
-  - project: 'vr-group/gitlab-ci-unreal-files'
+  - project: 'vr-group/unreal-development/unreal-ci'
     ref: master 
     file: '/shared_scripts.yml'
     
diff --git a/.gitmodules b/.gitmodules
index 3d9e14a958e4c60c27691216db1d5b1c61e6222f..5be8e419afae3caebb11321c07dd0b3d4c52bd8a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,6 @@
 [submodule "Plugins/nDisplayExtensions"]
 	path = Plugins/nDisplayExtensions
-	url = https://devhub.vr.rwth-aachen.de/VR-Group/ndisplayextensions.git
-	branch = develop-4-22
+	url = https://devhub.vr.rwth-aachen.de/VR-Group/unreal-development/ndisplayextensions.git
 [submodule "Plugins/CaveOverlay"]
 	path = Plugins/CaveOverlay
-	url = https://devhub.vr.rwth-aachen.de/VR-Group/unreal-cave-overlay.git
+	url = https://devhub.vr.rwth-aachen.de/VR-Group/unreal-development/unreal-cave-overlay.git
diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini
index 2f99e19a6311b0a15bfe237d3aedc801a5f40128..f08de40d578660892389297159b4edb860e85fae 100644
--- a/Config/DefaultEngine.ini
+++ b/Config/DefaultEngine.ini
@@ -13,8 +13,8 @@ GlobalDefaultGameMode=/Script/DisplayClusterExtensions.VirtualRealityGameMode
 GameEngine=/Script/DisplayCluster.DisplayClusterGameEngine
 UnrealEdEngine=/Script/DisplayClusterEditor.DisplayClusterEditorEngine
 
-+ActiveGameNameRedirects=(OldGameName="TP_nDisplayBP",NewGameName="/Script/template")
-+ActiveGameNameRedirects=(OldGameName="/Script/TP_nDisplayBP",NewGameName="/Script/template")
++ActiveGameNameRedirects=(OldGameName="TP_nDisplayBP",NewGameName="/Script/RwthVrTemplate")
++ActiveGameNameRedirects=(OldGameName="/Script/TP_nDisplayBP",NewGameName="/Script/RwthVrTemplate")
 
 [/Script/DisplayClusterEditor.DisplayClusterEditorSettings]
 bEnabled=True
diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini
index 72b12b0a6da7f7166e30507c12396a0f728c9eb0..8da834f97a22d68dc85912506cf72ad5d6020a27 100644
--- a/Config/DefaultGame.ini
+++ b/Config/DefaultGame.ini
@@ -1,4 +1,4 @@
 [/Script/EngineSettings.GeneralProjectSettings]
 ProjectID=6F40C2084FB7D1EAFCAEF3B2C978D28C
-ProjectName=template
+ProjectName=RwthVrTemplate
 bUseBorderlessWindow=True
diff --git a/template.uproject b/RwthVrTemplate.uproject
similarity index 93%
rename from template.uproject
rename to RwthVrTemplate.uproject
index 53d1e54ce7c1046d33c61637300c6f29515407e4..855ae9ec867b4f42178b8fa84bdf1b6d30d0e932 100644
--- a/template.uproject
+++ b/RwthVrTemplate.uproject
@@ -5,7 +5,7 @@
 	"Description": "",
 	"Modules": [
 		{
-			"Name": "template",
+			"Name": "RwthVrTemplate",
 			"Type": "Runtime",
 			"LoadingPhase": "Default",
 			"AdditionalDependencies": [
diff --git a/Source/RwthVrTemplate.Target.cs b/Source/RwthVrTemplate.Target.cs
new file mode 100644
index 0000000000000000000000000000000000000000..7b0f96d93d759b892287330218d306584b9338f4
--- /dev/null
+++ b/Source/RwthVrTemplate.Target.cs
@@ -0,0 +1,14 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+using UnrealBuildTool;
+using System.Collections.Generic;
+
+public class RwthVrTemplateTarget : TargetRules
+{
+	public RwthVrTemplateTarget(TargetInfo Target) : base(Target)
+	{
+		Type = TargetType.Game;
+
+		ExtraModuleNames.AddRange( new string[] { "RwthVrTemplate" } );
+	}
+}
diff --git a/Source/template/template.Build.cs b/Source/RwthVrTemplate/RwthVrTemplate.Build.cs
similarity index 87%
rename from Source/template/template.Build.cs
rename to Source/RwthVrTemplate/RwthVrTemplate.Build.cs
index ffe8276d9d9c97f981d3dd4f8dd1059473200e04..833e3eba3bba41f0b20c747d3fc72e7f5629fd5c 100644
--- a/Source/template/template.Build.cs
+++ b/Source/RwthVrTemplate/RwthVrTemplate.Build.cs
@@ -2,9 +2,9 @@
 
 using UnrealBuildTool;
 
-public class template : ModuleRules
+public class RwthVrTemplate : ModuleRules
 {
-	public template(ReadOnlyTargetRules Target) : base(Target)
+	public RwthVrTemplate(ReadOnlyTargetRules Target) : base(Target)
 	{
 		PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
 	
diff --git a/Source/RwthVrTemplate/RwthVrTemplate.cpp b/Source/RwthVrTemplate/RwthVrTemplate.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..c36c1f64b36dbe08e18664a9d6dce22e12108f78
--- /dev/null
+++ b/Source/RwthVrTemplate/RwthVrTemplate.cpp
@@ -0,0 +1,4 @@
+#include "RwthVrTemplate.h"
+#include "Modules/ModuleManager.h"
+
+IMPLEMENT_PRIMARY_GAME_MODULE( FDefaultGameModuleImpl, RwthVrTemplate, "RwthVrTemplate" );
diff --git a/Source/template/template.h b/Source/RwthVrTemplate/RwthVrTemplate.h
similarity index 100%
rename from Source/template/template.h
rename to Source/RwthVrTemplate/RwthVrTemplate.h
diff --git a/Source/template/nothing.cpp b/Source/RwthVrTemplate/nothing.cpp
similarity index 100%
rename from Source/template/nothing.cpp
rename to Source/RwthVrTemplate/nothing.cpp
diff --git a/Source/template/nothing.h b/Source/RwthVrTemplate/nothing.h
similarity index 70%
rename from Source/template/nothing.h
rename to Source/RwthVrTemplate/nothing.h
index 94bb46ccd2876b015581e475136c1c301ebdaaab..4e7b86d78acdbcc84a2b5daecf8ef2766a0a17dc 100644
--- a/Source/template/nothing.h
+++ b/Source/RwthVrTemplate/nothing.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 
-class TEMPLATE_API nothing
+class RWTHVRTEMPLATE_API nothing
 {
 public:
 	nothing();
diff --git a/Source/RwthVrTemplateEditor.Target.cs b/Source/RwthVrTemplateEditor.Target.cs
new file mode 100644
index 0000000000000000000000000000000000000000..8528bcb8886c56f907f3eadacd0da6b569b82298
--- /dev/null
+++ b/Source/RwthVrTemplateEditor.Target.cs
@@ -0,0 +1,14 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+using UnrealBuildTool;
+using System.Collections.Generic;
+
+public class RwthVrTemplateEditorTarget : TargetRules
+{
+	public RwthVrTemplateEditorTarget(TargetInfo Target) : base(Target)
+	{
+		Type = TargetType.Editor;
+
+		ExtraModuleNames.AddRange( new string[] { "RwthVrTemplate" } );
+	}
+}
diff --git a/Source/template.Target.cs b/Source/template.Target.cs
deleted file mode 100644
index c86e05d30c3f395eee54a7a8ba79dd8ea8ec0df1..0000000000000000000000000000000000000000
--- a/Source/template.Target.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-using UnrealBuildTool;
-using System.Collections.Generic;
-
-public class templateTarget : TargetRules
-{
-	public templateTarget(TargetInfo Target) : base(Target)
-	{
-		Type = TargetType.Game;
-
-		ExtraModuleNames.AddRange( new string[] { "template" } );
-	}
-}
diff --git a/Source/template/template.cpp b/Source/template/template.cpp
deleted file mode 100644
index cd63fb06f09e036972d4048b824a956cfbf4828c..0000000000000000000000000000000000000000
--- a/Source/template/template.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "template.h"
-#include "Modules/ModuleManager.h"
-
-IMPLEMENT_PRIMARY_GAME_MODULE( FDefaultGameModuleImpl, template, "template" );
diff --git a/Source/templateEditor.Target.cs b/Source/templateEditor.Target.cs
deleted file mode 100644
index 0ef678778a8098a42cfc78ff5dd4625ee0ca4953..0000000000000000000000000000000000000000
--- a/Source/templateEditor.Target.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-using UnrealBuildTool;
-using System.Collections.Generic;
-
-public class templateEditorTarget : TargetRules
-{
-	public templateEditorTarget(TargetInfo Target) : base(Target)
-	{
-		Type = TargetType.Editor;
-
-		ExtraModuleNames.AddRange( new string[] { "template" } );
-	}
-}