diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Tutorials/Settings/Tutorials.asset b/com.unity.template-hd/Assets/SampleSceneAssets/Tutorials/Settings/Tutorials.asset
index 684417aee70..d0d787d0960 100644
--- a/com.unity.template-hd/Assets/SampleSceneAssets/Tutorials/Settings/Tutorials.asset
+++ b/com.unity.template-hd/Assets/SampleSceneAssets/Tutorials/Settings/Tutorials.asset
@@ -25,7 +25,7 @@ MonoBehaviour:
   Description:
     m_Untranslated: This series of tutorials will lead you through the basics of
       HDRP.
-  ProjectLayout: {fileID: 102900000, guid: ec0f28aca6ef05f4693fe96db9f2b71c, type: 3}
+  ProjectLayout: {fileID: 0}
   Sections:
   - OrderInView: 0
     Heading:
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes.meta b/com.unity.template-hd/Assets/Scenes.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes.meta
rename to com.unity.template-hd/Assets/Scenes.meta
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene.meta b/com.unity.template-hd/Assets/Scenes/SampleScene.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene.meta
rename to com.unity.template-hd/Assets/Scenes/SampleScene.meta
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene.unity b/com.unity.template-hd/Assets/Scenes/SampleScene.unity
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene.unity
rename to com.unity.template-hd/Assets/Scenes/SampleScene.unity
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene.unity.meta b/com.unity.template-hd/Assets/Scenes/SampleScene.unity.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene.unity.meta
rename to com.unity.template-hd/Assets/Scenes/SampleScene.unity.meta
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/LightingData.asset b/com.unity.template-hd/Assets/Scenes/SampleScene/LightingData.asset
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/LightingData.asset
rename to com.unity.template-hd/Assets/Scenes/SampleScene/LightingData.asset
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/LightingData.asset.meta b/com.unity.template-hd/Assets/Scenes/SampleScene/LightingData.asset.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/LightingData.asset.meta
rename to com.unity.template-hd/Assets/Scenes/SampleScene/LightingData.asset.meta
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-0_comp_dir.png b/com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-0_comp_dir.png
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-0_comp_dir.png
rename to com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-0_comp_dir.png
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-0_comp_dir.png.meta b/com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-0_comp_dir.png.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-0_comp_dir.png.meta
rename to com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-0_comp_dir.png.meta
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-0_comp_light.exr b/com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-0_comp_light.exr
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-0_comp_light.exr
rename to com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-0_comp_light.exr
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-0_comp_light.exr.meta b/com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-0_comp_light.exr.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-0_comp_light.exr.meta
rename to com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-0_comp_light.exr.meta
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-1_comp_dir.png b/com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-1_comp_dir.png
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-1_comp_dir.png
rename to com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-1_comp_dir.png
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-1_comp_dir.png.meta b/com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-1_comp_dir.png.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-1_comp_dir.png.meta
rename to com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-1_comp_dir.png.meta
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-1_comp_light.exr b/com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-1_comp_light.exr
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-1_comp_light.exr
rename to com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-1_comp_light.exr
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-1_comp_light.exr.meta b/com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-1_comp_light.exr.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-1_comp_light.exr.meta
rename to com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-1_comp_light.exr.meta
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-2_comp_dir.png b/com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-2_comp_dir.png
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-2_comp_dir.png
rename to com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-2_comp_dir.png
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-2_comp_dir.png.meta b/com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-2_comp_dir.png.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-2_comp_dir.png.meta
rename to com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-2_comp_dir.png.meta
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-2_comp_light.exr b/com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-2_comp_light.exr
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-2_comp_light.exr
rename to com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-2_comp_light.exr
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-2_comp_light.exr.meta b/com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-2_comp_light.exr.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-2_comp_light.exr.meta
rename to com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-2_comp_light.exr.meta
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-3_comp_dir.png b/com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-3_comp_dir.png
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-3_comp_dir.png
rename to com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-3_comp_dir.png
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-3_comp_dir.png.meta b/com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-3_comp_dir.png.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-3_comp_dir.png.meta
rename to com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-3_comp_dir.png.meta
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-3_comp_light.exr b/com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-3_comp_light.exr
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-3_comp_light.exr
rename to com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-3_comp_light.exr
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-3_comp_light.exr.meta b/com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-3_comp_light.exr.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-3_comp_light.exr.meta
rename to com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-3_comp_light.exr.meta
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-4_comp_dir.png b/com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-4_comp_dir.png
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-4_comp_dir.png
rename to com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-4_comp_dir.png
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-4_comp_dir.png.meta b/com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-4_comp_dir.png.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-4_comp_dir.png.meta
rename to com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-4_comp_dir.png.meta
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-4_comp_light.exr b/com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-4_comp_light.exr
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-4_comp_light.exr
rename to com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-4_comp_light.exr
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-4_comp_light.exr.meta b/com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-4_comp_light.exr.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-4_comp_light.exr.meta
rename to com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-4_comp_light.exr.meta
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-5_comp_dir.png b/com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-5_comp_dir.png
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-5_comp_dir.png
rename to com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-5_comp_dir.png
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-5_comp_dir.png.meta b/com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-5_comp_dir.png.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-5_comp_dir.png.meta
rename to com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-5_comp_dir.png.meta
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-5_comp_light.exr b/com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-5_comp_light.exr
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-5_comp_light.exr
rename to com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-5_comp_light.exr
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-5_comp_light.exr.meta b/com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-5_comp_light.exr.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-5_comp_light.exr.meta
rename to com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-5_comp_light.exr.meta
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-8_comp_dir.png b/com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-8_comp_dir.png
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-8_comp_dir.png
rename to com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-8_comp_dir.png
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-8_comp_dir.png.meta b/com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-8_comp_dir.png.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-8_comp_dir.png.meta
rename to com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-8_comp_dir.png.meta
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-8_comp_light.exr b/com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-8_comp_light.exr
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-8_comp_light.exr
rename to com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-8_comp_light.exr
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-8_comp_light.exr.meta b/com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-8_comp_light.exr.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/Lightmap-8_comp_light.exr.meta
rename to com.unity.template-hd/Assets/Scenes/SampleScene/Lightmap-8_comp_light.exr.meta
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-0.exr b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-0.exr
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-0.exr
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-0.exr
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-0.exr.meta b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-0.exr.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-0.exr.meta
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-0.exr.meta
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-1.exr b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-1.exr
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-1.exr
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-1.exr
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-1.exr.meta b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-1.exr.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-1.exr.meta
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-1.exr.meta
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-10.exr b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-10.exr
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-10.exr
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-10.exr
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-10.exr.meta b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-10.exr.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-10.exr.meta
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-10.exr.meta
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-11.exr b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-11.exr
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-11.exr
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-11.exr
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-11.exr.meta b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-11.exr.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-11.exr.meta
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-11.exr.meta
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-12.exr b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-12.exr
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-12.exr
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-12.exr
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-12.exr.meta b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-12.exr.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-12.exr.meta
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-12.exr.meta
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-13.exr b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-13.exr
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-13.exr
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-13.exr
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-13.exr.meta b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-13.exr.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-13.exr.meta
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-13.exr.meta
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-14.exr b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-14.exr
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-14.exr
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-14.exr
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-14.exr.meta b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-14.exr.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-14.exr.meta
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-14.exr.meta
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-15.exr b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-15.exr
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-15.exr
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-15.exr
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-15.exr.meta b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-15.exr.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-15.exr.meta
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-15.exr.meta
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-16.exr b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-16.exr
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-16.exr
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-16.exr
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-16.exr.meta b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-16.exr.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-16.exr.meta
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-16.exr.meta
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-17.exr b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-17.exr
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-17.exr
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-17.exr
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-17.exr.meta b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-17.exr.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-17.exr.meta
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-17.exr.meta
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-2.exr b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-2.exr
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-2.exr
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-2.exr
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-2.exr.meta b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-2.exr.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-2.exr.meta
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-2.exr.meta
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-3.exr b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-3.exr
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-3.exr
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-3.exr
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-3.exr.meta b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-3.exr.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-3.exr.meta
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-3.exr.meta
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-4.exr b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-4.exr
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-4.exr
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-4.exr
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-4.exr.meta b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-4.exr.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-4.exr.meta
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-4.exr.meta
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-5.exr b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-5.exr
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-5.exr
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-5.exr
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-5.exr.meta b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-5.exr.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-5.exr.meta
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-5.exr.meta
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-6.exr b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-6.exr
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-6.exr
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-6.exr
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-6.exr.meta b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-6.exr.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-6.exr.meta
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-6.exr.meta
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-7.exr b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-7.exr
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-7.exr
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-7.exr
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-7.exr.meta b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-7.exr.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-7.exr.meta
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-7.exr.meta
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-8.exr b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-8.exr
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-8.exr
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-8.exr
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-8.exr.meta b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-8.exr.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-8.exr.meta
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-8.exr.meta
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-9.exr b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-9.exr
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-9.exr
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-9.exr
diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-9.exr.meta b/com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-9.exr.meta
similarity index 100%
rename from com.unity.template-hd/Assets/SampleSceneAssets/Scenes/SampleScene/ReflectionProbe-9.exr.meta
rename to com.unity.template-hd/Assets/Scenes/SampleScene/ReflectionProbe-9.exr.meta
diff --git a/com.unity.template-hd/Packages/com.unity.template.hd/CHANGELOG.md b/com.unity.template-hd/Packages/com.unity.template.hd/CHANGELOG.md
index 0aac69488f2..e8b3d5036ef 100644
--- a/com.unity.template-hd/Packages/com.unity.template.hd/CHANGELOG.md
+++ b/com.unity.template-hd/Packages/com.unity.template.hd/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project template will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [13.1.0] - 2021-09-28
+
+### Changed
+- Update manifest to include required packages
+
 ## [13.0.0] - 2021-09-01
 
 ### Changed
