diff --git a/Package.swift b/Package.swift
index 9eda4ce..458b4f7 100644
--- a/Package.swift
+++ b/Package.swift
@@ -17,7 +17,6 @@ let package = Package(
         // Targets can depend on other targets in this package and products from dependencies.
         .target(
             name: "MetalScope",
-            path: "Sources",
             resources: [
                 .process("Assets.xcassets"),
             ]
diff --git a/Sources/Assets.xcassets/Contents.json b/Sources/MetalScope/Assets.xcassets/Contents.json
similarity index 100%
rename from Sources/Assets.xcassets/Contents.json
rename to Sources/MetalScope/Assets.xcassets/Contents.json
diff --git a/Sources/Assets.xcassets/icon-close.imageset/Contents.json b/Sources/MetalScope/Assets.xcassets/icon-close.imageset/Contents.json
similarity index 100%
rename from Sources/Assets.xcassets/icon-close.imageset/Contents.json
rename to Sources/MetalScope/Assets.xcassets/icon-close.imageset/Contents.json
diff --git a/Sources/Assets.xcassets/icon-close.imageset/icon-close.pdf b/Sources/MetalScope/Assets.xcassets/icon-close.imageset/icon-close.pdf
similarity index 100%
rename from Sources/Assets.xcassets/icon-close.imageset/icon-close.pdf
rename to Sources/MetalScope/Assets.xcassets/icon-close.imageset/icon-close.pdf
diff --git a/Sources/Assets.xcassets/icon-help.imageset/Contents.json b/Sources/MetalScope/Assets.xcassets/icon-help.imageset/Contents.json
similarity index 100%
rename from Sources/Assets.xcassets/icon-help.imageset/Contents.json
rename to Sources/MetalScope/Assets.xcassets/icon-help.imageset/Contents.json
diff --git a/Sources/Assets.xcassets/icon-help.imageset/icon-help.pdf b/Sources/MetalScope/Assets.xcassets/icon-help.imageset/icon-help.pdf
similarity index 100%
rename from Sources/Assets.xcassets/icon-help.imageset/icon-help.pdf
rename to Sources/MetalScope/Assets.xcassets/icon-help.imageset/icon-help.pdf
diff --git a/Sources/Deprecations+Removals.swift b/Sources/MetalScope/Deprecations+Removals.swift
similarity index 100%
rename from Sources/Deprecations+Removals.swift
rename to Sources/MetalScope/Deprecations+Removals.swift
diff --git a/Sources/CategoryBitMask.swift b/Sources/MetalScope/Media/CategoryBitMask.swift
similarity index 100%
rename from Sources/CategoryBitMask.swift
rename to Sources/MetalScope/Media/CategoryBitMask.swift
diff --git a/Sources/ImageLoadable.swift b/Sources/MetalScope/Media/ImageLoadable.swift
similarity index 100%
rename from Sources/ImageLoadable.swift
rename to Sources/MetalScope/Media/ImageLoadable.swift
diff --git a/Sources/ImageScene.swift b/Sources/MetalScope/Media/ImageScene.swift
similarity index 100%
rename from Sources/ImageScene.swift
rename to Sources/MetalScope/Media/ImageScene.swift
diff --git a/Sources/MediaFormat.swift b/Sources/MetalScope/Media/MediaFormat.swift
similarity index 100%
rename from Sources/MediaFormat.swift
rename to Sources/MetalScope/Media/MediaFormat.swift
diff --git a/Sources/SceneLoadable.swift b/Sources/MetalScope/Media/SceneLoadable.swift
similarity index 100%
rename from Sources/SceneLoadable.swift
rename to Sources/MetalScope/Media/SceneLoadable.swift
diff --git a/Sources/SphericalMediaScene.swift b/Sources/MetalScope/Media/SphericalMediaScene.swift
similarity index 100%
rename from Sources/SphericalMediaScene.swift
rename to Sources/MetalScope/Media/SphericalMediaScene.swift
diff --git a/Sources/CVError.swift b/Sources/MetalScope/Media/Video/CVError.swift
similarity index 100%
rename from Sources/CVError.swift
rename to Sources/MetalScope/Media/Video/CVError.swift
diff --git a/Sources/PlayerItemRenderer.swift b/Sources/MetalScope/Media/Video/PlayerItemRenderer.swift
similarity index 100%
rename from Sources/PlayerItemRenderer.swift
rename to Sources/MetalScope/Media/Video/PlayerItemRenderer.swift
diff --git a/Sources/PlayerRenderer.swift b/Sources/MetalScope/Media/Video/PlayerRenderer.swift
similarity index 100%
rename from Sources/PlayerRenderer.swift
rename to Sources/MetalScope/Media/Video/PlayerRenderer.swift
diff --git a/Sources/VideoLoadable.swift b/Sources/MetalScope/Media/VideoLoadable.swift
similarity index 100%
rename from Sources/VideoLoadable.swift
rename to Sources/MetalScope/Media/VideoLoadable.swift
diff --git a/Sources/VideoScene.swift b/Sources/MetalScope/Media/VideoScene.swift
similarity index 100%
rename from Sources/VideoScene.swift
rename to Sources/MetalScope/Media/VideoScene.swift
diff --git a/Sources/DeviceOrientationProvider.swift b/Sources/MetalScope/OrientationNode/DeviceOrientationProvider.swift
similarity index 100%
rename from Sources/DeviceOrientationProvider.swift
rename to Sources/MetalScope/OrientationNode/DeviceOrientationProvider.swift
diff --git a/Sources/InterfaceOrientationProvider.swift b/Sources/MetalScope/OrientationNode/InterfaceOrientationProvider.swift
similarity index 100%
rename from Sources/InterfaceOrientationProvider.swift
rename to Sources/MetalScope/OrientationNode/InterfaceOrientationProvider.swift
diff --git a/Sources/InterfaceOrientationUpdater.swift b/Sources/MetalScope/OrientationNode/InterfaceOrientationUpdater.swift
similarity index 100%
rename from Sources/InterfaceOrientationUpdater.swift
rename to Sources/MetalScope/OrientationNode/InterfaceOrientationUpdater.swift
diff --git a/Sources/OrientationNode.swift b/Sources/MetalScope/OrientationNode/OrientationNode.swift
similarity index 100%
rename from Sources/OrientationNode.swift
rename to Sources/MetalScope/OrientationNode/OrientationNode.swift
diff --git a/Sources/Rotation+CoreMotion.swift b/Sources/MetalScope/OrientationNode/Rotation+CoreMotion.swift
similarity index 100%
rename from Sources/Rotation+CoreMotion.swift
rename to Sources/MetalScope/OrientationNode/Rotation+CoreMotion.swift
diff --git a/Sources/Rotation+SceneKit.swift b/Sources/MetalScope/OrientationNode/Rotation+SceneKit.swift
similarity index 100%
rename from Sources/Rotation+SceneKit.swift
rename to Sources/MetalScope/OrientationNode/Rotation+SceneKit.swift
diff --git a/Sources/Rotation.swift b/Sources/MetalScope/OrientationNode/Rotation.swift
similarity index 100%
rename from Sources/Rotation.swift
rename to Sources/MetalScope/OrientationNode/Rotation.swift
diff --git a/Sources/PanoramaPanGestureManager.swift b/Sources/MetalScope/PanoramaView/PanoramaPanGestureManager.swift
similarity index 100%
rename from Sources/PanoramaPanGestureManager.swift
rename to Sources/MetalScope/PanoramaView/PanoramaPanGestureManager.swift
diff --git a/Sources/PanoramaView.swift b/Sources/MetalScope/PanoramaView/PanoramaView.swift
similarity index 100%
rename from Sources/PanoramaView.swift
rename to Sources/MetalScope/PanoramaView/PanoramaView.swift
diff --git a/Sources/Eye.swift b/Sources/MetalScope/StereoView/Eye.swift
similarity index 100%
rename from Sources/Eye.swift
rename to Sources/MetalScope/StereoView/Eye.swift
diff --git a/Sources/ScreenModel.swift b/Sources/MetalScope/StereoView/ScreenModel.swift
similarity index 100%
rename from Sources/ScreenModel.swift
rename to Sources/MetalScope/StereoView/ScreenModel.swift
diff --git a/Sources/ScreenParameters.swift b/Sources/MetalScope/StereoView/ScreenParameters.swift
similarity index 100%
rename from Sources/ScreenParameters.swift
rename to Sources/MetalScope/StereoView/ScreenParameters.swift
diff --git a/Sources/StereoCameraNode.swift b/Sources/MetalScope/StereoView/StereoCameraNode.swift
similarity index 100%
rename from Sources/StereoCameraNode.swift
rename to Sources/MetalScope/StereoView/StereoCameraNode.swift
diff --git a/Sources/StereoParameters.swift b/Sources/MetalScope/StereoView/StereoParameters.swift
similarity index 100%
rename from Sources/StereoParameters.swift
rename to Sources/MetalScope/StereoView/StereoParameters.swift
diff --git a/Sources/StereoRenderer.swift b/Sources/MetalScope/StereoView/StereoRenderer.swift
similarity index 100%
rename from Sources/StereoRenderer.swift
rename to Sources/MetalScope/StereoView/StereoRenderer.swift
diff --git a/Sources/StereoScene.swift b/Sources/MetalScope/StereoView/StereoScene.swift
similarity index 100%
rename from Sources/StereoScene.swift
rename to Sources/MetalScope/StereoView/StereoScene.swift
diff --git a/Sources/StereoView.swift b/Sources/MetalScope/StereoView/StereoView.swift
similarity index 100%
rename from Sources/StereoView.swift
rename to Sources/MetalScope/StereoView/StereoView.swift
diff --git a/Sources/StereoViewController.swift b/Sources/MetalScope/StereoView/StereoViewController.swift
similarity index 100%
rename from Sources/StereoViewController.swift
rename to Sources/MetalScope/StereoView/StereoViewController.swift
diff --git a/Sources/ViewerModel.swift b/Sources/MetalScope/StereoView/ViewerModel.swift
similarity index 100%
rename from Sources/ViewerModel.swift
rename to Sources/MetalScope/StereoView/ViewerModel.swift
diff --git a/Sources/ViewerParameters.swift b/Sources/MetalScope/StereoView/ViewerParameters.swift
similarity index 100%
rename from Sources/ViewerParameters.swift
rename to Sources/MetalScope/StereoView/ViewerParameters.swift
diff --git a/Sources/OrientationIndicator.swift b/Sources/MetalScope/UI/OrientationIndicator.swift
similarity index 100%
rename from Sources/OrientationIndicator.swift
rename to Sources/MetalScope/UI/OrientationIndicator.swift
diff --git a/Sources/KeyValueObserver.swift b/Sources/MetalScope/Utilities/KeyValueObserver.swift
similarity index 100%
rename from Sources/KeyValueObserver.swift
rename to Sources/MetalScope/Utilities/KeyValueObserver.swift
diff --git a/Sources/RenderLoop.swift b/Sources/MetalScope/Utilities/RenderLoop.swift
similarity index 100%
rename from Sources/RenderLoop.swift
rename to Sources/MetalScope/Utilities/RenderLoop.swift