diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000000000000000000000000000000000..8059e46bd8646cc9263fecc5e535aeefe5160956
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "Packages/unity-world-storage-package"]
+	path = Packages/unity-world-storage-package
+	url = https://labs.etsi.org/rep/arf/world-storage-api-helpers/unity-world-storage-package.git
diff --git a/Packages/manifest.json b/Packages/manifest.json
index 7d93fb81455c6d6264cfa31999d0b723b5f50877..cead4b0d0aef0e83473dc14254c1c2c6df4481ab 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -8,7 +8,7 @@
     "com.unity.textmeshpro": "3.0.4",
     "com.unity.timeline": "1.4.7",
     "com.unity.ugui": "1.0.0",
-    "etsi.isg.arf.worldstorage": "file:D:/Fraunhofer/Projects/ETSI/ETSI Labs-STF/unity-world-storage-package",
+    "etsi.isg.arf.worldstorage": "file:../unity-world-storage-package",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index 598afa179fe24e4f2ace9e8756bc237472da4b93..2b98cb49a377e07ceae2aa4ca0c27ab65107e880 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -81,9 +81,9 @@
       }
     },
     "etsi.isg.arf.worldstorage": {
-      "version": "file:D:/Fraunhofer/Projects/ETSI/ETSI Labs-STF/unity-world-storage-package",
+      "version": "file:unity-world-storage-package",
       "depth": 0,
-      "source": "local",
+      "source": "embedded",
       "dependencies": {}
     },
     "com.unity.modules.ai": {
diff --git a/Packages/unity-world-storage-package b/Packages/unity-world-storage-package
new file mode 160000
index 0000000000000000000000000000000000000000..11be4ddf097238232e569513fb17d319daccacc4
--- /dev/null
+++ b/Packages/unity-world-storage-package
@@ -0,0 +1 @@
+Subproject commit 11be4ddf097238232e569513fb17d319daccacc4
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index a27413b32da63531bcfb78094d2bc4999eee5d78..3ef73f4d57e97f22060fbb5e555c99ef7d2765ee 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -11,6 +11,9 @@ EditorUserSettings:
     RecentlyUsedScenePath-1:
       value: 224247031146467e393d256c3111795f37253e6a1b27343c29692e27edf2353fe7a717d9ce750c3f3c0cea2f4b0d0032e2060c38f50e040e515fb31b1ff6040a
       flags: 0
+    RecentlyUsedScenePath-2:
+      value: 224247031146467e393d256c3111795f37253e6a1b27343c29692e27edf2353fe7a717d9ce750c3f3c0cea2f4b090e2dfe0e3a1ff9190b0c143dfc0301f3155d04cb11d103
+      flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650
       flags: 0