diff --git a/.gitmodules b/.gitmodules
index f92aed3..3d98736 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "donut"]
 	path = donut
 	url = https://github.com/NVIDIAGameWorks/donut.git
-[submodule "media/glTF-Sample-Models"]
-	path = media/glTF-Sample-Models
-	url = https://github.com/KhronosGroup/glTF-Sample-Models.git
+[submodule "media/glTF-Sample-Assets"]
+	path = media/glTF-Sample-Assets
+	url = https://github.com/KhronosGroup/glTF-Sample-Assets.git
diff --git a/examples/bindless_rendering/bindless_rendering.cpp b/examples/bindless_rendering/bindless_rendering.cpp
index 99e55ca..1483235 100644
--- a/examples/bindless_rendering/bindless_rendering.cpp
+++ b/examples/bindless_rendering/bindless_rendering.cpp
@@ -75,7 +75,7 @@ class BindlessRendering : public app::ApplicationBase
 
     bool Init()
     {
-        std::filesystem::path sceneFileName = app::GetDirectoryWithExecutable().parent_path() / "media/glTF-Sample-Models/2.0/Sponza/glTF/Sponza.gltf";
+        std::filesystem::path sceneFileName = app::GetDirectoryWithExecutable().parent_path() / "media/glTF-Sample-Assets/Models/Sponza/glTF/Sponza.gltf";
         std::filesystem::path frameworkShaderPath = app::GetDirectoryWithExecutable() / "shaders/framework" / app::GetShaderTypeName(GetDevice()->getGraphicsAPI());
         std::filesystem::path appShaderPath = app::GetDirectoryWithExecutable() / "shaders/bindless_rendering" / app::GetShaderTypeName(GetDevice()->getGraphicsAPI());
         
diff --git a/examples/rt_reflections/rt_reflections.cpp b/examples/rt_reflections/rt_reflections.cpp
index 75015fd..5f796c7 100644
--- a/examples/rt_reflections/rt_reflections.cpp
+++ b/examples/rt_reflections/rt_reflections.cpp
@@ -173,7 +173,7 @@ class VariableRateShading : public app::ApplicationBase
 
     bool Init()
     {
-        std::filesystem::path sceneFileName = app::GetDirectoryWithExecutable().parent_path() / "media/glTF-Sample-Models/2.0/Sponza/glTF/Sponza.gltf";
+        std::filesystem::path sceneFileName = app::GetDirectoryWithExecutable().parent_path() / "media/glTF-Sample-Assets/Models/Sponza/glTF/Sponza.gltf";
         std::filesystem::path frameworkShaderPath = app::GetDirectoryWithExecutable() / "shaders/framework" / app::GetShaderTypeName(GetDevice()->getGraphicsAPI());
         std::filesystem::path appShaderPath = app::GetDirectoryWithExecutable() / "shaders/rt_reflections" / app::GetShaderTypeName(GetDevice()->getGraphicsAPI());
         
diff --git a/examples/rt_shadows/rt_shadows.cpp b/examples/rt_shadows/rt_shadows.cpp
index 6071b88..ec68e53 100644
--- a/examples/rt_shadows/rt_shadows.cpp
+++ b/examples/rt_shadows/rt_shadows.cpp
@@ -166,7 +166,7 @@ class RayTracedShadows : public app::ApplicationBase
 
     bool Init()
     {
-        std::filesystem::path sceneFileName = app::GetDirectoryWithExecutable().parent_path() / "media/glTF-Sample-Models/2.0/Sponza/glTF/Sponza.gltf";
+        std::filesystem::path sceneFileName = app::GetDirectoryWithExecutable().parent_path() / "media/glTF-Sample-Assets/Models/Sponza/glTF/Sponza.gltf";
         std::filesystem::path frameworkShaderPath = app::GetDirectoryWithExecutable() / "shaders/framework" / app::GetShaderTypeName(GetDevice()->getGraphicsAPI());
         std::filesystem::path appShaderPath = app::GetDirectoryWithExecutable() / "shaders/rt_shadows" / app::GetShaderTypeName(GetDevice()->getGraphicsAPI());
         
diff --git a/examples/threaded_rendering/threaded_rendering.cpp b/examples/threaded_rendering/threaded_rendering.cpp
index e8a6d73..cf6ba7d 100644
--- a/examples/threaded_rendering/threaded_rendering.cpp
+++ b/examples/threaded_rendering/threaded_rendering.cpp
@@ -68,7 +68,7 @@ class ThreadedRendering : public app::ApplicationBase
     
     bool Init()
     {
-        std::filesystem::path sceneFileName = app::GetDirectoryWithExecutable().parent_path() / "media/glTF-Sample-Models/2.0/Sponza/glTF/Sponza.gltf";
+        std::filesystem::path sceneFileName = app::GetDirectoryWithExecutable().parent_path() / "media/glTF-Sample-Assets/Models/Sponza/glTF/Sponza.gltf";
         std::filesystem::path frameworkShaderPath = app::GetDirectoryWithExecutable() / "shaders/framework" / app::GetShaderTypeName(GetDevice()->getGraphicsAPI());
         
         m_RootFS = std::make_shared<vfs::RootFileSystem>();
diff --git a/examples/variable_shading/variable_shading.cpp b/examples/variable_shading/variable_shading.cpp
index 398864c..d956c86 100644
--- a/examples/variable_shading/variable_shading.cpp
+++ b/examples/variable_shading/variable_shading.cpp
@@ -187,7 +187,7 @@ class VariableRateShading : public app::ApplicationBase
     {
         m_UseRawD3D12 = useRawD3D12;
 
-        std::filesystem::path sceneFileName = app::GetDirectoryWithExecutable().parent_path() / "media/glTF-Sample-Models/2.0/Sponza/glTF/Sponza.gltf";
+        std::filesystem::path sceneFileName = app::GetDirectoryWithExecutable().parent_path() / "media/glTF-Sample-Assets/Models/Sponza/glTF/Sponza.gltf";
         std::filesystem::path frameworkShaderPath = app::GetDirectoryWithExecutable() / "shaders/framework" / app::GetShaderTypeName(GetDevice()->getGraphicsAPI());
         std::filesystem::path appShaderPath = app::GetDirectoryWithExecutable() / "shaders/variable_shading" / app::GetShaderTypeName(GetDevice()->getGraphicsAPI());
         
diff --git a/feature_demo/FeatureDemo.cpp b/feature_demo/FeatureDemo.cpp
index 76de169..0b43d20 100644
--- a/feature_demo/FeatureDemo.cpp
+++ b/feature_demo/FeatureDemo.cpp
@@ -341,7 +341,7 @@ class FeatureDemo : public ApplicationBase
         m_RootFs->mount("/shaders/donut", frameworkShaderPath);
         m_RootFs->mount("/native", nativeFS);
 
-        std::filesystem::path scenePath = "/media/glTF-Sample-Models/2.0";
+        std::filesystem::path scenePath = "/media/glTF-Sample-Assets/Models";
         m_SceneFilesAvailable = FindScenes(*m_RootFs, scenePath);
 
         if (sceneName.empty() && m_SceneFilesAvailable.empty())
diff --git a/media/glTF-Sample-Assets b/media/glTF-Sample-Assets
new file mode 160000
index 0000000..d1ba92f
--- /dev/null
+++ b/media/glTF-Sample-Assets
@@ -0,0 +1 @@
+Subproject commit d1ba92fc422b42a2b8ed7c2476626fb0bd752d14
diff --git a/media/glTF-Sample-Models b/media/glTF-Sample-Models
deleted file mode 160000
index 63f026b..0000000
--- a/media/glTF-Sample-Models
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 63f026b2aa957d3e8207f6dd798608993e33fb0d
diff --git a/media/sponza-plus.scene.json b/media/sponza-plus.scene.json
index 6e33fbd..b9213f1 100644
--- a/media/sponza-plus.scene.json
+++ b/media/sponza-plus.scene.json
@@ -1,7 +1,7 @@
 {
 	"models": [
-		"glTF-Sample-Models/2.0/Sponza/glTF/Sponza.gltf",
-		"glTF-Sample-Models/2.0/BrainStem/glTF/BrainStem.gltf"
+		"glTF-Sample-Assets/Models/Sponza/glTF/Sponza.gltf",
+		"glTF-Sample-Assets/Models/BrainStem/glTF/BrainStem.gltf"
 	],
 	"graph": [
 		{