diff --git a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/ControllerLeft.prefab b/Assets/MRTK/SDK/StandardAssets/Controllers/ControllerLeft.prefab
similarity index 100%
rename from Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/ControllerLeft.prefab
rename to Assets/MRTK/SDK/StandardAssets/Controllers/ControllerLeft.prefab
diff --git a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/ControllerLeft.prefab.meta b/Assets/MRTK/SDK/StandardAssets/Controllers/ControllerLeft.prefab.meta
similarity index 100%
rename from Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/ControllerLeft.prefab.meta
rename to Assets/MRTK/SDK/StandardAssets/Controllers/ControllerLeft.prefab.meta
diff --git a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/ControllerRight.prefab b/Assets/MRTK/SDK/StandardAssets/Controllers/ControllerRight.prefab
similarity index 100%
rename from Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/ControllerRight.prefab
rename to Assets/MRTK/SDK/StandardAssets/Controllers/ControllerRight.prefab
diff --git a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/ControllerRight.prefab.meta b/Assets/MRTK/SDK/StandardAssets/Controllers/ControllerRight.prefab.meta
similarity index 100%
rename from Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/ControllerRight.prefab.meta
rename to Assets/MRTK/SDK/StandardAssets/Controllers/ControllerRight.prefab.meta
diff --git a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/GizmoLeft.prefab b/Assets/MRTK/SDK/StandardAssets/Controllers/GizmoLeft.prefab
similarity index 100%
rename from Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/GizmoLeft.prefab
rename to Assets/MRTK/SDK/StandardAssets/Controllers/GizmoLeft.prefab
diff --git a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/GizmoLeft.prefab.meta b/Assets/MRTK/SDK/StandardAssets/Controllers/GizmoLeft.prefab.meta
similarity index 100%
rename from Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/GizmoLeft.prefab.meta
rename to Assets/MRTK/SDK/StandardAssets/Controllers/GizmoLeft.prefab.meta
diff --git a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/GizmoRight.prefab b/Assets/MRTK/SDK/StandardAssets/Controllers/GizmoRight.prefab
similarity index 100%
rename from Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/GizmoRight.prefab
rename to Assets/MRTK/SDK/StandardAssets/Controllers/GizmoRight.prefab
diff --git a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/GizmoRight.prefab.meta b/Assets/MRTK/SDK/StandardAssets/Controllers/GizmoRight.prefab.meta
similarity index 100%
rename from Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/GizmoRight.prefab.meta
rename to Assets/MRTK/SDK/StandardAssets/Controllers/GizmoRight.prefab.meta
diff --git a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/HandSkeleton.prefab b/Assets/MRTK/SDK/StandardAssets/Controllers/HandSkeleton.prefab
similarity index 100%
rename from Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/HandSkeleton.prefab
rename to Assets/MRTK/SDK/StandardAssets/Controllers/HandSkeleton.prefab
diff --git a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/HandSkeleton.prefab.meta b/Assets/MRTK/SDK/StandardAssets/Controllers/HandSkeleton.prefab.meta
similarity index 100%
rename from Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/HandSkeleton.prefab.meta
rename to Assets/MRTK/SDK/StandardAssets/Controllers/HandSkeleton.prefab.meta
diff --git a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/ObsoleteHandSkeleton.prefab b/Assets/MRTK/SDK/StandardAssets/Controllers/ObsoleteHandSkeleton.prefab
similarity index 100%
rename from Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/ObsoleteHandSkeleton.prefab
rename to Assets/MRTK/SDK/StandardAssets/Controllers/ObsoleteHandSkeleton.prefab
diff --git a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/ObsoleteHandSkeleton.prefab.meta b/Assets/MRTK/SDK/StandardAssets/Controllers/ObsoleteHandSkeleton.prefab.meta
similarity index 100%
rename from Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/ObsoleteHandSkeleton.prefab.meta
rename to Assets/MRTK/SDK/StandardAssets/Controllers/ObsoleteHandSkeleton.prefab.meta
diff --git a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/OculusControllerLeft.prefab b/Assets/MRTK/SDK/StandardAssets/Controllers/OculusControllerLeft.prefab
similarity index 100%
rename from Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/OculusControllerLeft.prefab
rename to Assets/MRTK/SDK/StandardAssets/Controllers/OculusControllerLeft.prefab
diff --git a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/OculusControllerLeft.prefab.meta b/Assets/MRTK/SDK/StandardAssets/Controllers/OculusControllerLeft.prefab.meta
similarity index 100%
rename from Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/OculusControllerLeft.prefab.meta
rename to Assets/MRTK/SDK/StandardAssets/Controllers/OculusControllerLeft.prefab.meta
diff --git a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/OculusControllerRight.prefab b/Assets/MRTK/SDK/StandardAssets/Controllers/OculusControllerRight.prefab
similarity index 100%
rename from Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/OculusControllerRight.prefab
rename to Assets/MRTK/SDK/StandardAssets/Controllers/OculusControllerRight.prefab
diff --git a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/OculusControllerRight.prefab.meta b/Assets/MRTK/SDK/StandardAssets/Controllers/OculusControllerRight.prefab.meta
similarity index 100%
rename from Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/OculusControllerRight.prefab.meta
rename to Assets/MRTK/SDK/StandardAssets/Controllers/OculusControllerRight.prefab.meta
diff --git a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models.meta b/Assets/MRTK/SDK/StandardAssets/Controllers/Visuals.meta
similarity index 100%
rename from Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models.meta
rename to Assets/MRTK/SDK/StandardAssets/Controllers/Visuals.meta
diff --git a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers.meta b/Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Gizmos.meta
similarity index 77%
rename from Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers.meta
rename to Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Gizmos.meta
index 83ada6e8793..fc2417b4961 100644
--- a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers.meta
+++ b/Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Gizmos.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5db8af8e879c486ab4c24e155ec0eb3a
+guid: 6d00197a342761442b566512372078f8
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models/GizmoLeft.fbx b/Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Gizmos/GizmoLeft.fbx
similarity index 100%
rename from Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models/GizmoLeft.fbx
rename to Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Gizmos/GizmoLeft.fbx
diff --git a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models/GizmoLeft.fbx.meta b/Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Gizmos/GizmoLeft.fbx.meta
similarity index 100%
rename from Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models/GizmoLeft.fbx.meta
rename to Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Gizmos/GizmoLeft.fbx.meta
diff --git a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models/GizmoRight.fbx b/Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Gizmos/GizmoRight.fbx
similarity index 100%
rename from Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models/GizmoRight.fbx
rename to Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Gizmos/GizmoRight.fbx
diff --git a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models/GizmoRight.fbx.meta b/Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Gizmos/GizmoRight.fbx.meta
similarity index 100%
rename from Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models/GizmoRight.fbx.meta
rename to Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Gizmos/GizmoRight.fbx.meta
diff --git a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models/webxr-models.meta b/Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Models.meta
similarity index 100%
rename from Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models/webxr-models.meta
rename to Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Models.meta
diff --git a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models/webxr-models/LICENSE.md b/Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Models/LICENSE.md
similarity index 100%
rename from Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models/webxr-models/LICENSE.md
rename to Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Models/LICENSE.md
diff --git a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models/webxr-models/LICENSE.md.meta b/Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Models/LICENSE.md.meta
similarity index 100%
rename from Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models/webxr-models/LICENSE.md.meta
rename to Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Models/LICENSE.md.meta
diff --git a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models/webxr-models/generic-trigger-squeeze-touchpad-thumbstick.meta b/Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Models/generic-controller.meta
similarity index 100%
rename from Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models/webxr-models/generic-trigger-squeeze-touchpad-thumbstick.meta
rename to Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Models/generic-controller.meta
diff --git a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models/webxr-models/generic-trigger-squeeze-touchpad-thumbstick/left.glb b/Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Models/generic-controller/left.glb
similarity index 100%
rename from Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models/webxr-models/generic-trigger-squeeze-touchpad-thumbstick/left.glb
rename to Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Models/generic-controller/left.glb
diff --git a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models/webxr-models/generic-trigger-squeeze-touchpad-thumbstick/left.glb.meta b/Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Models/generic-controller/left.glb.meta
similarity index 100%
rename from Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models/webxr-models/generic-trigger-squeeze-touchpad-thumbstick/left.glb.meta
rename to Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Models/generic-controller/left.glb.meta
diff --git a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models/webxr-models/generic-trigger-squeeze-touchpad-thumbstick/right.glb b/Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Models/generic-controller/right.glb
similarity index 100%
rename from Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models/webxr-models/generic-trigger-squeeze-touchpad-thumbstick/right.glb
rename to Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Models/generic-controller/right.glb
diff --git a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models/webxr-models/generic-trigger-squeeze-touchpad-thumbstick/right.glb.meta b/Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Models/generic-controller/right.glb.meta
similarity index 100%
rename from Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models/webxr-models/generic-trigger-squeeze-touchpad-thumbstick/right.glb.meta
rename to Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Models/generic-controller/right.glb.meta
diff --git a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models/webxr-models/oculus-touch-v2.meta b/Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Models/oculus-touch-v2.meta
similarity index 100%
rename from Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models/webxr-models/oculus-touch-v2.meta
rename to Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Models/oculus-touch-v2.meta
diff --git a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models/webxr-models/oculus-touch-v2/left.glb b/Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Models/oculus-touch-v2/left.glb
similarity index 100%
rename from Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models/webxr-models/oculus-touch-v2/left.glb
rename to Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Models/oculus-touch-v2/left.glb
diff --git a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models/webxr-models/oculus-touch-v2/left.glb.meta b/Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Models/oculus-touch-v2/left.glb.meta
similarity index 100%
rename from Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models/webxr-models/oculus-touch-v2/left.glb.meta
rename to Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Models/oculus-touch-v2/left.glb.meta
diff --git a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models/webxr-models/oculus-touch-v2/right.glb b/Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Models/oculus-touch-v2/right.glb
similarity index 100%
rename from Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models/webxr-models/oculus-touch-v2/right.glb
rename to Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Models/oculus-touch-v2/right.glb
diff --git a/Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models/webxr-models/oculus-touch-v2/right.glb.meta b/Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Models/oculus-touch-v2/right.glb.meta
similarity index 100%
rename from Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/Models/webxr-models/oculus-touch-v2/right.glb.meta
rename to Assets/MRTK/SDK/StandardAssets/Controllers/Visuals/Models/oculus-touch-v2/right.glb.meta