diff --git a/com.unity.template-hd/Assets/Tests/Editor.meta b/com.unity.template-hd/Packages/com.unity.template.hd/Tests/Editor.meta
similarity index 100%
rename from com.unity.template-hd/Assets/Tests/Editor.meta
rename to com.unity.template-hd/Packages/com.unity.template.hd/Tests/Editor.meta
diff --git a/com.unity.template-hd/Assets/Tests/Editor/InternalTests.meta b/com.unity.template-hd/Packages/com.unity.template.hd/Tests/Editor/InternalTests.meta
similarity index 100%
rename from com.unity.template-hd/Assets/Tests/Editor/InternalTests.meta
rename to com.unity.template-hd/Packages/com.unity.template.hd/Tests/Editor/InternalTests.meta
diff --git a/com.unity.template-hd/Assets/Tests/Editor/InternalTests/ExpectedSettings.cs b/com.unity.template-hd/Packages/com.unity.template.hd/Tests/Editor/InternalTests/ExpectedSettings.cs
similarity index 100%
rename from com.unity.template-hd/Assets/Tests/Editor/InternalTests/ExpectedSettings.cs
rename to com.unity.template-hd/Packages/com.unity.template.hd/Tests/Editor/InternalTests/ExpectedSettings.cs
diff --git a/com.unity.template-hd/Assets/Tests/Editor/InternalTests/ExpectedSettings.cs.meta b/com.unity.template-hd/Packages/com.unity.template.hd/Tests/Editor/InternalTests/ExpectedSettings.cs.meta
similarity index 100%
rename from com.unity.template-hd/Assets/Tests/Editor/InternalTests/ExpectedSettings.cs.meta
rename to com.unity.template-hd/Packages/com.unity.template.hd/Tests/Editor/InternalTests/ExpectedSettings.cs.meta
diff --git a/com.unity.template-hd/Assets/Tests/Editor/InternalTests/InternalTests.asmdef b/com.unity.template-hd/Packages/com.unity.template.hd/Tests/Editor/InternalTests/InternalTests.asmdef
similarity index 100%
rename from com.unity.template-hd/Assets/Tests/Editor/InternalTests/InternalTests.asmdef
rename to com.unity.template-hd/Packages/com.unity.template.hd/Tests/Editor/InternalTests/InternalTests.asmdef
diff --git a/com.unity.template-hd/Assets/Tests/Editor/InternalTests/InternalTests.asmdef.meta b/com.unity.template-hd/Packages/com.unity.template.hd/Tests/Editor/InternalTests/InternalTests.asmdef.meta
similarity index 100%
rename from com.unity.template-hd/Assets/Tests/Editor/InternalTests/InternalTests.asmdef.meta
rename to com.unity.template-hd/Packages/com.unity.template.hd/Tests/Editor/InternalTests/InternalTests.asmdef.meta
diff --git a/com.unity.template-universal/Assets/Tests/Editor.meta b/com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor.meta
similarity index 100%
rename from com.unity.template-universal/Assets/Tests/Editor.meta
rename to com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor.meta
diff --git a/com.unity.template-universal/Assets/Tests/Editor/EditorExampleTest.cs b/com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/EditorExampleTest.cs
similarity index 100%
rename from com.unity.template-universal/Assets/Tests/Editor/EditorExampleTest.cs
rename to com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/EditorExampleTest.cs
diff --git a/com.unity.template-universal/Assets/Tests/Editor/EditorExampleTest.cs.meta b/com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/EditorExampleTest.cs.meta
similarity index 100%
rename from com.unity.template-universal/Assets/Tests/Editor/EditorExampleTest.cs.meta
rename to com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/EditorExampleTest.cs.meta
diff --git a/com.unity.template-universal/Assets/Tests/Editor/EditorTests.asmdef b/com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/EditorTests.asmdef
similarity index 100%
rename from com.unity.template-universal/Assets/Tests/Editor/EditorTests.asmdef
rename to com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/EditorTests.asmdef
diff --git a/com.unity.template-universal/Assets/Tests/Editor/EditorTests.asmdef.meta b/com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/EditorTests.asmdef.meta
similarity index 100%
rename from com.unity.template-universal/Assets/Tests/Editor/EditorTests.asmdef.meta
rename to com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/EditorTests.asmdef.meta
diff --git a/com.unity.template-universal/Assets/Tests/Editor/InternalTests.meta b/com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/InternalTests.meta
similarity index 100%
rename from com.unity.template-universal/Assets/Tests/Editor/InternalTests.meta
rename to com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/InternalTests.meta
diff --git a/com.unity.template-universal/Assets/Tests/Editor/InternalTests/ExpectedSettings.cs b/com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/InternalTests/ExpectedSettings.cs
similarity index 100%
rename from com.unity.template-universal/Assets/Tests/Editor/InternalTests/ExpectedSettings.cs
rename to com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/InternalTests/ExpectedSettings.cs
diff --git a/com.unity.template-universal/Assets/Tests/Editor/InternalTests/ExpectedSettings.cs.meta b/com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/InternalTests/ExpectedSettings.cs.meta
similarity index 100%
rename from com.unity.template-universal/Assets/Tests/Editor/InternalTests/ExpectedSettings.cs.meta
rename to com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/InternalTests/ExpectedSettings.cs.meta
diff --git a/com.unity.template-universal/Assets/Tests/Editor/InternalTests/InternalTests.asmdef b/com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/InternalTests/InternalTests.asmdef
similarity index 100%
rename from com.unity.template-universal/Assets/Tests/Editor/InternalTests/InternalTests.asmdef
rename to com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/InternalTests/InternalTests.asmdef
diff --git a/com.unity.template-universal/Assets/Tests/Editor/InternalTests/InternalTests.asmdef.meta b/com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/InternalTests/InternalTests.asmdef.meta
similarity index 100%
rename from com.unity.template-universal/Assets/Tests/Editor/InternalTests/InternalTests.asmdef.meta
rename to com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/InternalTests/InternalTests.asmdef.meta
diff --git a/com.unity.template-universal/Assets/Tests/Runtime.meta b/com.unity.template-universal/Packages/com.unity.template.universal/Tests/Runtime.meta
similarity index 100%
rename from com.unity.template-universal/Assets/Tests/Runtime.meta
rename to com.unity.template-universal/Packages/com.unity.template.universal/Tests/Runtime.meta
diff --git a/com.unity.template-universal/Assets/Tests/Runtime/RuntimeExampleTest.cs b/com.unity.template-universal/Packages/com.unity.template.universal/Tests/Runtime/RuntimeExampleTest.cs
similarity index 100%
rename from com.unity.template-universal/Assets/Tests/Runtime/RuntimeExampleTest.cs
rename to com.unity.template-universal/Packages/com.unity.template.universal/Tests/Runtime/RuntimeExampleTest.cs
diff --git a/com.unity.template-universal/Assets/Tests/Runtime/RuntimeExampleTest.cs.meta b/com.unity.template-universal/Packages/com.unity.template.universal/Tests/Runtime/RuntimeExampleTest.cs.meta
similarity index 100%
rename from com.unity.template-universal/Assets/Tests/Runtime/RuntimeExampleTest.cs.meta
rename to com.unity.template-universal/Packages/com.unity.template.universal/Tests/Runtime/RuntimeExampleTest.cs.meta
diff --git a/com.unity.template-universal/Assets/Tests/Runtime/RuntimeTests.asmdef b/com.unity.template-universal/Packages/com.unity.template.universal/Tests/Runtime/RuntimeTests.asmdef
similarity index 100%
rename from com.unity.template-universal/Assets/Tests/Runtime/RuntimeTests.asmdef
rename to com.unity.template-universal/Packages/com.unity.template.universal/Tests/Runtime/RuntimeTests.asmdef
diff --git a/com.unity.template-universal/Assets/Tests/Runtime/RuntimeTests.asmdef.meta b/com.unity.template-universal/Packages/com.unity.template.universal/Tests/Runtime/RuntimeTests.asmdef.meta
similarity index 100%
rename from com.unity.template-universal/Assets/Tests/Runtime/RuntimeTests.asmdef.meta
rename to com.unity.template-universal/Packages/com.unity.template.universal/Tests/Runtime/RuntimeTests.asmdef.meta