diff --git a/Samples~/AvatarCreatorSamples/SimpleAvatarCreator/Scripts/ReadyPlayerMe.Core.SimpleAvatarCreator.asmdef b/Samples~/AvatarCreatorSamples/SimpleAvatarCreator/ReadyPlayerMe.Samples.SimpleAvatarCreator.asmdef
similarity index 68%
rename from Samples~/AvatarCreatorSamples/SimpleAvatarCreator/Scripts/ReadyPlayerMe.Core.SimpleAvatarCreator.asmdef
rename to Samples~/AvatarCreatorSamples/SimpleAvatarCreator/ReadyPlayerMe.Samples.SimpleAvatarCreator.asmdef
index 2a8fcedb..eba7ed0e 100644
--- a/Samples~/AvatarCreatorSamples/SimpleAvatarCreator/Scripts/ReadyPlayerMe.Core.SimpleAvatarCreator.asmdef
+++ b/Samples~/AvatarCreatorSamples/SimpleAvatarCreator/ReadyPlayerMe.Samples.SimpleAvatarCreator.asmdef
@@ -1,9 +1,9 @@
 {
-    "name": "ReadyPlayerMe.Core.SimpleAvatarCreator",
+    "name": "ReadyPlayerMe.Samples.SimpleAvatarCreator",
     "rootNamespace": "",
     "references": [
-        "GUID:17748b800004d56448cf421c62fb675b",
-        "GUID:96af4ea235d92d245a095007c6ca3701"
+        "ReadyPlayerMe.AvatarCreator",
+        "ReadyPlayerMe.Core"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
diff --git a/Samples~/AvatarCreatorSamples/SimpleAvatarCreator/Scripts/ReadyPlayerMe.Core.SimpleAvatarCreator.asmdef.meta b/Samples~/AvatarCreatorSamples/SimpleAvatarCreator/ReadyPlayerMe.Samples.SimpleAvatarCreator.asmdef.meta
similarity index 100%
rename from Samples~/AvatarCreatorSamples/SimpleAvatarCreator/Scripts/ReadyPlayerMe.Core.SimpleAvatarCreator.asmdef.meta
rename to Samples~/AvatarCreatorSamples/SimpleAvatarCreator/ReadyPlayerMe.Samples.SimpleAvatarCreator.asmdef.meta
diff --git a/Samples~/AvatarCreatorSamples/SimpleAvatarCreator/Scripts/SimpleAvatarCreator.cs b/Samples~/AvatarCreatorSamples/SimpleAvatarCreator/Scripts/SimpleAvatarCreator.cs
index 4fc34375..c4f9a2f6 100644
--- a/Samples~/AvatarCreatorSamples/SimpleAvatarCreator/Scripts/SimpleAvatarCreator.cs
+++ b/Samples~/AvatarCreatorSamples/SimpleAvatarCreator/Scripts/SimpleAvatarCreator.cs
@@ -6,7 +6,7 @@
 #pragma warning disable CS4014
 #pragma warning disable CS1998 
 
-namespace ReadyPlayerMe
+namespace ReadyPlayerMe.Samples.SimpleAvatarCreator
 {
     public class SimpleAvatarCreator : MonoBehaviour
     {
diff --git a/Samples~/AvatarLoadingSamples/AvatarLoading/AvatarLoadingExample.cs b/Samples~/AvatarLoadingSamples/AvatarLoading/AvatarLoadingExample.cs
index 3e7cae21..852c4766 100644
--- a/Samples~/AvatarLoadingSamples/AvatarLoading/AvatarLoadingExample.cs
+++ b/Samples~/AvatarLoadingSamples/AvatarLoading/AvatarLoadingExample.cs
@@ -1,7 +1,7 @@
 using ReadyPlayerMe.Core;
 using UnityEngine;
 
-namespace ReadyPlayerMe.Samples
+namespace ReadyPlayerMe.Samples.AvatarLoading
 {
     /// <summary>
     /// This class is a simple <see cref="Monobehaviour"/>  to serve as an example on how to load Ready Player Me avatars and spawn as a <see cref="GameObject"/> into the scene.
diff --git a/Samples~/AvatarLoadingSamples/AvatarLod/AvatarLodExample.cs b/Samples~/AvatarLoadingSamples/AvatarLod/AvatarLodExample.cs
index 82260917..e1fad3c1 100644
--- a/Samples~/AvatarLoadingSamples/AvatarLod/AvatarLodExample.cs
+++ b/Samples~/AvatarLoadingSamples/AvatarLod/AvatarLodExample.cs
@@ -3,7 +3,7 @@
 using ReadyPlayerMe.Core;
 using UnityEngine;
 
-namespace ReadyPlayerMe.Samples
+namespace ReadyPlayerMe.Samples.AvatarLoading
 {
     /// <summary>
     ///     This class is a simple <see cref="Monobehaviour"/> to serve as an example on how to load a Ready Player Me avatar with multiple LOD's (level of detail) and spawn as a <see cref="GameObject"/> into the scene at runtime.
diff --git a/Samples~/AvatarLoadingSamples/AvatarLod/AvatarLodExampleUI.cs b/Samples~/AvatarLoadingSamples/AvatarLod/AvatarLodExampleUI.cs
index aa86619b..09a38d00 100644
--- a/Samples~/AvatarLoadingSamples/AvatarLod/AvatarLodExampleUI.cs
+++ b/Samples~/AvatarLoadingSamples/AvatarLod/AvatarLodExampleUI.cs
@@ -2,7 +2,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace ReadyPlayerMe.Samples
+namespace ReadyPlayerMe.Samples.AvatarLoading
 {
     public class AvatarLodExampleUI : MonoBehaviour
     {
diff --git a/Samples~/AvatarLoadingSamples/MultipleAvatarLoading/MultipleAvatarLoadingExample.cs b/Samples~/AvatarLoadingSamples/MultipleAvatarLoading/MultipleAvatarLoadingExample.cs
index c618be18..e4aa0b8e 100644
--- a/Samples~/AvatarLoadingSamples/MultipleAvatarLoading/MultipleAvatarLoadingExample.cs
+++ b/Samples~/AvatarLoadingSamples/MultipleAvatarLoading/MultipleAvatarLoadingExample.cs
@@ -3,7 +3,7 @@
 using ReadyPlayerMe.Core;
 using UnityEngine;
 
-namespace ReadyPlayerMe.Samples
+namespace ReadyPlayerMe.Samples.AvatarLoading
 {
     /// <summary>
     /// This class is a simple <see cref="Monobehaviour"/>  to serve as an example on how to load Ready Player Me avatars and spawn as a <see cref="GameObject"/> into the scene.
diff --git a/Samples~/AvatarLoadingSamples/MultipleQualityAvatarLoading/MultipleQualityAvatarLoadingExample.cs b/Samples~/AvatarLoadingSamples/MultipleQualityAvatarLoading/MultipleQualityAvatarLoadingExample.cs
index 9caf991d..06bfbaf9 100644
--- a/Samples~/AvatarLoadingSamples/MultipleQualityAvatarLoading/MultipleQualityAvatarLoadingExample.cs
+++ b/Samples~/AvatarLoadingSamples/MultipleQualityAvatarLoading/MultipleQualityAvatarLoadingExample.cs
@@ -5,7 +5,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace ReadyPlayerMe.Samples
+namespace ReadyPlayerMe.Samples.AvatarLoading
 {
     public class MultipleQualityAvatarLoadingExample : MonoBehaviour
     {
diff --git a/Samples~/AvatarLoadingSamples/ReadyPlayerMe.Samples.AvatarLoading.asmdef b/Samples~/AvatarLoadingSamples/ReadyPlayerMe.Samples.AvatarLoading.asmdef
new file mode 100644
index 00000000..5339e9cd
--- /dev/null
+++ b/Samples~/AvatarLoadingSamples/ReadyPlayerMe.Samples.AvatarLoading.asmdef
@@ -0,0 +1,16 @@
+{
+    "name": "ReadyPlayerMe.Samples.AvatarLoading",
+    "rootNamespace": "",
+    "references": [
+        "ReadyPlayerMe.Core"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
\ No newline at end of file
diff --git a/Samples~/AvatarLoadingSamples/ReadyPlayerMe.Samples.AvatarLoading.asmdef.meta b/Samples~/AvatarLoadingSamples/ReadyPlayerMe.Samples.AvatarLoading.asmdef.meta
new file mode 100644
index 00000000..d16b481e
--- /dev/null
+++ b/Samples~/AvatarLoadingSamples/ReadyPlayerMe.Samples.AvatarLoading.asmdef.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b7665bce58a1de546a53a59dc2154359
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Samples~/AvatarRenderSamples/MultipleRenders/RenderPanel.cs b/Samples~/AvatarRenderSamples/MultipleRenders/RenderPanel.cs
index 8870858f..92d0b0de 100644
--- a/Samples~/AvatarRenderSamples/MultipleRenders/RenderPanel.cs
+++ b/Samples~/AvatarRenderSamples/MultipleRenders/RenderPanel.cs
@@ -2,7 +2,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace ReadyPlayerMe.Samples
+namespace ReadyPlayerMe.Samples.AvatarRenders
 {
     public class RenderPanel : MonoBehaviour
     {
diff --git a/Samples~/AvatarRenderSamples/ReadyPlayerMe.Samples.AvatarRenders.asmdef b/Samples~/AvatarRenderSamples/ReadyPlayerMe.Samples.AvatarRenders.asmdef
new file mode 100644
index 00000000..98efaa8c
--- /dev/null
+++ b/Samples~/AvatarRenderSamples/ReadyPlayerMe.Samples.AvatarRenders.asmdef
@@ -0,0 +1,16 @@
+{
+    "name": "ReadyPlayerMe.Samples.AvatarRenders",
+    "rootNamespace": "",
+    "references": [
+        "ReadyPlayerMe.Core"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
\ No newline at end of file
diff --git a/Samples~/AvatarRenderSamples/ReadyPlayerMe.Samples.AvatarRenders.asmdef.meta b/Samples~/AvatarRenderSamples/ReadyPlayerMe.Samples.AvatarRenders.asmdef.meta
new file mode 100644
index 00000000..fb1b2e94
--- /dev/null
+++ b/Samples~/AvatarRenderSamples/ReadyPlayerMe.Samples.AvatarRenders.asmdef.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8efa46cf89bf70f499a67383a7b760d4
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Samples~/QuickStart/ReadyPlayerMe.Samples.QuickStart.asmdef b/Samples~/QuickStart/ReadyPlayerMe.Samples.QuickStart.asmdef
new file mode 100644
index 00000000..3ad12c2b
--- /dev/null
+++ b/Samples~/QuickStart/ReadyPlayerMe.Samples.QuickStart.asmdef
@@ -0,0 +1,16 @@
+{
+    "name": "ReadyPlayerMe.Samples.QuickStart",
+    "rootNamespace": "",
+    "references": [
+        "ReadyPlayerMe.Core"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
\ No newline at end of file
diff --git a/Samples~/QuickStart/ReadyPlayerMe.Samples.QuickStart.asmdef.meta b/Samples~/QuickStart/ReadyPlayerMe.Samples.QuickStart.asmdef.meta
new file mode 100644
index 00000000..bb0e2f5e
--- /dev/null
+++ b/Samples~/QuickStart/ReadyPlayerMe.Samples.QuickStart.asmdef.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a92b285006c4dce4cabcf44d083f4e5a
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Samples~/QuickStart/Scripts/CameraFollow.cs b/Samples~/QuickStart/Scripts/CameraFollow.cs
index 187678e4..d7d6d8ea 100644
--- a/Samples~/QuickStart/Scripts/CameraFollow.cs
+++ b/Samples~/QuickStart/Scripts/CameraFollow.cs
@@ -1,7 +1,7 @@
 using ReadyPlayerMe.Core;
 using UnityEngine;
 
-namespace ReadyPlayerMe.Samples
+namespace ReadyPlayerMe.Samples.QuickStart
 {
     public class CameraFollow : MonoBehaviour
     {
diff --git a/Samples~/QuickStart/Scripts/CameraOrbit.cs b/Samples~/QuickStart/Scripts/CameraOrbit.cs
index a2c6a9ee..8a84e5e7 100644
--- a/Samples~/QuickStart/Scripts/CameraOrbit.cs
+++ b/Samples~/QuickStart/Scripts/CameraOrbit.cs
@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace ReadyPlayerMe.Samples
+namespace ReadyPlayerMe.Samples.QuickStart
 {
     public class CameraOrbit : MonoBehaviour
     {
diff --git a/Samples~/QuickStart/Scripts/GroundCheck.cs b/Samples~/QuickStart/Scripts/GroundCheck.cs
index c229da1a..cd6afa55 100644
--- a/Samples~/QuickStart/Scripts/GroundCheck.cs
+++ b/Samples~/QuickStart/Scripts/GroundCheck.cs
@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace ReadyPlayerMe.Samples
+namespace ReadyPlayerMe.Samples.QuickStart
 {
     public class GroundCheck : MonoBehaviour
     {
diff --git a/Samples~/QuickStart/Scripts/LoadingAnimation.cs b/Samples~/QuickStart/Scripts/LoadingAnimation.cs
index 49ed35b6..15591ead 100644
--- a/Samples~/QuickStart/Scripts/LoadingAnimation.cs
+++ b/Samples~/QuickStart/Scripts/LoadingAnimation.cs
@@ -4,7 +4,7 @@
 using UnityEngine;
 using ReadyPlayerMe;
 
-namespace ReadyPlayerMe.Samples
+namespace ReadyPlayerMe.Samples.QuickStart
 {
     public class LoadingAnimation : MonoBehaviour
     {
diff --git a/Samples~/QuickStart/Scripts/LookAtCamera.cs b/Samples~/QuickStart/Scripts/LookAtCamera.cs
index 9bcbb9ae..10b4406c 100644
--- a/Samples~/QuickStart/Scripts/LookAtCamera.cs
+++ b/Samples~/QuickStart/Scripts/LookAtCamera.cs
@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace ReadyPlayerMe.Samples
+namespace ReadyPlayerMe.Samples.QuickStart
 {
     public class LookAtCamera : MonoBehaviour
     {
diff --git a/Samples~/QuickStart/Scripts/MouseCursorLock.cs b/Samples~/QuickStart/Scripts/MouseCursorLock.cs
index f78650ea..a8ddc1b3 100644
--- a/Samples~/QuickStart/Scripts/MouseCursorLock.cs
+++ b/Samples~/QuickStart/Scripts/MouseCursorLock.cs
@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace ReadyPlayerMe.Samples
+namespace ReadyPlayerMe.Samples.QuickStart
 {
     public class MouseCursorLock : MonoBehaviour
     {
diff --git a/Samples~/QuickStart/Scripts/PersonalAvatarLoader.cs b/Samples~/QuickStart/Scripts/PersonalAvatarLoader.cs
index 46c2faf3..796fa558 100644
--- a/Samples~/QuickStart/Scripts/PersonalAvatarLoader.cs
+++ b/Samples~/QuickStart/Scripts/PersonalAvatarLoader.cs
@@ -4,7 +4,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace ReadyPlayerMe.Samples
+namespace ReadyPlayerMe.Samples.QuickStart
 {
     public class PersonalAvatarLoader : MonoBehaviour
     {
diff --git a/Samples~/QuickStart/Scripts/PlayerInput.cs b/Samples~/QuickStart/Scripts/PlayerInput.cs
index 3589f032..7aebd6ef 100644
--- a/Samples~/QuickStart/Scripts/PlayerInput.cs
+++ b/Samples~/QuickStart/Scripts/PlayerInput.cs
@@ -1,7 +1,7 @@
 using System;
 using UnityEngine;
 
-namespace ReadyPlayerMe.Samples
+namespace ReadyPlayerMe.Samples.QuickStart
 {
     public class PlayerInput : MonoBehaviour
     {
diff --git a/Samples~/QuickStart/Scripts/ThirdPersonController.cs b/Samples~/QuickStart/Scripts/ThirdPersonController.cs
index 7d2e0b31..ab7fbbd7 100644
--- a/Samples~/QuickStart/Scripts/ThirdPersonController.cs
+++ b/Samples~/QuickStart/Scripts/ThirdPersonController.cs
@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace ReadyPlayerMe.Samples
+namespace ReadyPlayerMe.Samples.QuickStart
 {
     [RequireComponent(typeof(ThirdPersonMovement),typeof(PlayerInput))]
     public class ThirdPersonController : MonoBehaviour
diff --git a/Samples~/QuickStart/Scripts/ThirdPersonLoader.cs b/Samples~/QuickStart/Scripts/ThirdPersonLoader.cs
index 2ff8d039..89defdac 100644
--- a/Samples~/QuickStart/Scripts/ThirdPersonLoader.cs
+++ b/Samples~/QuickStart/Scripts/ThirdPersonLoader.cs
@@ -2,7 +2,7 @@
 using ReadyPlayerMe.Core;
 using UnityEngine;
 
-namespace ReadyPlayerMe.Samples
+namespace ReadyPlayerMe.Samples.QuickStart
 {
     public class ThirdPersonLoader : MonoBehaviour
     {
diff --git a/Samples~/QuickStart/Scripts/ThirdPersonMovement.cs b/Samples~/QuickStart/Scripts/ThirdPersonMovement.cs
index 7b691e6d..8be37d22 100644
--- a/Samples~/QuickStart/Scripts/ThirdPersonMovement.cs
+++ b/Samples~/QuickStart/Scripts/ThirdPersonMovement.cs
@@ -1,7 +1,6 @@
-using System;
 using UnityEngine;
 
-namespace ReadyPlayerMe.Samples
+namespace ReadyPlayerMe.Samples.QuickStart
 {
     [RequireComponent(typeof(CharacterController), typeof(GroundCheck))]
     public class ThirdPersonMovement : MonoBehaviour
diff --git a/Samples~/WebGLSample/Editor/EditorWindows/SampleSetup.cs b/Samples~/WebGLSample/Editor/EditorWindows/SampleSetup.cs
index f72480fd..507bf306 100644
--- a/Samples~/WebGLSample/Editor/EditorWindows/SampleSetup.cs
+++ b/Samples~/WebGLSample/Editor/EditorWindows/SampleSetup.cs
@@ -6,7 +6,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace ReadyPlayerMe.Samples
+namespace ReadyPlayerMe.Samples.WebGLSample.Editor
 {
     public static class SampleSetup
     {
diff --git a/Samples~/WebGLSample/Editor/ReadyPlayerMe.Core.WebGLSample.Editor.asmdef b/Samples~/WebGLSample/Editor/ReadyPlayerMe.Samples.WebGLSample.Editor.asmdef
similarity index 100%
rename from Samples~/WebGLSample/Editor/ReadyPlayerMe.Core.WebGLSample.Editor.asmdef
rename to Samples~/WebGLSample/Editor/ReadyPlayerMe.Samples.WebGLSample.Editor.asmdef
diff --git a/Samples~/WebGLSample/Editor/ReadyPlayerMe.Core.WebGLSample.Editor.asmdef.meta b/Samples~/WebGLSample/Editor/ReadyPlayerMe.Samples.WebGLSample.Editor.asmdef.meta
similarity index 100%
rename from Samples~/WebGLSample/Editor/ReadyPlayerMe.Core.WebGLSample.Editor.asmdef.meta
rename to Samples~/WebGLSample/Editor/ReadyPlayerMe.Samples.WebGLSample.Editor.asmdef.meta
diff --git a/Samples~/WebGLSample/ReadyPlayerMe.Core.WebGLSample.asmdef b/Samples~/WebGLSample/ReadyPlayerMe.Samples.WebGLSample.asmdef
similarity index 89%
rename from Samples~/WebGLSample/ReadyPlayerMe.Core.WebGLSample.asmdef
rename to Samples~/WebGLSample/ReadyPlayerMe.Samples.WebGLSample.asmdef
index 49283ec2..936ccd9f 100644
--- a/Samples~/WebGLSample/ReadyPlayerMe.Core.WebGLSample.asmdef
+++ b/Samples~/WebGLSample/ReadyPlayerMe.Samples.WebGLSample.asmdef
@@ -1,5 +1,5 @@
 {
-    "name": "ReadyPlayerMe.Core.WebGLSample",
+    "name": "ReadyPlayerMe.Samples.WebGLSample",
     "rootNamespace": "",
     "references": [
         "ReadyPlayerMe.Core",
diff --git a/Samples~/WebGLSample/ReadyPlayerMe.Core.WebGLSample.asmdef.meta b/Samples~/WebGLSample/ReadyPlayerMe.Samples.WebGLSample.asmdef.meta
similarity index 100%
rename from Samples~/WebGLSample/ReadyPlayerMe.Core.WebGLSample.asmdef.meta
rename to Samples~/WebGLSample/ReadyPlayerMe.Samples.WebGLSample.asmdef.meta
diff --git a/Samples~/WebGLSample/Scripts/DebugLogger.cs b/Samples~/WebGLSample/Scripts/DebugLogger.cs
index 27d4c45f..7719f42b 100644
--- a/Samples~/WebGLSample/Scripts/DebugLogger.cs
+++ b/Samples~/WebGLSample/Scripts/DebugLogger.cs
@@ -1,7 +1,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace ReadyPlayerMe.Samples
+namespace ReadyPlayerMe.Samples.WebGLSample
 {
     public class DebugLogger : MonoBehaviour
     {
diff --git a/Samples~/WebGLSample/Scripts/DemoCanvas.cs b/Samples~/WebGLSample/Scripts/DemoCanvas.cs
index 31699e8b..7b0d5c53 100644
--- a/Samples~/WebGLSample/Scripts/DemoCanvas.cs
+++ b/Samples~/WebGLSample/Scripts/DemoCanvas.cs
@@ -1,7 +1,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace ReadyPlayerMe.Samples
+namespace ReadyPlayerMe.Samples.WebGLSample
 {
     public class DemoCanvas : MonoBehaviour
     {
diff --git a/Samples~/WebGLSample/Scripts/WebFrameHandler.cs b/Samples~/WebGLSample/Scripts/WebFrameHandler.cs
index 49f85609..b000f368 100644
--- a/Samples~/WebGLSample/Scripts/WebFrameHandler.cs
+++ b/Samples~/WebGLSample/Scripts/WebFrameHandler.cs
@@ -4,7 +4,7 @@
 using ReadyPlayerMe.Core.WebView;
 using UnityEngine;
 
-namespace ReadyPlayerMe.Samples
+namespace ReadyPlayerMe.Samples.WebGLSample
 {
     public enum AutoInitialize
     {
diff --git a/Samples~/WebGLSample/Scripts/WebGLAvatarLoader.cs b/Samples~/WebGLSample/Scripts/WebGLAvatarLoader.cs
index f80d9dde..442ff3bd 100644
--- a/Samples~/WebGLSample/Scripts/WebGLAvatarLoader.cs
+++ b/Samples~/WebGLSample/Scripts/WebGLAvatarLoader.cs
@@ -2,7 +2,7 @@
 using UnityEngine;
 using BodyType = ReadyPlayerMe.Core.BodyType;
 
-namespace ReadyPlayerMe.Samples
+namespace ReadyPlayerMe.Samples.WebGLSample
 {
     [RequireComponent(typeof(WebFrameHandler))]
     public class WebGLAvatarLoader : MonoBehaviour
diff --git a/Samples~/WebGLSample/Scripts/WebInterface.cs b/Samples~/WebGLSample/Scripts/WebInterface.cs
index af2e5dc2..94e4f8e0 100644
--- a/Samples~/WebGLSample/Scripts/WebInterface.cs
+++ b/Samples~/WebGLSample/Scripts/WebInterface.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace ReadyPlayerMe.Samples
+namespace ReadyPlayerMe.Samples.WebGLSample
 {
     public static class WebInterface
     {