diff --git a/com.unity.template-hd/Packages/com.unity.template.hd/ValidationExceptions.json b/com.unity.template-hd/Packages/com.unity.template.hd/ValidationExceptions.json
index 2d01d2c75ce..b4bfdd557db 100644
--- a/com.unity.template-hd/Packages/com.unity.template.hd/ValidationExceptions.json
+++ b/com.unity.template-hd/Packages/com.unity.template.hd/ValidationExceptions.json
@@ -2,7 +2,7 @@
   "ErrorExceptions": [
     {
       "ValidationTest": "Primed Library Validation",
-      "PackageVersion": "13.0.0"
+      "PackageVersion": "13.1.0"
     }
   ],
   "WarningExceptions": []
diff --git a/com.unity.template-hd/Packages/com.unity.template.hd/package.json b/com.unity.template-hd/Packages/com.unity.template.hd/package.json
index a894ab8c204..fe16f028782 100644
--- a/com.unity.template-hd/Packages/com.unity.template.hd/package.json
+++ b/com.unity.template-hd/Packages/com.unity.template.hd/package.json
@@ -1,15 +1,20 @@
 {
   "name": "com.unity.template.hd",
   "displayName": "High Definition RP",
-  "version": "13.0.0",
+  "version": "13.1.0",
   "type": "template",
   "host": "hub",
   "unity": "2022.1",
   "description": "This template utilizes the High Definition Render Pipeline. Making it a good starting point for people focused on high-end graphics that want to develop games for platforms that support Shader Model 5.0 (DX11 and above). \n\nBeyond being tuned for High End visuals this project includes\n\u25aa Shadergraph \n\u25aa Visual Effect Graph  \n\u25aa Presets \n\u25aa Example content",
   "dependencies": {
+    "com.unity.collab-proxy": "1.9.0",
+    "com.unity.feature.development": "1.0.1",
+    "com.unity.textmeshpro": "3.0.6",
     "com.unity.cinemachine": "2.8.0",
     "com.unity.inputsystem": "1.1.0-pre.5",
     "com.unity.learn.iet-framework": "2.0.0",
-    "com.unity.render-pipelines.high-definition": "13.0.0"
+    "com.unity.render-pipelines.high-definition": "13.0.0",
+    "com.unity.timeline": "1.6.2",
+    "com.unity.ugui": "1.0.0"
   }
 }
