diff --git a/ovr-utils/Main.tscn b/src/Main.tscn
similarity index 100%
rename from ovr-utils/Main.tscn
rename to src/Main.tscn
diff --git a/ovr-utils/OverlayManager.tscn b/src/OverlayManager.tscn
similarity index 100%
rename from ovr-utils/OverlayManager.tscn
rename to src/OverlayManager.tscn
diff --git a/ovr-utils/OverlaySettingsSync.tscn b/src/OverlaySettingsSync.tscn
similarity index 100%
rename from ovr-utils/OverlaySettingsSync.tscn
rename to src/OverlaySettingsSync.tscn
diff --git a/ovr-utils/addons/godot-openvr/CHANGES.md b/src/addons/godot-openvr/CHANGES.md
similarity index 100%
rename from ovr-utils/addons/godot-openvr/CHANGES.md
rename to src/addons/godot-openvr/CHANGES.md
diff --git a/ovr-utils/addons/godot-openvr/EditorPlugin.gd b/src/addons/godot-openvr/EditorPlugin.gd
similarity index 100%
rename from ovr-utils/addons/godot-openvr/EditorPlugin.gd
rename to src/addons/godot-openvr/EditorPlugin.gd
diff --git a/ovr-utils/addons/godot-openvr/LICENSE b/src/addons/godot-openvr/LICENSE
similarity index 100%
rename from ovr-utils/addons/godot-openvr/LICENSE
rename to src/addons/godot-openvr/LICENSE
diff --git a/ovr-utils/addons/godot-openvr/OpenVRAction.gdns b/src/addons/godot-openvr/OpenVRAction.gdns
similarity index 100%
rename from ovr-utils/addons/godot-openvr/OpenVRAction.gdns
rename to src/addons/godot-openvr/OpenVRAction.gdns
diff --git a/ovr-utils/addons/godot-openvr/OpenVRConfig.gdns b/src/addons/godot-openvr/OpenVRConfig.gdns
similarity index 100%
rename from ovr-utils/addons/godot-openvr/OpenVRConfig.gdns
rename to src/addons/godot-openvr/OpenVRConfig.gdns
diff --git a/ovr-utils/addons/godot-openvr/OpenVRController.gdns b/src/addons/godot-openvr/OpenVRController.gdns
similarity index 100%
rename from ovr-utils/addons/godot-openvr/OpenVRController.gdns
rename to src/addons/godot-openvr/OpenVRController.gdns
diff --git a/ovr-utils/addons/godot-openvr/OpenVRExportPlugin.gd b/src/addons/godot-openvr/OpenVRExportPlugin.gd
similarity index 100%
rename from ovr-utils/addons/godot-openvr/OpenVRExportPlugin.gd
rename to src/addons/godot-openvr/OpenVRExportPlugin.gd
diff --git a/ovr-utils/addons/godot-openvr/OpenVRHaptics.gdns b/src/addons/godot-openvr/OpenVRHaptics.gdns
similarity index 100%
rename from ovr-utils/addons/godot-openvr/OpenVRHaptics.gdns
rename to src/addons/godot-openvr/OpenVRHaptics.gdns
diff --git a/ovr-utils/addons/godot-openvr/OpenVROverlay.gdns b/src/addons/godot-openvr/OpenVROverlay.gdns
similarity index 100%
rename from ovr-utils/addons/godot-openvr/OpenVROverlay.gdns
rename to src/addons/godot-openvr/OpenVROverlay.gdns
diff --git a/ovr-utils/addons/godot-openvr/OpenVRPose.gdns b/src/addons/godot-openvr/OpenVRPose.gdns
similarity index 100%
rename from ovr-utils/addons/godot-openvr/OpenVRPose.gdns
rename to src/addons/godot-openvr/OpenVRPose.gdns
diff --git a/ovr-utils/addons/godot-openvr/OpenVRRenderModel.gdns b/src/addons/godot-openvr/OpenVRRenderModel.gdns
similarity index 100%
rename from ovr-utils/addons/godot-openvr/OpenVRRenderModel.gdns
rename to src/addons/godot-openvr/OpenVRRenderModel.gdns
diff --git a/ovr-utils/addons/godot-openvr/OpenVRSkeleton.gdns b/src/addons/godot-openvr/OpenVRSkeleton.gdns
similarity index 100%
rename from ovr-utils/addons/godot-openvr/OpenVRSkeleton.gdns
rename to src/addons/godot-openvr/OpenVRSkeleton.gdns
diff --git a/ovr-utils/addons/godot-openvr/actions/actions.json b/src/addons/godot-openvr/actions/actions.json
similarity index 100%
rename from ovr-utils/addons/godot-openvr/actions/actions.json
rename to src/addons/godot-openvr/actions/actions.json
diff --git a/ovr-utils/addons/godot-openvr/actions/bindings_gamepad.json b/src/addons/godot-openvr/actions/bindings_gamepad.json
similarity index 100%
rename from ovr-utils/addons/godot-openvr/actions/bindings_gamepad.json
rename to src/addons/godot-openvr/actions/bindings_gamepad.json
diff --git a/ovr-utils/addons/godot-openvr/actions/bindings_generic.json b/src/addons/godot-openvr/actions/bindings_generic.json
similarity index 100%
rename from ovr-utils/addons/godot-openvr/actions/bindings_generic.json
rename to src/addons/godot-openvr/actions/bindings_generic.json
diff --git a/ovr-utils/addons/godot-openvr/actions/bindings_holographic_controller.json b/src/addons/godot-openvr/actions/bindings_holographic_controller.json
similarity index 100%
rename from ovr-utils/addons/godot-openvr/actions/bindings_holographic_controller.json
rename to src/addons/godot-openvr/actions/bindings_holographic_controller.json
diff --git a/ovr-utils/addons/godot-openvr/actions/bindings_index_controller.json b/src/addons/godot-openvr/actions/bindings_index_controller.json
similarity index 100%
rename from ovr-utils/addons/godot-openvr/actions/bindings_index_controller.json
rename to src/addons/godot-openvr/actions/bindings_index_controller.json
diff --git a/ovr-utils/addons/godot-openvr/actions/bindings_oculus_touch.json b/src/addons/godot-openvr/actions/bindings_oculus_touch.json
similarity index 100%
rename from ovr-utils/addons/godot-openvr/actions/bindings_oculus_touch.json
rename to src/addons/godot-openvr/actions/bindings_oculus_touch.json
diff --git a/ovr-utils/addons/godot-openvr/actions/bindings_vive_controller.json b/src/addons/godot-openvr/actions/bindings_vive_controller.json
similarity index 100%
rename from ovr-utils/addons/godot-openvr/actions/bindings_vive_controller.json
rename to src/addons/godot-openvr/actions/bindings_vive_controller.json
diff --git a/ovr-utils/addons/godot-openvr/bin/LICENSE b/src/addons/godot-openvr/bin/LICENSE
similarity index 100%
rename from ovr-utils/addons/godot-openvr/bin/LICENSE
rename to src/addons/godot-openvr/bin/LICENSE
diff --git a/ovr-utils/addons/godot-openvr/bin/win64/libgodot_openvr.dll b/src/addons/godot-openvr/bin/win64/libgodot_openvr.dll
similarity index 100%
rename from ovr-utils/addons/godot-openvr/bin/win64/libgodot_openvr.dll
rename to src/addons/godot-openvr/bin/win64/libgodot_openvr.dll
diff --git a/ovr-utils/addons/godot-openvr/bin/win64/openvr_api.dll b/src/addons/godot-openvr/bin/win64/openvr_api.dll
similarity index 100%
rename from ovr-utils/addons/godot-openvr/bin/win64/openvr_api.dll
rename to src/addons/godot-openvr/bin/win64/openvr_api.dll
diff --git a/ovr-utils/addons/godot-openvr/bin/x11/libgodot_openvr.so b/src/addons/godot-openvr/bin/x11/libgodot_openvr.so
similarity index 100%
rename from ovr-utils/addons/godot-openvr/bin/x11/libgodot_openvr.so
rename to src/addons/godot-openvr/bin/x11/libgodot_openvr.so
diff --git a/ovr-utils/addons/godot-openvr/bin/x11/libopenvr_api.so b/src/addons/godot-openvr/bin/x11/libopenvr_api.so
similarity index 100%
rename from ovr-utils/addons/godot-openvr/bin/x11/libopenvr_api.so
rename to src/addons/godot-openvr/bin/x11/libopenvr_api.so
diff --git a/ovr-utils/addons/godot-openvr/godot_openvr.gdnlib b/src/addons/godot-openvr/godot_openvr.gdnlib
similarity index 100%
rename from ovr-utils/addons/godot-openvr/godot_openvr.gdnlib
rename to src/addons/godot-openvr/godot_openvr.gdnlib
diff --git a/ovr-utils/addons/godot-openvr/icon.png b/src/addons/godot-openvr/icon.png
similarity index 100%
rename from ovr-utils/addons/godot-openvr/icon.png
rename to src/addons/godot-openvr/icon.png
diff --git a/ovr-utils/addons/godot-openvr/icon.png.import b/src/addons/godot-openvr/icon.png.import
similarity index 100%
rename from ovr-utils/addons/godot-openvr/icon.png.import
rename to src/addons/godot-openvr/icon.png.import
diff --git a/ovr-utils/addons/godot-openvr/meshes/README.md b/src/addons/godot-openvr/meshes/README.md
similarity index 100%
rename from ovr-utils/addons/godot-openvr/meshes/README.md
rename to src/addons/godot-openvr/meshes/README.md
diff --git a/ovr-utils/addons/godot-openvr/meshes/blinn1.material b/src/addons/godot-openvr/meshes/blinn1.material
similarity index 100%
rename from ovr-utils/addons/godot-openvr/meshes/blinn1.material
rename to src/addons/godot-openvr/meshes/blinn1.material
diff --git a/ovr-utils/addons/godot-openvr/meshes/blinn2.material b/src/addons/godot-openvr/meshes/blinn2.material
similarity index 100%
rename from ovr-utils/addons/godot-openvr/meshes/blinn2.material
rename to src/addons/godot-openvr/meshes/blinn2.material
diff --git a/ovr-utils/addons/godot-openvr/meshes/hands_albedo.png b/src/addons/godot-openvr/meshes/hands_albedo.png
similarity index 100%
rename from ovr-utils/addons/godot-openvr/meshes/hands_albedo.png
rename to src/addons/godot-openvr/meshes/hands_albedo.png
diff --git a/ovr-utils/addons/godot-openvr/meshes/hands_albedo.png.import b/src/addons/godot-openvr/meshes/hands_albedo.png.import
similarity index 100%
rename from ovr-utils/addons/godot-openvr/meshes/hands_albedo.png.import
rename to src/addons/godot-openvr/meshes/hands_albedo.png.import
diff --git a/ovr-utils/addons/godot-openvr/meshes/hands_normal.png b/src/addons/godot-openvr/meshes/hands_normal.png
similarity index 100%
rename from ovr-utils/addons/godot-openvr/meshes/hands_normal.png
rename to src/addons/godot-openvr/meshes/hands_normal.png
diff --git a/ovr-utils/addons/godot-openvr/meshes/hands_normal.png.import b/src/addons/godot-openvr/meshes/hands_normal.png.import
similarity index 100%
rename from ovr-utils/addons/godot-openvr/meshes/hands_normal.png.import
rename to src/addons/godot-openvr/meshes/hands_normal.png.import
diff --git a/ovr-utils/addons/godot-openvr/meshes/models_hands_vr_glove_vmat.material b/src/addons/godot-openvr/meshes/models_hands_vr_glove_vmat.material
similarity index 100%
rename from ovr-utils/addons/godot-openvr/meshes/models_hands_vr_glove_vmat.material
rename to src/addons/godot-openvr/meshes/models_hands_vr_glove_vmat.material
diff --git a/ovr-utils/addons/godot-openvr/meshes/vr_glove_left_model_slim.glb b/src/addons/godot-openvr/meshes/vr_glove_left_model_slim.glb
similarity index 100%
rename from ovr-utils/addons/godot-openvr/meshes/vr_glove_left_model_slim.glb
rename to src/addons/godot-openvr/meshes/vr_glove_left_model_slim.glb
diff --git a/ovr-utils/addons/godot-openvr/meshes/vr_glove_left_model_slim.glb.import b/src/addons/godot-openvr/meshes/vr_glove_left_model_slim.glb.import
similarity index 100%
rename from ovr-utils/addons/godot-openvr/meshes/vr_glove_left_model_slim.glb.import
rename to src/addons/godot-openvr/meshes/vr_glove_left_model_slim.glb.import
diff --git a/ovr-utils/addons/godot-openvr/meshes/vr_glove_right_model_slim.glb b/src/addons/godot-openvr/meshes/vr_glove_right_model_slim.glb
similarity index 100%
rename from ovr-utils/addons/godot-openvr/meshes/vr_glove_right_model_slim.glb
rename to src/addons/godot-openvr/meshes/vr_glove_right_model_slim.glb
diff --git a/ovr-utils/addons/godot-openvr/meshes/vr_glove_right_model_slim.glb.import b/src/addons/godot-openvr/meshes/vr_glove_right_model_slim.glb.import
similarity index 100%
rename from ovr-utils/addons/godot-openvr/meshes/vr_glove_right_model_slim.glb.import
rename to src/addons/godot-openvr/meshes/vr_glove_right_model_slim.glb.import
diff --git a/ovr-utils/addons/godot-openvr/plugin.cfg b/src/addons/godot-openvr/plugin.cfg
similarity index 100%
rename from ovr-utils/addons/godot-openvr/plugin.cfg
rename to src/addons/godot-openvr/plugin.cfg
diff --git a/ovr-utils/addons/godot-openvr/scenes/framecounter_in_3d.tscn b/src/addons/godot-openvr/scenes/framecounter_in_3d.tscn
similarity index 100%
rename from ovr-utils/addons/godot-openvr/scenes/framecounter_in_3d.tscn
rename to src/addons/godot-openvr/scenes/framecounter_in_3d.tscn
diff --git a/ovr-utils/addons/godot-openvr/scenes/ovr_controller.gd b/src/addons/godot-openvr/scenes/ovr_controller.gd
similarity index 100%
rename from ovr-utils/addons/godot-openvr/scenes/ovr_controller.gd
rename to src/addons/godot-openvr/scenes/ovr_controller.gd
diff --git a/ovr-utils/addons/godot-openvr/scenes/ovr_controller.tscn b/src/addons/godot-openvr/scenes/ovr_controller.tscn
similarity index 100%
rename from ovr-utils/addons/godot-openvr/scenes/ovr_controller.tscn
rename to src/addons/godot-openvr/scenes/ovr_controller.tscn
diff --git a/ovr-utils/addons/godot-openvr/scenes/ovr_first_person.tscn b/src/addons/godot-openvr/scenes/ovr_first_person.tscn
similarity index 100%
rename from ovr-utils/addons/godot-openvr/scenes/ovr_first_person.tscn
rename to src/addons/godot-openvr/scenes/ovr_first_person.tscn
diff --git a/ovr-utils/addons/godot-openvr/scenes/ovr_left_hand.tscn b/src/addons/godot-openvr/scenes/ovr_left_hand.tscn
similarity index 100%
rename from ovr-utils/addons/godot-openvr/scenes/ovr_left_hand.tscn
rename to src/addons/godot-openvr/scenes/ovr_left_hand.tscn
diff --git a/ovr-utils/addons/godot-openvr/scenes/ovr_main.gd b/src/addons/godot-openvr/scenes/ovr_main.gd
similarity index 100%
rename from ovr-utils/addons/godot-openvr/scenes/ovr_main.gd
rename to src/addons/godot-openvr/scenes/ovr_main.gd
diff --git a/ovr-utils/addons/godot-openvr/scenes/ovr_render_model.gd b/src/addons/godot-openvr/scenes/ovr_render_model.gd
similarity index 100%
rename from ovr-utils/addons/godot-openvr/scenes/ovr_render_model.gd
rename to src/addons/godot-openvr/scenes/ovr_render_model.gd
diff --git a/ovr-utils/addons/godot-openvr/scenes/ovr_render_model.tscn b/src/addons/godot-openvr/scenes/ovr_render_model.tscn
similarity index 100%
rename from ovr-utils/addons/godot-openvr/scenes/ovr_render_model.tscn
rename to src/addons/godot-openvr/scenes/ovr_render_model.tscn
diff --git a/ovr-utils/addons/godot-openvr/scenes/ovr_right_hand.tscn b/src/addons/godot-openvr/scenes/ovr_right_hand.tscn
similarity index 100%
rename from ovr-utils/addons/godot-openvr/scenes/ovr_right_hand.tscn
rename to src/addons/godot-openvr/scenes/ovr_right_hand.tscn
diff --git a/ovr-utils/addons/godot-openvr/scenes/ovr_shader_cache.gd b/src/addons/godot-openvr/scenes/ovr_shader_cache.gd
similarity index 100%
rename from ovr-utils/addons/godot-openvr/scenes/ovr_shader_cache.gd
rename to src/addons/godot-openvr/scenes/ovr_shader_cache.gd
diff --git a/ovr-utils/addons/godot-openvr/scenes/ovr_shader_cache.tscn b/src/addons/godot-openvr/scenes/ovr_shader_cache.tscn
similarity index 100%
rename from ovr-utils/addons/godot-openvr/scenes/ovr_shader_cache.tscn
rename to src/addons/godot-openvr/scenes/ovr_shader_cache.tscn
diff --git a/ovr-utils/addons/openvr_overlay/MissingOverlay.tscn b/src/addons/openvr_overlay/MissingOverlay.tscn
similarity index 100%
rename from ovr-utils/addons/openvr_overlay/MissingOverlay.tscn
rename to src/addons/openvr_overlay/MissingOverlay.tscn
diff --git a/ovr-utils/addons/openvr_overlay/OverlayCursor.tscn b/src/addons/openvr_overlay/OverlayCursor.tscn
similarity index 100%
rename from ovr-utils/addons/openvr_overlay/OverlayCursor.tscn
rename to src/addons/openvr_overlay/OverlayCursor.tscn
diff --git a/ovr-utils/addons/openvr_overlay/OverlayGrab.tscn b/src/addons/openvr_overlay/OverlayGrab.tscn
similarity index 100%
rename from ovr-utils/addons/openvr_overlay/OverlayGrab.tscn
rename to src/addons/openvr_overlay/OverlayGrab.tscn
diff --git a/ovr-utils/addons/openvr_overlay/OverlayInstance.tscn b/src/addons/openvr_overlay/OverlayInstance.tscn
similarity index 100%
rename from ovr-utils/addons/openvr_overlay/OverlayInstance.tscn
rename to src/addons/openvr_overlay/OverlayInstance.tscn
diff --git a/ovr-utils/addons/openvr_overlay/OverlayInteraction.tscn b/src/addons/openvr_overlay/OverlayInteraction.tscn
similarity index 100%
rename from ovr-utils/addons/openvr_overlay/OverlayInteraction.tscn
rename to src/addons/openvr_overlay/OverlayInteraction.tscn
diff --git a/ovr-utils/addons/openvr_overlay/interaction/Cursor.tscn b/src/addons/openvr_overlay/interaction/Cursor.tscn
similarity index 100%
rename from ovr-utils/addons/openvr_overlay/interaction/Cursor.tscn
rename to src/addons/openvr_overlay/interaction/Cursor.tscn
diff --git a/ovr-utils/addons/openvr_overlay/interaction/OverlayActivator.tscn b/src/addons/openvr_overlay/interaction/OverlayActivator.tscn
similarity index 100%
rename from ovr-utils/addons/openvr_overlay/interaction/OverlayActivator.tscn
rename to src/addons/openvr_overlay/interaction/OverlayActivator.tscn
diff --git a/ovr-utils/addons/openvr_overlay/interaction/OverlayArea.tscn b/src/addons/openvr_overlay/interaction/OverlayArea.tscn
similarity index 100%
rename from ovr-utils/addons/openvr_overlay/interaction/OverlayArea.tscn
rename to src/addons/openvr_overlay/interaction/OverlayArea.tscn
diff --git a/ovr-utils/addons/openvr_overlay/interaction/cursor.png b/src/addons/openvr_overlay/interaction/cursor.png
similarity index 100%
rename from ovr-utils/addons/openvr_overlay/interaction/cursor.png
rename to src/addons/openvr_overlay/interaction/cursor.png
diff --git a/ovr-utils/addons/openvr_overlay/interaction/cursor.png.import b/src/addons/openvr_overlay/interaction/cursor.png.import
similarity index 100%
rename from ovr-utils/addons/openvr_overlay/interaction/cursor.png.import
rename to src/addons/openvr_overlay/interaction/cursor.png.import
diff --git a/ovr-utils/addons/openvr_overlay/interaction/overlay_cursor.gd b/src/addons/openvr_overlay/interaction/overlay_cursor.gd
similarity index 100%
rename from ovr-utils/addons/openvr_overlay/interaction/overlay_cursor.gd
rename to src/addons/openvr_overlay/interaction/overlay_cursor.gd
diff --git a/ovr-utils/addons/openvr_overlay/interaction/overlay_grab.gd b/src/addons/openvr_overlay/interaction/overlay_grab.gd
similarity index 100%
rename from ovr-utils/addons/openvr_overlay/interaction/overlay_grab.gd
rename to src/addons/openvr_overlay/interaction/overlay_grab.gd
diff --git a/ovr-utils/addons/openvr_overlay/interaction/overlay_interaction.gd b/src/addons/openvr_overlay/interaction/overlay_interaction.gd
similarity index 100%
rename from ovr-utils/addons/openvr_overlay/interaction/overlay_interaction.gd
rename to src/addons/openvr_overlay/interaction/overlay_interaction.gd
diff --git a/ovr-utils/addons/openvr_overlay/openvr_overlay.gd b/src/addons/openvr_overlay/openvr_overlay.gd
similarity index 100%
rename from ovr-utils/addons/openvr_overlay/openvr_overlay.gd
rename to src/addons/openvr_overlay/openvr_overlay.gd
diff --git a/ovr-utils/addons/openvr_overlay/overlay_init.gd b/src/addons/openvr_overlay/overlay_init.gd
similarity index 100%
rename from ovr-utils/addons/openvr_overlay/overlay_init.gd
rename to src/addons/openvr_overlay/overlay_init.gd
diff --git a/ovr-utils/addons/openvr_overlay/overlay_instance.gd b/src/addons/openvr_overlay/overlay_instance.gd
similarity index 100%
rename from ovr-utils/addons/openvr_overlay/overlay_instance.gd
rename to src/addons/openvr_overlay/overlay_instance.gd
diff --git a/ovr-utils/addons/openvr_overlay/plugin.cfg b/src/addons/openvr_overlay/plugin.cfg
similarity index 100%
rename from ovr-utils/addons/openvr_overlay/plugin.cfg
rename to src/addons/openvr_overlay/plugin.cfg
diff --git a/ovr-utils/addons/ovr_utils/ovr_utils.gd b/src/addons/ovr_utils/ovr_utils.gd
similarity index 100%
rename from ovr-utils/addons/ovr_utils/ovr_utils.gd
rename to src/addons/ovr_utils/ovr_utils.gd
diff --git a/ovr-utils/addons/ovr_utils/ovr_utils_exporter.gd b/src/addons/ovr_utils/ovr_utils_exporter.gd
similarity index 100%
rename from ovr-utils/addons/ovr_utils/ovr_utils_exporter.gd
rename to src/addons/ovr_utils/ovr_utils_exporter.gd
diff --git a/ovr-utils/addons/ovr_utils/plugin.cfg b/src/addons/ovr_utils/plugin.cfg
similarity index 100%
rename from ovr-utils/addons/ovr_utils/plugin.cfg
rename to src/addons/ovr_utils/plugin.cfg
diff --git a/ovr-utils/addons/settings-manager/LICENSE b/src/addons/settings-manager/LICENSE
similarity index 100%
rename from ovr-utils/addons/settings-manager/LICENSE
rename to src/addons/settings-manager/LICENSE
diff --git a/ovr-utils/addons/settings-manager/Settings.tscn b/src/addons/settings-manager/Settings.tscn
similarity index 100%
rename from ovr-utils/addons/settings-manager/Settings.tscn
rename to src/addons/settings-manager/Settings.tscn
diff --git a/ovr-utils/addons/settings-manager/plugin.cfg b/src/addons/settings-manager/plugin.cfg
similarity index 100%
rename from ovr-utils/addons/settings-manager/plugin.cfg
rename to src/addons/settings-manager/plugin.cfg
diff --git a/ovr-utils/addons/settings-manager/settings_manager.gd b/src/addons/settings-manager/settings_manager.gd
similarity index 100%
rename from ovr-utils/addons/settings-manager/settings_manager.gd
rename to src/addons/settings-manager/settings_manager.gd
diff --git a/ovr-utils/addons/settings-manager/settings_plugin.gd b/src/addons/settings-manager/settings_plugin.gd
similarity index 100%
rename from ovr-utils/addons/settings-manager/settings_plugin.gd
rename to src/addons/settings-manager/settings_plugin.gd
diff --git a/ovr-utils/default_env.tres b/src/default_env.tres
similarity index 100%
rename from ovr-utils/default_env.tres
rename to src/default_env.tres
diff --git a/ovr-utils/export_presets.cfg b/src/export_presets.cfg
similarity index 100%
rename from ovr-utils/export_presets.cfg
rename to src/export_presets.cfg
diff --git a/ovr-utils/fonts/LICENSE.txt b/src/fonts/LICENSE.txt
similarity index 100%
rename from ovr-utils/fonts/LICENSE.txt
rename to src/fonts/LICENSE.txt
diff --git a/ovr-utils/fonts/OpenSans-Bold.ttf b/src/fonts/OpenSans-Bold.ttf
similarity index 100%
rename from ovr-utils/fonts/OpenSans-Bold.ttf
rename to src/fonts/OpenSans-Bold.ttf
diff --git a/ovr-utils/fonts/OpenSans-BoldItalic.ttf b/src/fonts/OpenSans-BoldItalic.ttf
similarity index 100%
rename from ovr-utils/fonts/OpenSans-BoldItalic.ttf
rename to src/fonts/OpenSans-BoldItalic.ttf
diff --git a/ovr-utils/fonts/OpenSans-ExtraBold.ttf b/src/fonts/OpenSans-ExtraBold.ttf
similarity index 100%
rename from ovr-utils/fonts/OpenSans-ExtraBold.ttf
rename to src/fonts/OpenSans-ExtraBold.ttf
diff --git a/ovr-utils/fonts/OpenSans-ExtraBoldItalic.ttf b/src/fonts/OpenSans-ExtraBoldItalic.ttf
similarity index 100%
rename from ovr-utils/fonts/OpenSans-ExtraBoldItalic.ttf
rename to src/fonts/OpenSans-ExtraBoldItalic.ttf
diff --git a/ovr-utils/fonts/OpenSans-Italic.ttf b/src/fonts/OpenSans-Italic.ttf
similarity index 100%
rename from ovr-utils/fonts/OpenSans-Italic.ttf
rename to src/fonts/OpenSans-Italic.ttf
diff --git a/ovr-utils/fonts/OpenSans-Light.ttf b/src/fonts/OpenSans-Light.ttf
similarity index 100%
rename from ovr-utils/fonts/OpenSans-Light.ttf
rename to src/fonts/OpenSans-Light.ttf
diff --git a/ovr-utils/fonts/OpenSans-LightItalic.ttf b/src/fonts/OpenSans-LightItalic.ttf
similarity index 100%
rename from ovr-utils/fonts/OpenSans-LightItalic.ttf
rename to src/fonts/OpenSans-LightItalic.ttf
diff --git a/ovr-utils/fonts/OpenSans-Regular.ttf b/src/fonts/OpenSans-Regular.ttf
similarity index 100%
rename from ovr-utils/fonts/OpenSans-Regular.ttf
rename to src/fonts/OpenSans-Regular.ttf
diff --git a/ovr-utils/fonts/OpenSans-SemiBold.ttf b/src/fonts/OpenSans-SemiBold.ttf
similarity index 100%
rename from ovr-utils/fonts/OpenSans-SemiBold.ttf
rename to src/fonts/OpenSans-SemiBold.ttf
diff --git a/ovr-utils/fonts/OpenSans-SemiBoldItalic.ttf b/src/fonts/OpenSans-SemiBoldItalic.ttf
similarity index 100%
rename from ovr-utils/fonts/OpenSans-SemiBoldItalic.ttf
rename to src/fonts/OpenSans-SemiBoldItalic.ttf
diff --git a/ovr-utils/icons/add.svg b/src/icons/add.svg
similarity index 100%
rename from ovr-utils/icons/add.svg
rename to src/icons/add.svg
diff --git a/ovr-utils/icons/add.svg.import b/src/icons/add.svg.import
similarity index 100%
rename from ovr-utils/icons/add.svg.import
rename to src/icons/add.svg.import
diff --git a/ovr-utils/icons/alpha.svg b/src/icons/alpha.svg
similarity index 100%
rename from ovr-utils/icons/alpha.svg
rename to src/icons/alpha.svg
diff --git a/ovr-utils/icons/alpha.svg.import b/src/icons/alpha.svg.import
similarity index 100%
rename from ovr-utils/icons/alpha.svg.import
rename to src/icons/alpha.svg.import
diff --git a/ovr-utils/icons/close.svg b/src/icons/close.svg
similarity index 100%
rename from ovr-utils/icons/close.svg
rename to src/icons/close.svg
diff --git a/ovr-utils/icons/close.svg.import b/src/icons/close.svg.import
similarity index 100%
rename from ovr-utils/icons/close.svg.import
rename to src/icons/close.svg.import
diff --git a/ovr-utils/icons/hidden.svg b/src/icons/hidden.svg
similarity index 100%
rename from ovr-utils/icons/hidden.svg
rename to src/icons/hidden.svg
diff --git a/ovr-utils/icons/hidden.svg.import b/src/icons/hidden.svg.import
similarity index 100%
rename from ovr-utils/icons/hidden.svg.import
rename to src/icons/hidden.svg.import
diff --git a/ovr-utils/icons/list.svg b/src/icons/list.svg
similarity index 100%
rename from ovr-utils/icons/list.svg
rename to src/icons/list.svg
diff --git a/ovr-utils/icons/list.svg.import b/src/icons/list.svg.import
similarity index 100%
rename from ovr-utils/icons/list.svg.import
rename to src/icons/list.svg.import
diff --git a/ovr-utils/icons/move.svg b/src/icons/move.svg
similarity index 100%
rename from ovr-utils/icons/move.svg
rename to src/icons/move.svg
diff --git a/ovr-utils/icons/move.svg.import b/src/icons/move.svg.import
similarity index 100%
rename from ovr-utils/icons/move.svg.import
rename to src/icons/move.svg.import
diff --git a/ovr-utils/icons/remove.svg b/src/icons/remove.svg
similarity index 100%
rename from ovr-utils/icons/remove.svg
rename to src/icons/remove.svg
diff --git a/ovr-utils/icons/remove.svg.import b/src/icons/remove.svg.import
similarity index 100%
rename from ovr-utils/icons/remove.svg.import
rename to src/icons/remove.svg.import
diff --git a/ovr-utils/icons/reset.svg b/src/icons/reset.svg
similarity index 100%
rename from ovr-utils/icons/reset.svg
rename to src/icons/reset.svg
diff --git a/ovr-utils/icons/reset.svg.import b/src/icons/reset.svg.import
similarity index 100%
rename from ovr-utils/icons/reset.svg.import
rename to src/icons/reset.svg.import
diff --git a/ovr-utils/icons/size.svg b/src/icons/size.svg
similarity index 100%
rename from ovr-utils/icons/size.svg
rename to src/icons/size.svg
diff --git a/ovr-utils/icons/size.svg.import b/src/icons/size.svg.import
similarity index 100%
rename from ovr-utils/icons/size.svg.import
rename to src/icons/size.svg.import
diff --git a/ovr-utils/icons/slider_handle.svg b/src/icons/slider_handle.svg
similarity index 100%
rename from ovr-utils/icons/slider_handle.svg
rename to src/icons/slider_handle.svg
diff --git a/ovr-utils/icons/slider_handle.svg.import b/src/icons/slider_handle.svg.import
similarity index 100%
rename from ovr-utils/icons/slider_handle.svg.import
rename to src/icons/slider_handle.svg.import
diff --git a/ovr-utils/icons/target.svg b/src/icons/target.svg
similarity index 100%
rename from ovr-utils/icons/target.svg
rename to src/icons/target.svg
diff --git a/ovr-utils/icons/target.svg.import b/src/icons/target.svg.import
similarity index 100%
rename from ovr-utils/icons/target.svg.import
rename to src/icons/target.svg.import
diff --git a/ovr-utils/icons/touch.svg b/src/icons/touch.svg
similarity index 100%
rename from ovr-utils/icons/touch.svg
rename to src/icons/touch.svg
diff --git a/ovr-utils/icons/touch.svg.import b/src/icons/touch.svg.import
similarity index 100%
rename from ovr-utils/icons/touch.svg.import
rename to src/icons/touch.svg.import
diff --git a/ovr-utils/icons/tracking/hand_l.svg b/src/icons/tracking/hand_l.svg
similarity index 100%
rename from ovr-utils/icons/tracking/hand_l.svg
rename to src/icons/tracking/hand_l.svg
diff --git a/ovr-utils/icons/tracking/hand_l.svg.import b/src/icons/tracking/hand_l.svg.import
similarity index 100%
rename from ovr-utils/icons/tracking/hand_l.svg.import
rename to src/icons/tracking/hand_l.svg.import
diff --git a/ovr-utils/icons/tracking/hand_r.svg b/src/icons/tracking/hand_r.svg
similarity index 100%
rename from ovr-utils/icons/tracking/hand_r.svg
rename to src/icons/tracking/hand_r.svg
diff --git a/ovr-utils/icons/tracking/hand_r.svg.import b/src/icons/tracking/hand_r.svg.import
similarity index 100%
rename from ovr-utils/icons/tracking/hand_r.svg.import
rename to src/icons/tracking/hand_r.svg.import
diff --git a/ovr-utils/icons/tracking/person.svg b/src/icons/tracking/person.svg
similarity index 100%
rename from ovr-utils/icons/tracking/person.svg
rename to src/icons/tracking/person.svg
diff --git a/ovr-utils/icons/tracking/person.svg.import b/src/icons/tracking/person.svg.import
similarity index 100%
rename from ovr-utils/icons/tracking/person.svg.import
rename to src/icons/tracking/person.svg.import
diff --git a/ovr-utils/icons/tracking/world.svg b/src/icons/tracking/world.svg
similarity index 100%
rename from ovr-utils/icons/tracking/world.svg
rename to src/icons/tracking/world.svg
diff --git a/ovr-utils/icons/tracking/world.svg.import b/src/icons/tracking/world.svg.import
similarity index 100%
rename from ovr-utils/icons/tracking/world.svg.import
rename to src/icons/tracking/world.svg.import
diff --git a/ovr-utils/icons/visible.svg b/src/icons/visible.svg
similarity index 100%
rename from ovr-utils/icons/visible.svg
rename to src/icons/visible.svg
diff --git a/ovr-utils/icons/visible.svg.import b/src/icons/visible.svg.import
similarity index 100%
rename from ovr-utils/icons/visible.svg.import
rename to src/icons/visible.svg.import
diff --git a/ovr-utils/icons/warning.svg b/src/icons/warning.svg
similarity index 100%
rename from ovr-utils/icons/warning.svg
rename to src/icons/warning.svg
diff --git a/ovr-utils/icons/warning.svg.import b/src/icons/warning.svg.import
similarity index 100%
rename from ovr-utils/icons/warning.svg.import
rename to src/icons/warning.svg.import
diff --git a/ovr-utils/overlay_manager.gd b/src/overlay_manager.gd
similarity index 100%
rename from ovr-utils/overlay_manager.gd
rename to src/overlay_manager.gd
diff --git a/ovr-utils/overlay_scripts/battery.gd b/src/overlay_scripts/battery.gd
similarity index 100%
rename from ovr-utils/overlay_scripts/battery.gd
rename to src/overlay_scripts/battery.gd
diff --git a/ovr-utils/overlay_scripts/image_viewer.gd b/src/overlay_scripts/image_viewer.gd
similarity index 100%
rename from ovr-utils/overlay_scripts/image_viewer.gd
rename to src/overlay_scripts/image_viewer.gd
diff --git a/ovr-utils/overlay_scripts/main_menu.gd b/src/overlay_scripts/main_menu.gd
similarity index 100%
rename from ovr-utils/overlay_scripts/main_menu.gd
rename to src/overlay_scripts/main_menu.gd
diff --git a/ovr-utils/overlay_scripts/time.gd b/src/overlay_scripts/time.gd
similarity index 100%
rename from ovr-utils/overlay_scripts/time.gd
rename to src/overlay_scripts/time.gd
diff --git a/ovr-utils/overlay_scripts/ui_demo.gd b/src/overlay_scripts/ui_demo.gd
similarity index 100%
rename from ovr-utils/overlay_scripts/ui_demo.gd
rename to src/overlay_scripts/ui_demo.gd
diff --git a/ovr-utils/overlay_scripts/unknown_type.gd b/src/overlay_scripts/unknown_type.gd
similarity index 100%
rename from ovr-utils/overlay_scripts/unknown_type.gd
rename to src/overlay_scripts/unknown_type.gd
diff --git a/ovr-utils/overlay_settings_sync.gd b/src/overlay_settings_sync.gd
similarity index 100%
rename from ovr-utils/overlay_settings_sync.gd
rename to src/overlay_settings_sync.gd
diff --git a/ovr-utils/overlays/BatteryLevel.tscn b/src/overlays/BatteryLevel.tscn
similarity index 100%
rename from ovr-utils/overlays/BatteryLevel.tscn
rename to src/overlays/BatteryLevel.tscn
diff --git a/ovr-utils/overlays/Clock.tscn b/src/overlays/Clock.tscn
similarity index 100%
rename from ovr-utils/overlays/Clock.tscn
rename to src/overlays/Clock.tscn
diff --git a/ovr-utils/overlays/ImageViewer.tscn b/src/overlays/ImageViewer.tscn
similarity index 100%
rename from ovr-utils/overlays/ImageViewer.tscn
rename to src/overlays/ImageViewer.tscn
diff --git a/ovr-utils/overlays/UI_demo.tscn b/src/overlays/UI_demo.tscn
similarity index 100%
rename from ovr-utils/overlays/UI_demo.tscn
rename to src/overlays/UI_demo.tscn
diff --git a/ovr-utils/project.godot b/src/project.godot
similarity index 100%
rename from ovr-utils/project.godot
rename to src/project.godot
diff --git a/ovr-utils/settings_definition.gd b/src/settings_definition.gd
similarity index 100%
rename from ovr-utils/settings_definition.gd
rename to src/settings_definition.gd
diff --git a/ovr-utils/settings_validator.gd b/src/settings_validator.gd
similarity index 100%
rename from ovr-utils/settings_validator.gd
rename to src/settings_validator.gd
diff --git a/ovr-utils/special_overlays/MainOverlay.tscn b/src/special_overlays/MainOverlay.tscn
similarity index 100%
rename from ovr-utils/special_overlays/MainOverlay.tscn
rename to src/special_overlays/MainOverlay.tscn
diff --git a/ovr-utils/special_overlays/UnknownType.tscn b/src/special_overlays/UnknownType.tscn
similarity index 100%
rename from ovr-utils/special_overlays/UnknownType.tscn
rename to src/special_overlays/UnknownType.tscn
diff --git a/ovr-utils/styles/background.stylebox b/src/styles/background.stylebox
similarity index 100%
rename from ovr-utils/styles/background.stylebox
rename to src/styles/background.stylebox
diff --git a/ovr-utils/styles/buttons/normal.stylebox b/src/styles/buttons/normal.stylebox
similarity index 100%
rename from ovr-utils/styles/buttons/normal.stylebox
rename to src/styles/buttons/normal.stylebox
diff --git a/ovr-utils/styles/buttons/pressed.stylebox b/src/styles/buttons/pressed.stylebox
similarity index 100%
rename from ovr-utils/styles/buttons/pressed.stylebox
rename to src/styles/buttons/pressed.stylebox
diff --git a/ovr-utils/styles/file_menu.theme b/src/styles/file_menu.theme
similarity index 100%
rename from ovr-utils/styles/file_menu.theme
rename to src/styles/file_menu.theme
diff --git a/ovr-utils/styles/menu.theme b/src/styles/menu.theme
similarity index 100%
rename from ovr-utils/styles/menu.theme
rename to src/styles/menu.theme
diff --git a/ovr-utils/styles/sliders/active.stylebox b/src/styles/sliders/active.stylebox
similarity index 100%
rename from ovr-utils/styles/sliders/active.stylebox
rename to src/styles/sliders/active.stylebox
diff --git a/ovr-utils/styles/sliders/normal.stylebox b/src/styles/sliders/normal.stylebox
similarity index 100%
rename from ovr-utils/styles/sliders/normal.stylebox
rename to src/styles/sliders/normal.stylebox
diff --git a/ovr-utils/textures/icon.png b/src/textures/icon.png
similarity index 100%
rename from ovr-utils/textures/icon.png
rename to src/textures/icon.png
diff --git a/ovr-utils/textures/icon.png.import b/src/textures/icon.png.import
similarity index 100%
rename from ovr-utils/textures/icon.png.import
rename to src/textures/icon.png.import
diff --git a/ovr-utils/ui/AddMenu.tscn b/src/ui/AddMenu.tscn
similarity index 100%
rename from ovr-utils/ui/AddMenu.tscn
rename to src/ui/AddMenu.tscn
diff --git a/ovr-utils/ui/AddOverlayButton.tscn b/src/ui/AddOverlayButton.tscn
similarity index 100%
rename from ovr-utils/ui/AddOverlayButton.tscn
rename to src/ui/AddOverlayButton.tscn
diff --git a/ovr-utils/ui/ListOverlayItem.tscn b/src/ui/ListOverlayItem.tscn
similarity index 100%
rename from ovr-utils/ui/ListOverlayItem.tscn
rename to src/ui/ListOverlayItem.tscn
diff --git a/ovr-utils/ui/add_menu.gd b/src/ui/add_menu.gd
similarity index 100%
rename from ovr-utils/ui/add_menu.gd
rename to src/ui/add_menu.gd
diff --git a/ovr-utils/ui/overlay_list_item.gd b/src/ui/overlay_list_item.gd
similarity index 100%
rename from ovr-utils/ui/overlay_list_item.gd
rename to src/ui/overlay_list_item.gd