diff --git a/src/extensions/Riverside.Extensions.Accountability/FromUnmanagedAttribute.cs b/components/Riverside.Extensions.Accountability/FromUnmanagedAttribute.cs
similarity index 100%
rename from src/extensions/Riverside.Extensions.Accountability/FromUnmanagedAttribute.cs
rename to components/Riverside.Extensions.Accountability/FromUnmanagedAttribute.cs
diff --git a/src/extensions/Riverside.Extensions.Accountability/NotMyCodeAttribute.cs b/components/Riverside.Extensions.Accountability/NotMyCodeAttribute.cs
similarity index 100%
rename from src/extensions/Riverside.Extensions.Accountability/NotMyCodeAttribute.cs
rename to components/Riverside.Extensions.Accountability/NotMyCodeAttribute.cs
diff --git a/src/extensions/Riverside.Extensions.Accountability/Riverside.Extensions.Accountability.csproj b/components/Riverside.Extensions.Accountability/Riverside.Extensions.Accountability.csproj
similarity index 100%
rename from src/extensions/Riverside.Extensions.Accountability/Riverside.Extensions.Accountability.csproj
rename to components/Riverside.Extensions.Accountability/Riverside.Extensions.Accountability.csproj
diff --git a/src/extensions/Riverside.Extensions.PInvoke/COMErrorHandling.cs b/components/Riverside.Extensions.PInvoke/COMErrorHandling.cs
similarity index 100%
rename from src/extensions/Riverside.Extensions.PInvoke/COMErrorHandling.cs
rename to components/Riverside.Extensions.PInvoke/COMErrorHandling.cs
diff --git a/src/extensions/Riverside.Extensions.PInvoke/InteropUtilities.cs b/components/Riverside.Extensions.PInvoke/InteropUtilities.cs
similarity index 100%
rename from src/extensions/Riverside.Extensions.PInvoke/InteropUtilities.cs
rename to components/Riverside.Extensions.PInvoke/InteropUtilities.cs
diff --git a/src/extensions/Riverside.Extensions.PInvoke/Libraries.cs b/components/Riverside.Extensions.PInvoke/Libraries.cs
similarity index 100%
rename from src/extensions/Riverside.Extensions.PInvoke/Libraries.cs
rename to components/Riverside.Extensions.PInvoke/Libraries.cs
diff --git a/src/extensions/Riverside.Extensions.PInvoke/ObjectWrapper.cs b/components/Riverside.Extensions.PInvoke/ObjectWrapper.cs
similarity index 100%
rename from src/extensions/Riverside.Extensions.PInvoke/ObjectWrapper.cs
rename to components/Riverside.Extensions.PInvoke/ObjectWrapper.cs
diff --git a/src/extensions/Riverside.Extensions.PInvoke/Objects.cs b/components/Riverside.Extensions.PInvoke/Objects.cs
similarity index 100%
rename from src/extensions/Riverside.Extensions.PInvoke/Objects.cs
rename to components/Riverside.Extensions.PInvoke/Objects.cs
diff --git a/src/extensions/Riverside.Extensions.PInvoke/Riverside.Extensions.PInvoke.csproj b/components/Riverside.Extensions.PInvoke/Riverside.Extensions.PInvoke.csproj
similarity index 100%
rename from src/extensions/Riverside.Extensions.PInvoke/Riverside.Extensions.PInvoke.csproj
rename to components/Riverside.Extensions.PInvoke/Riverside.Extensions.PInvoke.csproj
diff --git a/src/extensions/Riverside.Extensions.Primitives/Bulkhead.cs b/components/Riverside.Extensions.Primitives/Bulkhead.cs
similarity index 100%
rename from src/extensions/Riverside.Extensions.Primitives/Bulkhead.cs
rename to components/Riverside.Extensions.Primitives/Bulkhead.cs
diff --git a/src/extensions/Riverside.Extensions.Primitives/Circuits/AdvancedCircuitBreaker.cs b/components/Riverside.Extensions.Primitives/Circuits/AdvancedCircuitBreaker.cs
similarity index 100%
rename from src/extensions/Riverside.Extensions.Primitives/Circuits/AdvancedCircuitBreaker.cs
rename to components/Riverside.Extensions.Primitives/Circuits/AdvancedCircuitBreaker.cs
diff --git a/src/extensions/Riverside.Extensions.Primitives/Circuits/CircuitBreaker.cs b/components/Riverside.Extensions.Primitives/Circuits/CircuitBreaker.cs
similarity index 100%
rename from src/extensions/Riverside.Extensions.Primitives/Circuits/CircuitBreaker.cs
rename to components/Riverside.Extensions.Primitives/Circuits/CircuitBreaker.cs
diff --git a/src/extensions/Riverside.Extensions.Primitives/Http.cs b/components/Riverside.Extensions.Primitives/Http.cs
similarity index 100%
rename from src/extensions/Riverside.Extensions.Primitives/Http.cs
rename to components/Riverside.Extensions.Primitives/Http.cs
diff --git a/src/extensions/Riverside.Extensions.Primitives/Memoization.cs b/components/Riverside.Extensions.Primitives/Memoization.cs
similarity index 100%
rename from src/extensions/Riverside.Extensions.Primitives/Memoization.cs
rename to components/Riverside.Extensions.Primitives/Memoization.cs
diff --git a/src/extensions/Riverside.Extensions.Primitives/Policies/ExponentialBackoffRetryPolicy.cs b/components/Riverside.Extensions.Primitives/Policies/ExponentialBackoffRetryPolicy.cs
similarity index 100%
rename from src/extensions/Riverside.Extensions.Primitives/Policies/ExponentialBackoffRetryPolicy.cs
rename to components/Riverside.Extensions.Primitives/Policies/ExponentialBackoffRetryPolicy.cs
diff --git a/src/extensions/Riverside.Extensions.Primitives/Policies/JitterRetryPolicy.cs b/components/Riverside.Extensions.Primitives/Policies/JitterRetryPolicy.cs
similarity index 100%
rename from src/extensions/Riverside.Extensions.Primitives/Policies/JitterRetryPolicy.cs
rename to components/Riverside.Extensions.Primitives/Policies/JitterRetryPolicy.cs
diff --git a/src/extensions/Riverside.Extensions.Primitives/Policies/RetryPolicy.cs b/components/Riverside.Extensions.Primitives/Policies/RetryPolicy.cs
similarity index 100%
rename from src/extensions/Riverside.Extensions.Primitives/Policies/RetryPolicy.cs
rename to components/Riverside.Extensions.Primitives/Policies/RetryPolicy.cs
diff --git a/src/extensions/Riverside.Extensions.Primitives/Policies/TimeoutPolicy.cs b/components/Riverside.Extensions.Primitives/Policies/TimeoutPolicy.cs
similarity index 100%
rename from src/extensions/Riverside.Extensions.Primitives/Policies/TimeoutPolicy.cs
rename to components/Riverside.Extensions.Primitives/Policies/TimeoutPolicy.cs
diff --git a/src/extensions/Riverside.Extensions.Primitives/PriorityQueue.cs b/components/Riverside.Extensions.Primitives/PriorityQueue.cs
similarity index 100%
rename from src/extensions/Riverside.Extensions.Primitives/PriorityQueue.cs
rename to components/Riverside.Extensions.Primitives/PriorityQueue.cs
diff --git a/src/extensions/Riverside.Extensions.Primitives/PriorityTaskScheduler.cs b/components/Riverside.Extensions.Primitives/PriorityTaskScheduler.cs
similarity index 100%
rename from src/extensions/Riverside.Extensions.Primitives/PriorityTaskScheduler.cs
rename to components/Riverside.Extensions.Primitives/PriorityTaskScheduler.cs
diff --git a/src/extensions/Riverside.Extensions.Primitives/RateLimiters/Debouncer.cs b/components/Riverside.Extensions.Primitives/RateLimiters/Debouncer.cs
similarity index 100%
rename from src/extensions/Riverside.Extensions.Primitives/RateLimiters/Debouncer.cs
rename to components/Riverside.Extensions.Primitives/RateLimiters/Debouncer.cs
diff --git a/src/extensions/Riverside.Extensions.Primitives/RateLimiters/DynamicTokenBucketRateLimiter.cs b/components/Riverside.Extensions.Primitives/RateLimiters/DynamicTokenBucketRateLimiter.cs
similarity index 100%
rename from src/extensions/Riverside.Extensions.Primitives/RateLimiters/DynamicTokenBucketRateLimiter.cs
rename to components/Riverside.Extensions.Primitives/RateLimiters/DynamicTokenBucketRateLimiter.cs
diff --git a/src/extensions/Riverside.Extensions.Primitives/RateLimiters/ExponentialBackoffRateLimiter.cs b/components/Riverside.Extensions.Primitives/RateLimiters/ExponentialBackoffRateLimiter.cs
similarity index 100%
rename from src/extensions/Riverside.Extensions.Primitives/RateLimiters/ExponentialBackoffRateLimiter.cs
rename to components/Riverside.Extensions.Primitives/RateLimiters/ExponentialBackoffRateLimiter.cs
diff --git a/src/extensions/Riverside.Extensions.Primitives/RateLimiters/FixedWindowRateLimiter.cs b/components/Riverside.Extensions.Primitives/RateLimiters/FixedWindowRateLimiter.cs
similarity index 100%
rename from src/extensions/Riverside.Extensions.Primitives/RateLimiters/FixedWindowRateLimiter.cs
rename to components/Riverside.Extensions.Primitives/RateLimiters/FixedWindowRateLimiter.cs
diff --git a/src/extensions/Riverside.Extensions.Primitives/RateLimiters/LeakyBucketRateLimiter.cs b/components/Riverside.Extensions.Primitives/RateLimiters/LeakyBucketRateLimiter.cs
similarity index 100%
rename from src/extensions/Riverside.Extensions.Primitives/RateLimiters/LeakyBucketRateLimiter.cs
rename to components/Riverside.Extensions.Primitives/RateLimiters/LeakyBucketRateLimiter.cs
diff --git a/src/extensions/Riverside.Extensions.Primitives/RateLimiters/RateLimiter.cs b/components/Riverside.Extensions.Primitives/RateLimiters/RateLimiter.cs
similarity index 100%
rename from src/extensions/Riverside.Extensions.Primitives/RateLimiters/RateLimiter.cs
rename to components/Riverside.Extensions.Primitives/RateLimiters/RateLimiter.cs
diff --git a/src/extensions/Riverside.Extensions.Primitives/RateLimiters/SlidingLogRateLimiter.cs b/components/Riverside.Extensions.Primitives/RateLimiters/SlidingLogRateLimiter.cs
similarity index 100%
rename from src/extensions/Riverside.Extensions.Primitives/RateLimiters/SlidingLogRateLimiter.cs
rename to components/Riverside.Extensions.Primitives/RateLimiters/SlidingLogRateLimiter.cs
diff --git a/src/extensions/Riverside.Extensions.Primitives/RateLimiters/SlidingWindowRateLimiter.cs b/components/Riverside.Extensions.Primitives/RateLimiters/SlidingWindowRateLimiter.cs
similarity index 100%
rename from src/extensions/Riverside.Extensions.Primitives/RateLimiters/SlidingWindowRateLimiter.cs
rename to components/Riverside.Extensions.Primitives/RateLimiters/SlidingWindowRateLimiter.cs
diff --git a/src/extensions/Riverside.Extensions.Primitives/RateLimiters/Throttler.cs b/components/Riverside.Extensions.Primitives/RateLimiters/Throttler.cs
similarity index 100%
rename from src/extensions/Riverside.Extensions.Primitives/RateLimiters/Throttler.cs
rename to components/Riverside.Extensions.Primitives/RateLimiters/Throttler.cs
diff --git a/src/extensions/Riverside.Extensions.Primitives/RateLimiters/TokenBucketRateLimiter.cs b/components/Riverside.Extensions.Primitives/RateLimiters/TokenBucketRateLimiter.cs
similarity index 100%
rename from src/extensions/Riverside.Extensions.Primitives/RateLimiters/TokenBucketRateLimiter.cs
rename to components/Riverside.Extensions.Primitives/RateLimiters/TokenBucketRateLimiter.cs
diff --git a/src/extensions/Riverside.Extensions.Primitives/Riverside.Extensions.Primitives.csproj b/components/Riverside.Extensions.Primitives/Riverside.Extensions.Primitives.csproj
similarity index 100%
rename from src/extensions/Riverside.Extensions.Primitives/Riverside.Extensions.Primitives.csproj
rename to components/Riverside.Extensions.Primitives/Riverside.Extensions.Primitives.csproj
diff --git a/src/extensions/Riverside.Extensions.Primitives/SemaphoreLock.cs b/components/Riverside.Extensions.Primitives/SemaphoreLock.cs
similarity index 100%
rename from src/extensions/Riverside.Extensions.Primitives/SemaphoreLock.cs
rename to components/Riverside.Extensions.Primitives/SemaphoreLock.cs
diff --git a/src/extensions/Riverside.Extensions.Primitives/SimpleCache.cs b/components/Riverside.Extensions.Primitives/SimpleCache.cs
similarity index 100%
rename from src/extensions/Riverside.Extensions.Primitives/SimpleCache.cs
rename to components/Riverside.Extensions.Primitives/SimpleCache.cs
diff --git a/src/extensions/Riverside.Extensions.Primitives/WeightedRoundRobinScheduler.cs b/components/Riverside.Extensions.Primitives/WeightedRoundRobinScheduler.cs
similarity index 100%
rename from src/extensions/Riverside.Extensions.Primitives/WeightedRoundRobinScheduler.cs
rename to components/Riverside.Extensions.Primitives/WeightedRoundRobinScheduler.cs
diff --git a/src/extensions/Riverside.Extensions.UAP/Riverside.Extensions.UAP.csproj b/components/Riverside.Extensions.UAP/Riverside.Extensions.UAP.csproj
similarity index 100%
rename from src/extensions/Riverside.Extensions.UAP/Riverside.Extensions.UAP.csproj
rename to components/Riverside.Extensions.UAP/Riverside.Extensions.UAP.csproj
diff --git a/src/extensions/Riverside.Extensions.Versioning/OSVersion.cs b/components/Riverside.Extensions.Versioning/OSVersion.cs
similarity index 100%
rename from src/extensions/Riverside.Extensions.Versioning/OSVersion.cs
rename to components/Riverside.Extensions.Versioning/OSVersion.cs
diff --git a/src/extensions/Riverside.Extensions.Versioning/Riverside.Extensions.Versioning.csproj b/components/Riverside.Extensions.Versioning/Riverside.Extensions.Versioning.csproj
similarity index 100%
rename from src/extensions/Riverside.Extensions.Versioning/Riverside.Extensions.Versioning.csproj
rename to components/Riverside.Extensions.Versioning/Riverside.Extensions.Versioning.csproj
diff --git a/src/extensions/Riverside.Extensions.Versioning/Version.cs b/components/Riverside.Extensions.Versioning/Version.cs
similarity index 100%
rename from src/extensions/Riverside.Extensions.Versioning/Version.cs
rename to components/Riverside.Extensions.Versioning/Version.cs
diff --git a/src/core/Riverside.Extensions.WinUI/UnifiedApp.cs b/components/Riverside.Extensions.WinUI/UnifiedApp.cs
similarity index 100%
rename from src/core/Riverside.Extensions.WinUI/UnifiedApp.cs
rename to components/Riverside.Extensions.WinUI/UnifiedApp.cs
diff --git a/src/core/Riverside.GlowUI.Styles/ComboBox.xaml b/components/Riverside.GlowUI.Styles/ComboBox.xaml
similarity index 100%
rename from src/core/Riverside.GlowUI.Styles/ComboBox.xaml
rename to components/Riverside.GlowUI.Styles/ComboBox.xaml
diff --git a/src/core/Riverside.GlowUI.Styles/CubeThemeDictionary.xaml b/components/Riverside.GlowUI.Styles/CubeThemeDictionary.xaml
similarity index 100%
rename from src/core/Riverside.GlowUI.Styles/CubeThemeDictionary.xaml
rename to components/Riverside.GlowUI.Styles/CubeThemeDictionary.xaml
diff --git a/src/core/Riverside.GlowUI.Styles/CubeUI.xaml b/components/Riverside.GlowUI.Styles/CubeUI.xaml
similarity index 100%
rename from src/core/Riverside.GlowUI.Styles/CubeUI.xaml
rename to components/Riverside.GlowUI.Styles/CubeUI.xaml
diff --git a/src/core/Riverside.GlowUI.Styles/FlipView.xaml b/components/Riverside.GlowUI.Styles/FlipView.xaml
similarity index 100%
rename from src/core/Riverside.GlowUI.Styles/FlipView.xaml
rename to components/Riverside.GlowUI.Styles/FlipView.xaml
diff --git a/src/core/Riverside.GlowUI.Styles/Flyout.xaml b/components/Riverside.GlowUI.Styles/Flyout.xaml
similarity index 100%
rename from src/core/Riverside.GlowUI.Styles/Flyout.xaml
rename to components/Riverside.GlowUI.Styles/Flyout.xaml
diff --git a/src/core/Riverside.GlowUI.Styles/GlowGradientUI.xaml b/components/Riverside.GlowUI.Styles/GlowGradientUI.xaml
similarity index 100%
rename from src/core/Riverside.GlowUI.Styles/GlowGradientUI.xaml
rename to components/Riverside.GlowUI.Styles/GlowGradientUI.xaml
diff --git a/src/core/Riverside.GlowUI.Styles/InfoBar.xaml b/components/Riverside.GlowUI.Styles/InfoBar.xaml
similarity index 100%
rename from src/core/Riverside.GlowUI.Styles/InfoBar.xaml
rename to components/Riverside.GlowUI.Styles/InfoBar.xaml
diff --git a/src/core/Riverside.GlowUI.Styles/NavigationView.xaml b/components/Riverside.GlowUI.Styles/NavigationView.xaml
similarity index 100%
rename from src/core/Riverside.GlowUI.Styles/NavigationView.xaml
rename to components/Riverside.GlowUI.Styles/NavigationView.xaml
diff --git a/src/core/Riverside.GlowUI.Styles/Pivot.xaml b/components/Riverside.GlowUI.Styles/Pivot.xaml
similarity index 100%
rename from src/core/Riverside.GlowUI.Styles/Pivot.xaml
rename to components/Riverside.GlowUI.Styles/Pivot.xaml
diff --git a/src/core/Riverside.GlowUI.Styles/Radio.xaml b/components/Riverside.GlowUI.Styles/Radio.xaml
similarity index 100%
rename from src/core/Riverside.GlowUI.Styles/Radio.xaml
rename to components/Riverside.GlowUI.Styles/Radio.xaml
diff --git a/src/core/Riverside.GlowUI.Styles/RichEditBox.xaml b/components/Riverside.GlowUI.Styles/RichEditBox.xaml
similarity index 100%
rename from src/core/Riverside.GlowUI.Styles/RichEditBox.xaml
rename to components/Riverside.GlowUI.Styles/RichEditBox.xaml
diff --git a/src/core/Riverside.GlowUI.Styles/Slider.xaml b/components/Riverside.GlowUI.Styles/Slider.xaml
similarity index 100%
rename from src/core/Riverside.GlowUI.Styles/Slider.xaml
rename to components/Riverside.GlowUI.Styles/Slider.xaml
diff --git a/src/core/Riverside.GlowUI.Styles/SplitView.xaml b/components/Riverside.GlowUI.Styles/SplitView.xaml
similarity index 100%
rename from src/core/Riverside.GlowUI.Styles/SplitView.xaml
rename to components/Riverside.GlowUI.Styles/SplitView.xaml
diff --git a/src/core/Riverside.GlowUI.Styles/TabView.xaml b/components/Riverside.GlowUI.Styles/TabView.xaml
similarity index 100%
rename from src/core/Riverside.GlowUI.Styles/TabView.xaml
rename to components/Riverside.GlowUI.Styles/TabView.xaml
diff --git a/src/core/Riverside.GlowUI.Styles/TextBox.xaml b/components/Riverside.GlowUI.Styles/TextBox.xaml
similarity index 100%
rename from src/core/Riverside.GlowUI.Styles/TextBox.xaml
rename to components/Riverside.GlowUI.Styles/TextBox.xaml
diff --git a/src/core/Riverside.GlowUI.Styles/ToggleSwitches.xaml b/components/Riverside.GlowUI.Styles/ToggleSwitches.xaml
similarity index 100%
rename from src/core/Riverside.GlowUI.Styles/ToggleSwitches.xaml
rename to components/Riverside.GlowUI.Styles/ToggleSwitches.xaml
diff --git a/src/core/Riverside.GlowUI.Styles/ToolTip.xaml b/components/Riverside.GlowUI.Styles/ToolTip.xaml
similarity index 100%
rename from src/core/Riverside.GlowUI.Styles/ToolTip.xaml
rename to components/Riverside.GlowUI.Styles/ToolTip.xaml
diff --git a/src/core/Riverside.GlowUI.Styles/WindowChrome.xaml b/components/Riverside.GlowUI.Styles/WindowChrome.xaml
similarity index 100%
rename from src/core/Riverside.GlowUI.Styles/WindowChrome.xaml
rename to components/Riverside.GlowUI.Styles/WindowChrome.xaml
diff --git a/src/core/Riverside.Toolkit.Animations/RefreshAnimation.cs b/components/Riverside.Toolkit.Animations/RefreshAnimation.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Animations/RefreshAnimation.cs
rename to components/Riverside.Toolkit.Animations/RefreshAnimation.cs
diff --git a/src/core/Riverside.Toolkit.Animations/SketchAnimation.cs b/components/Riverside.Toolkit.Animations/SketchAnimation.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Animations/SketchAnimation.cs
rename to components/Riverside.Toolkit.Animations/SketchAnimation.cs
diff --git a/src/core/Riverside.Toolkit.Controls.Crimson/GlowBall.xaml b/components/Riverside.Toolkit.Controls.Crimson/GlowBall.xaml
similarity index 100%
rename from src/core/Riverside.Toolkit.Controls.Crimson/GlowBall.xaml
rename to components/Riverside.Toolkit.Controls.Crimson/GlowBall.xaml
diff --git a/src/core/Riverside.Toolkit.Controls.Crimson/GlowBall.xaml.cs b/components/Riverside.Toolkit.Controls.Crimson/GlowBall.xaml.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Controls.Crimson/GlowBall.xaml.cs
rename to components/Riverside.Toolkit.Controls.Crimson/GlowBall.xaml.cs
diff --git a/src/core/Riverside.Toolkit.Controls.Crimson/GlowLine.xaml b/components/Riverside.Toolkit.Controls.Crimson/GlowLine.xaml
similarity index 100%
rename from src/core/Riverside.Toolkit.Controls.Crimson/GlowLine.xaml
rename to components/Riverside.Toolkit.Controls.Crimson/GlowLine.xaml
diff --git a/src/core/Riverside.Toolkit.Controls.Crimson/GlowLine.xaml.cs b/components/Riverside.Toolkit.Controls.Crimson/GlowLine.xaml.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Controls.Crimson/GlowLine.xaml.cs
rename to components/Riverside.Toolkit.Controls.Crimson/GlowLine.xaml.cs
diff --git a/src/core/Riverside.Toolkit.Controls.Primitives/Card.cs b/components/Riverside.Toolkit.Controls.Primitives/Card.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Controls.Primitives/Card.cs
rename to components/Riverside.Toolkit.Controls.Primitives/Card.cs
diff --git a/src/core/Riverside.Toolkit.Controls.Primitives/ChatBubble.cs b/components/Riverside.Toolkit.Controls.Primitives/ChatBubble.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Controls.Primitives/ChatBubble.cs
rename to components/Riverside.Toolkit.Controls.Primitives/ChatBubble.cs
diff --git a/src/core/Riverside.Toolkit.Controls.Primitives/CommandLink.cs b/components/Riverside.Toolkit.Controls.Primitives/CommandLink.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Controls.Primitives/CommandLink.cs
rename to components/Riverside.Toolkit.Controls.Primitives/CommandLink.cs
diff --git a/src/core/Riverside.Toolkit.Controls.Primitives/DropShadowPanel.Properties.cs b/components/Riverside.Toolkit.Controls.Primitives/DropShadowPanel.Properties.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Controls.Primitives/DropShadowPanel.Properties.cs
rename to components/Riverside.Toolkit.Controls.Primitives/DropShadowPanel.Properties.cs
diff --git a/src/core/Riverside.Toolkit.Controls.Primitives/DropShadowPanel.cs b/components/Riverside.Toolkit.Controls.Primitives/DropShadowPanel.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Controls.Primitives/DropShadowPanel.cs
rename to components/Riverside.Toolkit.Controls.Primitives/DropShadowPanel.cs
diff --git a/src/core/Riverside.Toolkit.Controls.Primitives/DropShadowPanel.xaml b/components/Riverside.Toolkit.Controls.Primitives/DropShadowPanel.xaml
similarity index 100%
rename from src/core/Riverside.Toolkit.Controls.Primitives/DropShadowPanel.xaml
rename to components/Riverside.Toolkit.Controls.Primitives/DropShadowPanel.xaml
diff --git a/src/core/Riverside.Toolkit.Controls.Primitives/IAlphaMaskProvider.cs b/components/Riverside.Toolkit.Controls.Primitives/IAlphaMaskProvider.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Controls.Primitives/IAlphaMaskProvider.cs
rename to components/Riverside.Toolkit.Controls.Primitives/IAlphaMaskProvider.cs
diff --git a/src/core/Riverside.Toolkit.Controls.Primitives/OpacityMaskView.cs b/components/Riverside.Toolkit.Controls.Primitives/OpacityMaskView.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Controls.Primitives/OpacityMaskView.cs
rename to components/Riverside.Toolkit.Controls.Primitives/OpacityMaskView.cs
diff --git a/src/core/Riverside.Toolkit.Controls.Primitives/RedirectVisualView.cs b/components/Riverside.Toolkit.Controls.Primitives/RedirectVisualView.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Controls.Primitives/RedirectVisualView.cs
rename to components/Riverside.Toolkit.Controls.Primitives/RedirectVisualView.cs
diff --git a/src/core/Riverside.Toolkit.Controls.Primitives/Themes/Generic.xaml b/components/Riverside.Toolkit.Controls.Primitives/Themes/Generic.xaml
similarity index 100%
rename from src/core/Riverside.Toolkit.Controls.Primitives/Themes/Generic.xaml
rename to components/Riverside.Toolkit.Controls.Primitives/Themes/Generic.xaml
diff --git a/src/core/Riverside.Toolkit.Controls.Settings/SettingsBlockControl.xaml b/components/Riverside.Toolkit.Controls.Settings/SettingsBlockControl.xaml
similarity index 100%
rename from src/core/Riverside.Toolkit.Controls.Settings/SettingsBlockControl.xaml
rename to components/Riverside.Toolkit.Controls.Settings/SettingsBlockControl.xaml
diff --git a/src/core/Riverside.Toolkit.Controls.Settings/SettingsBlockControl.xaml.cs b/components/Riverside.Toolkit.Controls.Settings/SettingsBlockControl.xaml.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Controls.Settings/SettingsBlockControl.xaml.cs
rename to components/Riverside.Toolkit.Controls.Settings/SettingsBlockControl.xaml.cs
diff --git a/src/core/Riverside.Toolkit.Controls.Settings/SettingsDisplayControl.xaml b/components/Riverside.Toolkit.Controls.Settings/SettingsDisplayControl.xaml
similarity index 100%
rename from src/core/Riverside.Toolkit.Controls.Settings/SettingsDisplayControl.xaml
rename to components/Riverside.Toolkit.Controls.Settings/SettingsDisplayControl.xaml
diff --git a/src/core/Riverside.Toolkit.Controls.Settings/SettingsDisplayControl.xaml.cs b/components/Riverside.Toolkit.Controls.Settings/SettingsDisplayControl.xaml.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Controls.Settings/SettingsDisplayControl.xaml.cs
rename to components/Riverside.Toolkit.Controls.Settings/SettingsDisplayControl.xaml.cs
diff --git a/src/core/Riverside.Toolkit.Controls.TitleBar/ButtonsState.cs b/components/Riverside.Toolkit.Controls.TitleBar/ButtonsState.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Controls.TitleBar/ButtonsState.cs
rename to components/Riverside.Toolkit.Controls.TitleBar/ButtonsState.cs
diff --git a/src/core/Riverside.Toolkit.Controls.TitleBar/SelectedCaptionButton.cs b/components/Riverside.Toolkit.Controls.TitleBar/SelectedCaptionButton.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Controls.TitleBar/SelectedCaptionButton.cs
rename to components/Riverside.Toolkit.Controls.TitleBar/SelectedCaptionButton.cs
diff --git a/src/core/Riverside.Toolkit.Controls.TitleBar/Themes/Generic.xaml b/components/Riverside.Toolkit.Controls.TitleBar/Themes/Generic.xaml
similarity index 100%
rename from src/core/Riverside.Toolkit.Controls.TitleBar/Themes/Generic.xaml
rename to components/Riverside.Toolkit.Controls.TitleBar/Themes/Generic.xaml
diff --git a/src/core/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.App.cs b/components/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.App.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.App.cs
rename to components/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.App.cs
diff --git a/src/core/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.Buttons.cs b/components/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.Buttons.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.Buttons.cs
rename to components/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.Buttons.cs
diff --git a/src/core/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.DependencyProperties.cs b/components/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.DependencyProperties.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.DependencyProperties.cs
rename to components/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.DependencyProperties.cs
diff --git a/src/core/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.EventHandlers.cs b/components/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.EventHandlers.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.EventHandlers.cs
rename to components/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.EventHandlers.cs
diff --git a/src/core/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.Native.cs b/components/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.Native.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.Native.cs
rename to components/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.Native.cs
diff --git a/src/core/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.Registry.cs b/components/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.Registry.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.Registry.cs
rename to components/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.Registry.cs
diff --git a/src/core/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.Window.cs b/components/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.Window.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.Window.cs
rename to components/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.Window.cs
diff --git a/src/core/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.WndProc.cs b/components/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.WndProc.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.WndProc.cs
rename to components/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.WndProc.cs
diff --git a/src/core/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.cs b/components/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.cs
rename to components/Riverside.Toolkit.Controls.TitleBar/TitleBarEx.cs
diff --git a/src/core/Riverside.Toolkit.Converters/BooleanToVisibilityConverter.cs b/components/Riverside.Toolkit.Converters/BooleanToVisibilityConverter.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Converters/BooleanToVisibilityConverter.cs
rename to components/Riverside.Toolkit.Converters/BooleanToVisibilityConverter.cs
diff --git a/src/core/Riverside.Toolkit.Converters/ColorToSolidColorBrushConverter.cs b/components/Riverside.Toolkit.Converters/ColorToSolidColorBrushConverter.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Converters/ColorToSolidColorBrushConverter.cs
rename to components/Riverside.Toolkit.Converters/ColorToSolidColorBrushConverter.cs
diff --git a/src/core/Riverside.Toolkit.Converters/Converters.xaml b/components/Riverside.Toolkit.Converters/Converters.xaml
similarity index 100%
rename from src/core/Riverside.Toolkit.Converters/Converters.xaml
rename to components/Riverside.Toolkit.Converters/Converters.xaml
diff --git a/src/core/Riverside.Toolkit.Converters/EnumToBoolConverter.cs b/components/Riverside.Toolkit.Converters/EnumToBoolConverter.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Converters/EnumToBoolConverter.cs
rename to components/Riverside.Toolkit.Converters/EnumToBoolConverter.cs
diff --git a/src/core/Riverside.Toolkit.Converters/InverseBooleanConverter.cs b/components/Riverside.Toolkit.Converters/InverseBooleanConverter.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Converters/InverseBooleanConverter.cs
rename to components/Riverside.Toolkit.Converters/InverseBooleanConverter.cs
diff --git a/src/core/Riverside.Toolkit.Converters/NullToTrueConverter.cs b/components/Riverside.Toolkit.Converters/NullToTrueConverter.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Converters/NullToTrueConverter.cs
rename to components/Riverside.Toolkit.Converters/NullToTrueConverter.cs
diff --git a/src/core/Riverside.Toolkit.Converters/StringNullOrWhiteSpaceToTrueConverter.cs b/components/Riverside.Toolkit.Converters/StringNullOrWhiteSpaceToTrueConverter.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Converters/StringNullOrWhiteSpaceToTrueConverter.cs
rename to components/Riverside.Toolkit.Converters/StringNullOrWhiteSpaceToTrueConverter.cs
diff --git a/src/core/Riverside.Toolkit.Converters/ToObjectConverter.cs b/components/Riverside.Toolkit.Converters/ToObjectConverter.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Converters/ToObjectConverter.cs
rename to components/Riverside.Toolkit.Converters/ToObjectConverter.cs
diff --git a/src/core/Riverside.Toolkit.Converters/ValueConverter.cs b/components/Riverside.Toolkit.Converters/ValueConverter.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Converters/ValueConverter.cs
rename to components/Riverside.Toolkit.Converters/ValueConverter.cs
diff --git a/src/core/Riverside.Toolkit.Helpers/ColorHelper.cs b/components/Riverside.Toolkit.Helpers/ColorHelper.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Helpers/ColorHelper.cs
rename to components/Riverside.Toolkit.Helpers/ColorHelper.cs
diff --git a/src/core/Riverside.Toolkit.Helpers/DesignTimeHelpers.cs b/components/Riverside.Toolkit.Helpers/DesignTimeHelpers.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Helpers/DesignTimeHelpers.cs
rename to components/Riverside.Toolkit.Helpers/DesignTimeHelpers.cs
diff --git a/src/core/Riverside.Toolkit.Helpers/DragAndDropHelper.cs b/components/Riverside.Toolkit.Helpers/DragAndDropHelper.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Helpers/DragAndDropHelper.cs
rename to components/Riverside.Toolkit.Helpers/DragAndDropHelper.cs
diff --git a/src/core/Riverside.Toolkit.Helpers/NativeHelper.cs b/components/Riverside.Toolkit.Helpers/NativeHelper.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Helpers/NativeHelper.cs
rename to components/Riverside.Toolkit.Helpers/NativeHelper.cs
diff --git a/src/core/Riverside.Toolkit.Helpers/ObjectStorage/ApplicationDataStorageHelper.cs b/components/Riverside.Toolkit.Helpers/ObjectStorage/ApplicationDataStorageHelper.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Helpers/ObjectStorage/ApplicationDataStorageHelper.cs
rename to components/Riverside.Toolkit.Helpers/ObjectStorage/ApplicationDataStorageHelper.cs
diff --git a/src/core/Riverside.Toolkit.Helpers/StorageFileHelper.cs b/components/Riverside.Toolkit.Helpers/StorageFileHelper.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Helpers/StorageFileHelper.cs
rename to components/Riverside.Toolkit.Helpers/StorageFileHelper.cs
diff --git a/src/core/Riverside.Toolkit.Helpers/SystemInformation.cs b/components/Riverside.Toolkit.Helpers/SystemInformation.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Helpers/SystemInformation.cs
rename to components/Riverside.Toolkit.Helpers/SystemInformation.cs
diff --git a/src/core/Riverside.Toolkit.Helpers/ThemeHelper.cs b/components/Riverside.Toolkit.Helpers/ThemeHelper.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Helpers/ThemeHelper.cs
rename to components/Riverside.Toolkit.Helpers/ThemeHelper.cs
diff --git a/src/core/Riverside.Toolkit.Icons/FluentIconElement.cs b/components/Riverside.Toolkit.Icons/FluentIconElement.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Icons/FluentIconElement.cs
rename to components/Riverside.Toolkit.Icons/FluentIconElement.cs
diff --git a/src/core/Riverside.Toolkit.Icons/FluentIconSource.cs b/components/Riverside.Toolkit.Icons/FluentIconSource.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Icons/FluentIconSource.cs
rename to components/Riverside.Toolkit.Icons/FluentIconSource.cs
diff --git a/src/core/Riverside.Toolkit.Icons/FluentSymbol.cs b/components/Riverside.Toolkit.Icons/FluentSymbol.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Icons/FluentSymbol.cs
rename to components/Riverside.Toolkit.Icons/FluentSymbol.cs
diff --git a/src/core/Riverside.Toolkit.Icons/FluentSymbolIcon.Icons.cs b/components/Riverside.Toolkit.Icons/FluentSymbolIcon.Icons.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Icons/FluentSymbolIcon.Icons.cs
rename to components/Riverside.Toolkit.Icons/FluentSymbolIcon.Icons.cs
diff --git a/src/core/Riverside.Toolkit.Icons/FluentSymbolIcon.cs b/components/Riverside.Toolkit.Icons/FluentSymbolIcon.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Icons/FluentSymbolIcon.cs
rename to components/Riverside.Toolkit.Icons/FluentSymbolIcon.cs
diff --git a/src/core/Riverside.Toolkit.Icons/Themes/Generic.xaml b/components/Riverside.Toolkit.Icons/Themes/Generic.xaml
similarity index 100%
rename from src/core/Riverside.Toolkit.Icons/Themes/Generic.xaml
rename to components/Riverside.Toolkit.Icons/Themes/Generic.xaml
diff --git a/src/core/Riverside.Toolkit.Media/ApplicationBrushes.xaml b/components/Riverside.Toolkit.Media/ApplicationBrushes.xaml
similarity index 100%
rename from src/core/Riverside.Toolkit.Media/ApplicationBrushes.xaml
rename to components/Riverside.Toolkit.Media/ApplicationBrushes.xaml
diff --git a/src/core/Riverside.Toolkit.Media/AuroraLite.xaml b/components/Riverside.Toolkit.Media/AuroraLite.xaml
similarity index 100%
rename from src/core/Riverside.Toolkit.Media/AuroraLite.xaml
rename to components/Riverside.Toolkit.Media/AuroraLite.xaml
diff --git a/src/core/Riverside.Toolkit.Media/AuroraLite.xaml.cs b/components/Riverside.Toolkit.Media/AuroraLite.xaml.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Media/AuroraLite.xaml.cs
rename to components/Riverside.Toolkit.Media/AuroraLite.xaml.cs
diff --git a/src/core/Riverside.Toolkit.Media/BackdropKind.cs b/components/Riverside.Toolkit.Media/BackdropKind.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Media/BackdropKind.cs
rename to components/Riverside.Toolkit.Media/BackdropKind.cs
diff --git a/src/core/Riverside.Toolkit.Media/Bloom.html b/components/Riverside.Toolkit.Media/Bloom.html
similarity index 100%
rename from src/core/Riverside.Toolkit.Media/Bloom.html
rename to components/Riverside.Toolkit.Media/Bloom.html
diff --git a/src/core/Riverside.Toolkit.Media/BloomView.xaml b/components/Riverside.Toolkit.Media/BloomView.xaml
similarity index 100%
rename from src/core/Riverside.Toolkit.Media/BloomView.xaml
rename to components/Riverside.Toolkit.Media/BloomView.xaml
diff --git a/src/core/Riverside.Toolkit.Media/BloomView.xaml.cs b/components/Riverside.Toolkit.Media/BloomView.xaml.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Media/BloomView.xaml.cs
rename to components/Riverside.Toolkit.Media/BloomView.xaml.cs
diff --git a/src/core/Riverside.Toolkit.Media/MicaAltBrush.cs b/components/Riverside.Toolkit.Media/MicaAltBrush.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Media/MicaAltBrush.cs
rename to components/Riverside.Toolkit.Media/MicaAltBrush.cs
diff --git a/src/core/Riverside.Toolkit.Media/MicaBrushes.xaml b/components/Riverside.Toolkit.Media/MicaBrushes.xaml
similarity index 100%
rename from src/core/Riverside.Toolkit.Media/MicaBrushes.xaml
rename to components/Riverside.Toolkit.Media/MicaBrushes.xaml
diff --git a/src/core/Riverside.Toolkit.Media/StyleBrushes.xaml b/components/Riverside.Toolkit.Media/StyleBrushes.xaml
similarity index 100%
rename from src/core/Riverside.Toolkit.Media/StyleBrushes.xaml
rename to components/Riverside.Toolkit.Media/StyleBrushes.xaml
diff --git a/src/core/Riverside.Toolkit.Media/Windows11Danger.html b/components/Riverside.Toolkit.Media/Windows11Danger.html
similarity index 100%
rename from src/core/Riverside.Toolkit.Media/Windows11Danger.html
rename to components/Riverside.Toolkit.Media/Windows11Danger.html
diff --git a/src/core/Riverside.Toolkit.Services/WindowService.cs b/components/Riverside.Toolkit.Services/WindowService.cs
similarity index 100%
rename from src/core/Riverside.Toolkit.Services/WindowService.cs
rename to components/Riverside.Toolkit.Services/WindowService.cs
diff --git a/dev/Directory.Build.props b/dev/Directory.Build.props
deleted file mode 100644
index 1ceb417..0000000
--- a/dev/Directory.Build.props
+++ /dev/null
@@ -1,3 +0,0 @@
-<Project>
-	<!-- This file is kept to ensure that no tooling is applied to the experimental/legacy projects in this directory -->
-</Project>
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
deleted file mode 100644
index 1ceb417..0000000
--- a/tests/Directory.Build.props
+++ /dev/null
@@ -1,3 +0,0 @@
-<Project>
-	<!-- This file is kept to ensure that no tooling is applied to the experimental/legacy projects in this directory -->
-</Project>
diff --git a/tests/Riverside.Toolkit.UITests/Assets/LockScreenLogo.scale-200.png b/tests/Riverside.Toolkit.UITests/Assets/LockScreenLogo.scale-200.png
deleted file mode 100644
index 7440f0d..0000000
Binary files a/tests/Riverside.Toolkit.UITests/Assets/LockScreenLogo.scale-200.png and /dev/null differ
diff --git a/tests/Riverside.Toolkit.UITests/Assets/Rebound.ico b/tests/Riverside.Toolkit.UITests/Assets/Rebound.ico
deleted file mode 100644
index 4c7b366..0000000
Binary files a/tests/Riverside.Toolkit.UITests/Assets/Rebound.ico and /dev/null differ
diff --git a/tests/Riverside.Toolkit.UITests/Assets/SplashScreen.scale-200.png b/tests/Riverside.Toolkit.UITests/Assets/SplashScreen.scale-200.png
deleted file mode 100644
index 32f486a..0000000
Binary files a/tests/Riverside.Toolkit.UITests/Assets/SplashScreen.scale-200.png and /dev/null differ
diff --git a/tests/Riverside.Toolkit.UITests/Assets/Square150x150Logo.scale-200.png b/tests/Riverside.Toolkit.UITests/Assets/Square150x150Logo.scale-200.png
deleted file mode 100644
index 53ee377..0000000
Binary files a/tests/Riverside.Toolkit.UITests/Assets/Square150x150Logo.scale-200.png and /dev/null differ
diff --git a/tests/Riverside.Toolkit.UITests/Assets/Square44x44Logo.scale-200.png b/tests/Riverside.Toolkit.UITests/Assets/Square44x44Logo.scale-200.png
deleted file mode 100644
index f713bba..0000000
Binary files a/tests/Riverside.Toolkit.UITests/Assets/Square44x44Logo.scale-200.png and /dev/null differ
diff --git a/tests/Riverside.Toolkit.UITests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/tests/Riverside.Toolkit.UITests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
deleted file mode 100644
index dc9f5be..0000000
Binary files a/tests/Riverside.Toolkit.UITests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png and /dev/null differ
diff --git a/tests/Riverside.Toolkit.UITests/Assets/StoreLogo.png b/tests/Riverside.Toolkit.UITests/Assets/StoreLogo.png
deleted file mode 100644
index a4586f2..0000000
Binary files a/tests/Riverside.Toolkit.UITests/Assets/StoreLogo.png and /dev/null differ
diff --git a/tests/Riverside.Toolkit.UITests/Assets/Wide310x150Logo.scale-200.png b/tests/Riverside.Toolkit.UITests/Assets/Wide310x150Logo.scale-200.png
deleted file mode 100644
index 8b4a5d0..0000000
Binary files a/tests/Riverside.Toolkit.UITests/Assets/Wide310x150Logo.scale-200.png and /dev/null differ
diff --git a/tests/Riverside.Toolkit.UITests/Package.appxmanifest b/tests/Riverside.Toolkit.UITests/Package.appxmanifest
deleted file mode 100644
index bb31047..0000000
--- a/tests/Riverside.Toolkit.UITests/Package.appxmanifest
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Package
-  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
-  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
-  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
-  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
-  IgnorableNamespaces="uap rescap">
-
-  <Identity
-    Name="23e2c470-1186-4cc8-9f7c-b461de0fa8f3"
-    Publisher="CN=Desktop Ivirius"
-    Version="1.0.0.0" />
-
-  <mp:PhoneIdentity PhoneProductId="23e2c470-1186-4cc8-9f7c-b461de0fa8f3" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
-
-  <Properties>
-    <DisplayName>Riverside.Toolkit.UITests</DisplayName>
-    <PublisherDisplayName>Desktop Ivirius</PublisherDisplayName>
-    <Logo>Assets\StoreLogo.png</Logo>
-  </Properties>
-
-  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
-  </Dependencies>
-
-  <Resources>
-    <Resource Language="x-generate"/>
-  </Resources>
-
-  <Applications>
-    <Application Id="App"
-      Executable="$targetnametoken$.exe"
-      EntryPoint="$targetentrypoint$">
-      <uap:VisualElements
-        DisplayName="Riverside.Toolkit.UITests"
-        Description="Riverside.Toolkit.UITests"
-        BackgroundColor="transparent"
-        Square150x150Logo="Assets\Square150x150Logo.png"
-        Square44x44Logo="Assets\Square44x44Logo.png">
-        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" />
-        <uap:SplashScreen Image="Assets\SplashScreen.png" />
-      </uap:VisualElements>
-    </Application>
-  </Applications>
-
-  <Capabilities>
-    <rescap:Capability Name="runFullTrust" />
-  </Capabilities>
-</Package>
diff --git a/tests/Riverside.Toolkit.UITests/Properties/launchSettings.json b/tests/Riverside.Toolkit.UITests/Properties/launchSettings.json
deleted file mode 100644
index 6024080..0000000
--- a/tests/Riverside.Toolkit.UITests/Properties/launchSettings.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "profiles": {
-    "Riverside.Toolkit.UITests (Package)": {
-      "commandName": "MsixPackage"
-    },
-    "Riverside.Toolkit.UITests (Unpackaged)": {
-      "commandName": "Project"
-    }
-  }
-}
\ No newline at end of file
diff --git a/tests/Riverside.Toolkit.UITests/Riverside.Toolkit.UITests.csproj b/tests/Riverside.Toolkit.UITests/Riverside.Toolkit.UITests.csproj
deleted file mode 100644
index 6e0af82..0000000
--- a/tests/Riverside.Toolkit.UITests/Riverside.Toolkit.UITests.csproj
+++ /dev/null
@@ -1,74 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
-    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
-    <Platforms>x86;x64;ARM64</Platforms>
-    <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
-    <PublishProfile>win-$(Platform).pubxml</PublishProfile>
-    <UseWinUI>true</UseWinUI>
-    <EnableMsixTooling>true</EnableMsixTooling>
-    <Nullable>enable</Nullable>
-	  <PublishAot>true</PublishAot>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Remove="Assets\Rebound.ico" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Page Remove="UnitTestApp.xaml" />
-    <ApplicationDefinition Include="UnitTestApp.xaml" />
-    <ProjectCapability Include="TestContainer" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="Assets\SplashScreen.scale-200.png" />
-    <Content Include="Assets\LockScreenLogo.scale-200.png" />
-    <Content Include="Assets\Square150x150Logo.scale-200.png" />
-    <Content Include="Assets\Square44x44Logo.scale-200.png" />
-    <Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
-    <Content Include="Assets\StoreLogo.png" />
-    <Content Include="Assets\Wide310x150Logo.scale-200.png" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Manifest Include="$(ApplicationManifest)" />
-  </ItemGroup>
-
-  <!-- 
-    Defining the "Msix" ProjectCapability here allows the Single-project MSIX Packaging
-    Tools extension to be activated for this project even if the Windows App SDK Nuget
-    package has not yet been restored.
-  -->
-  <ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
-    <ProjectCapability Include="Msix" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Graphics.Win2D" />
-    <PackageReference Include="Microsoft.TestPlatform.TestHost" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" />
-    <PackageReference Include="MSTest.TestAdapter" />
-    <PackageReference Include="MSTest.TestFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\platforms\Riverside.Toolkit.WinUI.Controls.TitleBar\Riverside.Toolkit.WinUI.Controls.TitleBar.csproj" />
-  </ItemGroup>
-
-  <!-- 
-    Defining the "HasPackageAndPublishMenuAddedByProject" property here allows the Solution 
-    Explorer "Package and Publish" context menu entry to be enabled for this project even if 
-    the Windows App SDK Nuget package has not yet been restored.
-  -->
-  <PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
-    <HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
-  </PropertyGroup>
-
-  <!-- Publish Properties -->
-  <PropertyGroup>
-    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
-    <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
-    <PublishTrimmed>False</PublishTrimmed>
-  </PropertyGroup>
-</Project>
diff --git a/tests/Riverside.Toolkit.UITests/UnitTestApp.xaml b/tests/Riverside.Toolkit.UITests/UnitTestApp.xaml
deleted file mode 100644
index a429ebf..0000000
--- a/tests/Riverside.Toolkit.UITests/UnitTestApp.xaml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Application
-    x:Class="Riverside.Toolkit.UITests.UnitTestApp"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Riverside.Toolkit.UITests">
-    <Application.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
-                <ResourceDictionary Source="ms-appx:///Riverside.Toolkit/Themes/Generic.xaml"/>
-                <!--  Other merged dictionaries here  -->
-            </ResourceDictionary.MergedDictionaries>
-            <!--  Other app resources here  -->
-        </ResourceDictionary>
-    </Application.Resources>
-</Application>
diff --git a/tests/Riverside.Toolkit.UITests/UnitTestApp.xaml.cs b/tests/Riverside.Toolkit.UITests/UnitTestApp.xaml.cs
deleted file mode 100644
index 560824d..0000000
--- a/tests/Riverside.Toolkit.UITests/UnitTestApp.xaml.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Microsoft.UI.Xaml;
-using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer;
-using System;
-
-// To learn more about WinUI, the WinUI project structure,
-// and more about our project templates, see: http://aka.ms/winui-project-info.
-
-namespace Riverside.Toolkit.UITests;
-
-/// <summary>
-/// Provides application-specific behavior to supplement the default Application class.
-/// </summary>
-public partial class UnitTestApp : Application
-{
-    /// <summary>
-    /// Initializes the singleton application object.  This is the first line of authored code
-    /// executed, and as such is the logical equivalent of main() or WinMain().
-    /// </summary>
-    public UnitTestApp()
-    {
-        this.InitializeComponent();
-    }
-
-    /// <summary>
-    /// Invoked when the application is launched.
-    /// </summary>
-    /// <param name="args">Details about the launch request and process.</param>
-    protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args)
-    {
-        Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.CreateDefaultUI();
-
-        m_window = new UnitTestAppWindow();
-        m_window.Activate();
-
-        UITestMethodAttribute.DispatcherQueue = m_window.DispatcherQueue;
-
-        Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.Run(Environment.CommandLine);
-    }
-
-    private Window? m_window;
-}
diff --git a/tests/Riverside.Toolkit.UITests/UnitTestAppWindow.xaml b/tests/Riverside.Toolkit.UITests/UnitTestAppWindow.xaml
deleted file mode 100644
index e45b354..0000000
--- a/tests/Riverside.Toolkit.UITests/UnitTestAppWindow.xaml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<winuiex:WindowEx
-    x:Class="Riverside.Toolkit.UITests.UnitTestAppWindow"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="using:Riverside.Toolkit.UITests"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:toolkit="using:Riverside.Toolkit.Controls"
-    xmlns:winuiex="using:WinUIEx"
-    Title="CubeKit Tests"
-    mc:Ignorable="d">
-
-    <Grid Background="#00010101">
-        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-            <ToggleSwitch Header="Maximizable" IsOn="{x:Bind TitleBar.IsMaximizable, Mode=TwoWay}" />
-            <ToggleSwitch Header="Minimizable" IsOn="{x:Bind TitleBar.IsMinimizable, Mode=TwoWay}" />
-            <ToggleSwitch Header="Closable" IsOn="{x:Bind TitleBar.IsClosable, Mode=TwoWay}" />
-            <ToggleSwitch Header="Always use WinUI" IsOn="{x:Bind TitleBar.UseWinUIEverywhere, Mode=TwoWay}" />
-            <ToggleSwitch Header="Allow accent title bar" IsOn="{x:Bind TitleBar.IsAccentTitleBarEnabled, Mode=TwoWay}" />
-        </StackPanel>
-        <toolkit:TitleBarEx
-            x:Name="TitleBar"
-            Title="Test app"
-            VerticalAlignment="Top"
-            MemorizeWindowPosition="True" />
-    </Grid>
-</winuiex:WindowEx>
\ No newline at end of file
diff --git a/tests/Riverside.Toolkit.UITests/UnitTestAppWindow.xaml.cs b/tests/Riverside.Toolkit.UITests/UnitTestAppWindow.xaml.cs
deleted file mode 100644
index 917f914..0000000
--- a/tests/Riverside.Toolkit.UITests/UnitTestAppWindow.xaml.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Microsoft.UI.Xaml;
-using WinUIEx;
-
-namespace Riverside.Toolkit.UITests;
-
-public sealed partial class UnitTestAppWindow : WindowEx
-{
-    public UnitTestAppWindow()
-    {
-        InitializeComponent();
-        TitleBar.InitializeForWindow(this, Application.Current);
-        TitleBar.SetWindowIcon(@"Assets/Rebound.ico");
-        SystemBackdrop = new Microsoft.UI.Xaml.Media.MicaBackdrop();
-    }
-}
\ No newline at end of file
diff --git a/tests/Riverside.Toolkit.UITests/UnitTests.cs b/tests/Riverside.Toolkit.UITests/UnitTests.cs
deleted file mode 100644
index 977617f..0000000
--- a/tests/Riverside.Toolkit.UITests/UnitTests.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer;
-
-namespace Riverside.Toolkit.UITests;
-
-[TestClass]
-public class UnitTest1
-{
-    [TestMethod]
-    public void TestMethod1()
-    {
-        Assert.AreEqual(0, 0);
-    }
-
-    // Use the UITestMethod attribute for tests that need to run on the UI thread.
-    [UITestMethod]
-    public void TestMethod2()
-    {
-        var grid = new Grid();
-        Assert.AreEqual(0, grid.MinWidth);
-    }
-}
diff --git a/tests/Riverside.Toolkit.UITests/app.manifest b/tests/Riverside.Toolkit.UITests/app.manifest
deleted file mode 100644
index ec8dd17..0000000
--- a/tests/Riverside.Toolkit.UITests/app.manifest
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.0.0" name="Riverside.Toolkit.UITests.app"/>
-
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <!-- The ID below informs the system that this application is compatible with OS features first introduced in Windows 10. 
-      It is necessary to support features in unpackaged applications, for example the custom titlebar implementation.
-      For more info see https://docs.microsoft.com/windows/apps/windows-app-sdk/use-windows-app-sdk-run-time#declare-os-compatibility-in-your-application-manifest -->
-      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
-    </application>
-  </compatibility>
-  
-  <application xmlns="urn:schemas-microsoft-com:asm.v3">
-    <windowsSettings>
-      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
-    </windowsSettings>
-  </application>
-</assembly>
\ No newline at end of file