diff --git a/com.unity.template-hd/Packages/manifest.json b/com.unity.template-hd/Packages/manifest.json
index 89589dd0cee..4a17c87d2cc 100644
--- a/com.unity.template-hd/Packages/manifest.json
+++ b/com.unity.template-hd/Packages/manifest.json
@@ -1,14 +1,14 @@
 {
   "dependencies": {
     "com.unity.cinemachine": "2.8.0",
-    "com.unity.ide.rider": "3.0.7",
-    "com.unity.ide.visualstudio": "2.0.11",
-    "com.unity.ide.vscode": "1.2.3",
+    "com.unity.collab-proxy": "1.9.0",    
+    "com.unity.feature.development": "1.0.1",
     "com.unity.inputsystem": "1.1.0-pre.5",
     "com.unity.learn.iet-framework": "2.0.0",
     "com.unity.render-pipelines.high-definition": "13.0.0",
     "com.unity.learn.iet-framework.authoring": "1.0.0",
-    "com.unity.timeline": "1.6.1",
+    "com.unity.textmeshpro": "3.0.6",    
+    "com.unity.timeline": "1.6.2",
     "com.unity.ugui": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
diff --git a/com.unity.template-universal/Packages/com.unity.template.universal/CHANGELOG.md b/com.unity.template-universal/Packages/com.unity.template.universal/CHANGELOG.md
index 2d5ce6d109d..88dd18b3b70 100644
--- a/com.unity.template-universal/Packages/com.unity.template.universal/CHANGELOG.md
+++ b/com.unity.template-universal/Packages/com.unity.template.universal/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project template will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [13.1.0] - 2021-09-28
+
+### Changed
+- Update manifest to include required packages
+
 ## [13.0.0] - 2021-09-01
 
 ### Changed
diff --git a/com.unity.template-universal/Packages/com.unity.template.universal/ValidationExceptions.json b/com.unity.template-universal/Packages/com.unity.template.universal/ValidationExceptions.json
index 2d01d2c75ce..b4bfdd557db 100644
--- a/com.unity.template-universal/Packages/com.unity.template.universal/ValidationExceptions.json
+++ b/com.unity.template-universal/Packages/com.unity.template.universal/ValidationExceptions.json
@@ -2,7 +2,7 @@
   "ErrorExceptions": [
     {
       "ValidationTest": "Primed Library Validation",
-      "PackageVersion": "13.0.0"
+      "PackageVersion": "13.1.0"
     }
   ],
   "WarningExceptions": []
diff --git a/com.unity.template-universal/Packages/com.unity.template.universal/package.json b/com.unity.template-universal/Packages/com.unity.template.universal/package.json
index ade85592655..ca75a338f78 100644
--- a/com.unity.template-universal/Packages/com.unity.template.universal/package.json
+++ b/com.unity.template-universal/Packages/com.unity.template.universal/package.json
@@ -1,12 +1,20 @@
 {
   "name": "com.unity.template.universal",
   "displayName": "Universal Render Pipeline",
-  "version": "13.0.0",
+  "version": "13.1.0",
   "type": "template",
   "unity": "2022.1",
   "host": "hub",
   "description": "The Universal Render Pipeline Template configures Project settings for Projects where performance, wide platform support, and ease of customizing graphics are the primary considerations.\n\nThis Template uses the Universal Render Pipeline (URP) and Shader Graph. URP is prebuilt Scriptable Render Pipeline that is quick and easy to customize, and lets you create optimized graphics across a wide range of platforms. URP also includes an optimized 2D renderer complete with 2D lights and pixel perfect rendering, and an integrated post-processing solution. Shader Graph is a tool that allows you to create shaders using a visual node editor instead of writing code.\n\nThis template contains a sample Scene that contains examples of how to configure lighting settings, Materials, Shaders, and post-processing effects in URP, several preconfigured Universal Render Pipeline Assets that let you quickly swap between graphics quality levels, and Presets that have been optimized for use with URP.",
   "dependencies": {
-    "com.unity.render-pipelines.universal": "13.0.0"
+    "com.unity.2d.sprite": "1.0.0",
+    "com.unity.2d.tilemap": "1.0.0",
+    "com.unity.collab-proxy": "1.7.1",
+    "com.unity.feature.development": "1.0.1",
+    "com.unity.render-pipelines.universal": "13.0.0",
+    "com.unity.textmeshpro": "3.0.6",
+    "com.unity.timeline": "1.6.2",
+    "com.unity.ugui": "1.0.0",
+    "com.unity.xr.legacyinputhelpers": "2.1.8"
   }
 }
diff --git a/com.unity.template-universal/Packages/manifest.json b/com.unity.template-universal/Packages/manifest.json
index 00b4decb3bb..f9590d61dae 100644
--- a/com.unity.template-universal/Packages/manifest.json
+++ b/com.unity.template-universal/Packages/manifest.json
@@ -2,18 +2,12 @@
   "dependencies": {
     "com.unity.2d.sprite": "1.0.0",
     "com.unity.2d.tilemap": "1.0.0",
-    "com.unity.ads": "3.7.1",
-    "com.unity.analytics": "3.6.11",
     "com.unity.collab-proxy": "1.7.1",
-    "com.unity.ext.nunit": "1.0.6",
-    "com.unity.ide.rider": "3.0.7",
-    "com.unity.ide.visualstudio": "2.0.9",
-    "com.unity.ide.vscode": "1.2.3",
-    "com.unity.purchasing": "3.2.2",
+    "com.unity.feature.development": "1.0.1",
     "com.unity.render-pipelines.universal": "13.0.0",
     "com.unity.test-framework": "1.1.29",
     "com.unity.textmeshpro": "3.0.6",
-    "com.unity.timeline": "1.6.1",
+    "com.unity.timeline": "1.6.2",
     "com.unity.ugui": "1.0.0",
     "com.unity.xr.legacyinputhelpers": "2.1.8",
     "com.unity.modules.ai": "1.0.0",