diff --git a/Editor/ubc.ok.ovilab.HPUI.Editor.asmdef b/Editor/Assets_v1/ubc.ok.ovilab.HPUI.Editor.asmdef
similarity index 100%
rename from Editor/ubc.ok.ovilab.HPUI.Editor.asmdef
rename to Editor/Assets_v1/ubc.ok.ovilab.HPUI.Editor.asmdef
diff --git a/Editor/Assets_v1/ubc.ok.ovilab.HPUI.Editor.asmdef.meta b/Editor/Assets_v1/ubc.ok.ovilab.HPUI.Editor.asmdef.meta
new file mode 100644
index 0000000..5dd0a9c
--- /dev/null
+++ b/Editor/Assets_v1/ubc.ok.ovilab.HPUI.Editor.asmdef.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8919afd4804bddf498d53b4ad7f03675
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/ConditionalFieldAttributeDrawer.cs b/Editor/ConditionalFieldAttributeDrawer.cs
index 70dba17..34db2e1 100644
--- a/Editor/ConditionalFieldAttributeDrawer.cs
+++ b/Editor/ConditionalFieldAttributeDrawer.cs
@@ -1,7 +1,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace ubco.ovi.HPUI.Editor
+namespace ubco.ovilab.HPUI.Editor
 {
     [CustomPropertyDrawer(typeof(ConditionalFieldAttribute))]
     public class ConditionalFieldAttributeDrawer : PropertyDrawer
diff --git a/Editor/ubco.ovilab.HPUI.Editor.asmdef b/Editor/ubco.ovilab.HPUI.Editor.asmdef
new file mode 100644
index 0000000..1201f82
--- /dev/null
+++ b/Editor/ubco.ovilab.HPUI.Editor.asmdef
@@ -0,0 +1,18 @@
+{
+    "name": "ubco.ovilab.HPUI.Editor",
+    "rootNamespace": "ubco.ovilab.HPUI.Editor",
+    "references": [
+        "ubco.ovilab.HPUI"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
\ No newline at end of file
diff --git a/Editor/ubc.ok.ovilab.HPUI.Editor.asmdef.meta b/Editor/ubco.ovilab.HPUI.Editor.asmdef.meta
similarity index 100%
rename from Editor/ubc.ok.ovilab.HPUI.Editor.asmdef.meta
rename to Editor/ubco.ovilab.HPUI.Editor.asmdef.meta
diff --git a/Runtime/Assets_v1/Scripts/ubc.ok.ovilab.HPUI.asmdef b/Runtime/Assets_v1/Scripts/ubc.ok.ovilab.HPUI.asmdef
new file mode 100644
index 0000000..71d9731
--- /dev/null
+++ b/Runtime/Assets_v1/Scripts/ubc.ok.ovilab.HPUI.asmdef
@@ -0,0 +1,14 @@
+{
+    "name": "ubc.ok.ovilab.HPUI",
+    "rootNamespace": "ubc.ok.ovilab.HPUI",
+    "references": [],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
\ No newline at end of file
diff --git a/Runtime/Assets_v1/Scripts/ubc.ok.ovilab.HPUI.asmdef.meta b/Runtime/Assets_v1/Scripts/ubc.ok.ovilab.HPUI.asmdef.meta
new file mode 100644
index 0000000..ae9ed4e
--- /dev/null
+++ b/Runtime/Assets_v1/Scripts/ubc.ok.ovilab.HPUI.asmdef.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f4db820f428125a40aaad6bcf66dff06
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Runtime/Interactions/HPUIBaseInteractable.cs b/Runtime/Interactions/HPUIBaseInteractable.cs
index bf820d0..d3fb5fc 100644
--- a/Runtime/Interactions/HPUIBaseInteractable.cs
+++ b/Runtime/Interactions/HPUIBaseInteractable.cs
@@ -3,7 +3,7 @@
 using UnityEngine.XR.Interaction.Toolkit;
 using UnityEngine.XR.Interaction.Toolkit.Filtering;
 
-namespace ubco.ovi.HPUI.Core
+namespace ubco.ovilab.HPUI.Core
 {
     /// <summary>
     /// Base HPUI interactable.
diff --git a/Runtime/Interactions/HPUITargetFilter.cs b/Runtime/Interactions/HPUITargetFilter.cs
index ace15a7..103988c 100644
--- a/Runtime/Interactions/HPUITargetFilter.cs
+++ b/Runtime/Interactions/HPUITargetFilter.cs
@@ -5,7 +5,7 @@
 using UnityEngine.XR.Interaction.Toolkit;
 using UnityEngine.XR.Interaction.Toolkit.Filtering;
 
-namespace ubco.ovi.HPUI.Core
+namespace ubco.ovilab.HPUI.Core
 {
     /// <summary>
     /// Target filter that uses only the respective interactables.
diff --git a/Runtime/Tracking/HandJointData.cs b/Runtime/Tracking/HandJointData.cs
index 01a5c92..4388970 100644
--- a/Runtime/Tracking/HandJointData.cs
+++ b/Runtime/Tracking/HandJointData.cs
@@ -4,7 +4,7 @@
 using UnityEngine.XR.Hands;
 using Unity.XR.CoreUtils;
 
-namespace ubco.ovi.HPUI.Core
+namespace ubco.ovilab.HPUI.Core
 {
     /// <summary>
     /// Utility class to expose joint data accessible.
diff --git a/Runtime/Tracking/JointFollower.cs b/Runtime/Tracking/JointFollower.cs
index 0113770..30917f1 100644
--- a/Runtime/Tracking/JointFollower.cs
+++ b/Runtime/Tracking/JointFollower.cs
@@ -2,7 +2,7 @@
 using UnityEngine;
 using UnityEngine.XR.Hands;
 
-namespace ubco.ovi.HPUI.Core
+namespace ubco.ovilab.HPUI.Core
 {
     /// <summary>
     /// A component that makes the object follow a hand joint
diff --git a/Runtime/Utilities/ConditionalFieldAttribute.cs b/Runtime/Utilities/ConditionalFieldAttribute.cs
index a881691..f8455ed 100644
--- a/Runtime/Utilities/ConditionalFieldAttribute.cs
+++ b/Runtime/Utilities/ConditionalFieldAttribute.cs
@@ -1,7 +1,7 @@
 using System;
 using UnityEngine;
 
-namespace ubco.ovi.HPUI
+namespace ubco.ovilab.HPUI
 {
     // Based on https://github.com/Deadcows/MyBox/blob/master/Attributes/ConditionalFieldAttribute.cs
     /// <summary>
diff --git a/Runtime/ubc.ok.ovilab.HPUI.asmdef b/Runtime/ubco.ovilab.HPUI.asmdef
similarity index 84%
rename from Runtime/ubc.ok.ovilab.HPUI.asmdef
rename to Runtime/ubco.ovilab.HPUI.asmdef
index 5ca7ad3..934cae0 100644
--- a/Runtime/ubc.ok.ovilab.HPUI.asmdef
+++ b/Runtime/ubco.ovilab.HPUI.asmdef
@@ -1,6 +1,6 @@
 {
-    "name": "ubc.ok.ovilab.HPUI",
-    "rootNamespace": "ubc.ok.ovilab.HPUI",
+    "name": "ubco.ovilab.HPUI",
+    "rootNamespace": "ubco.ovilab.HPUI",
     "references": [
         "Unity.XR.Hands",
         "Unity.XR.CoreUtils",
diff --git a/Runtime/ubc.ok.ovilab.HPUI.asmdef.meta b/Runtime/ubco.ovilab.HPUI.asmdef.meta
similarity index 100%
rename from Runtime/ubc.ok.ovilab.HPUI.asmdef.meta
rename to Runtime/ubco.ovilab.HPUI.asmdef.meta