diff --git a/UI/SemiUrsaMafia/Client.Avalonia/ViewModels/MainWindowViewModel.cs b/UI/SemiUrsaMafia/Client.Avalonia/ViewModels/MainWindowViewModel.cs
deleted file mode 100644
index ffcdf7a..0000000
--- a/UI/SemiUrsaMafia/Client.Avalonia/ViewModels/MainWindowViewModel.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace Client.Avalonia.ViewModels;
-
-public partial class MainWindowViewModel : ViewModelBase;
\ No newline at end of file
diff --git a/UI/SemiUrsaMafia/Directory.Packages.props b/UI/SemiUrsaMafia/Directory.Packages.props
index be87510..b525f1f 100644
--- a/UI/SemiUrsaMafia/Directory.Packages.props
+++ b/UI/SemiUrsaMafia/Directory.Packages.props
@@ -5,6 +5,7 @@
     </PropertyGroup>
     <ItemGroup>
         <PackageVersion Include="Avalonia" Version="$(AvaloniaVersion)"/>
+        <PackageVersion Include="Avalonia.Android" Version="$(AvaloniaVersion)"/>
         <PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaVersion)"/>
         <PackageVersion Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.3"/>
 
@@ -16,5 +17,6 @@
 
         <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.2"/>
         <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.11"/>
+        <PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.2.0.2"/>
     </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/Application.cs b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/Application.cs
new file mode 100644
index 0000000..66d4a81
--- /dev/null
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/Application.cs
@@ -0,0 +1,18 @@
+using Android.Runtime;
+using Avalonia;
+using Avalonia.Android;
+
+namespace GeneralUpdate.Samples.Mafia.Android;
+
+[Application]
+public class Application : AvaloniaAndroidApplication<App>
+{
+    protected Application(nint javaReference, JniHandleOwnership transfer) : base(javaReference, transfer)
+    {
+    }
+
+    protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
+    {
+        return base.CustomizeAppBuilder(builder);
+    }
+}
\ No newline at end of file
diff --git a/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/GeneralUpdate.Samples.Mafia.Android.csproj b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/GeneralUpdate.Samples.Mafia.Android.csproj
new file mode 100644
index 0000000..0da8b73
--- /dev/null
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/GeneralUpdate.Samples.Mafia.Android.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net10.0-android</TargetFramework>
+        <SupportedOSPlatformVersion>23</SupportedOSPlatformVersion>
+        <Nullable>enable</Nullable>
+        <ApplicationId>tech.irihi.GeneralUpdate.Samples</ApplicationId>
+        <ApplicationVersion>1</ApplicationVersion>
+        <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
+        <AndroidPackageFormat>apk</AndroidPackageFormat>
+        <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
+        <UseCoreCLR>true</UseCoreCLR>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <AndroidResource Include="Icon.png">
+            <Link>Resources\drawable\Icon.png</Link>
+        </AndroidResource>
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Avalonia.Android"/>
+        <PackageReference Include="Xamarin.AndroidX.Core.SplashScreen"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\GeneralUpdate.Samples.Mafia\GeneralUpdate.Samples.Mafia.csproj"/>
+    </ItemGroup>
+</Project>
diff --git a/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/Icon.png b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/Icon.png
new file mode 100644
index 0000000..fcc8847
Binary files /dev/null and b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/Icon.png differ
diff --git a/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/MainActivity.cs b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/MainActivity.cs
new file mode 100644
index 0000000..e80c9e3
--- /dev/null
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/MainActivity.cs
@@ -0,0 +1,18 @@
+using Android.Content.PM;
+using Avalonia.Android;
+
+namespace GeneralUpdate.Samples.Mafia.Android;
+
+[Activity(
+    Label = "GeneralUpdate.Samples.Mafia.Android",
+    Theme = "@style/MyTheme.NoActionBar",
+    Icon = "@drawable/icon",
+    MainLauncher = true,
+    ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize | ConfigChanges.UiMode)]
+public class MainActivity : AvaloniaMainActivity
+{
+    public override void OnBackPressed()
+    {
+        base.OnBackPressed();
+    }
+}
\ No newline at end of file
diff --git a/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/Properties/AndroidManifest.xml b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/Properties/AndroidManifest.xml
new file mode 100644
index 0000000..f4b70e5
--- /dev/null
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/Properties/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto">
+	<uses-permission android:name="android.permission.INTERNET" />
+	<application android:label="GeneralUpdate" android:icon="@drawable/Icon" />
+</manifest>
diff --git a/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/Resources/drawable-night-v31/avalonia_anim.xml b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/Resources/drawable-night-v31/avalonia_anim.xml
new file mode 100644
index 0000000..dde4b5a
--- /dev/null
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/Resources/drawable-night-v31/avalonia_anim.xml
@@ -0,0 +1,66 @@
+<animated-vector
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:aapt="http://schemas.android.com/aapt">
+  <aapt:attr name="android:drawable">
+    <vector
+      android:name="vector"
+      android:width="128dp"
+      android:height="128dp"
+      android:viewportWidth="128"
+      android:viewportHeight="128">
+      <group
+        android:name="wrapper"
+        android:translateX="21"
+        android:translateY="21">
+        <group android:name="group">
+          <path
+            android:name="path"
+            android:pathData="M 74.853 85.823 L 75.368 85.823 C 80.735 85.823 85.144 81.803 85.761 76.602 L 85.836 41.76 C 85.225 18.593 66.254 0 42.939 0 C 19.24 0 0.028 19.212 0.028 42.912 C 0.028 66.357 18.831 85.418 42.18 85.823 L 74.853 85.823 Z"
+            android:strokeWidth="1"/>
+          <path
+            android:name="path_1"
+            android:pathData="M 43.059 14.614 C 29.551 14.614 18.256 24.082 15.445 36.743 C 18.136 37.498 20.109 39.968 20.109 42.899 C 20.109 45.831 18.136 48.301 15.445 49.055 C 18.256 61.716 29.551 71.184 43.059 71.184 C 47.975 71.184 52.599 69.93 56.628 67.723 L 56.628 70.993 L 71.344 70.993 L 71.344 44.072 C 71.357 43.714 71.344 43.26 71.344 42.899 C 71.344 27.278 58.68 14.614 43.059 14.614 Z M 29.51 42.899 C 29.51 35.416 35.576 29.35 43.059 29.35 C 50.541 29.35 56.607 35.416 56.607 42.899 C 56.607 50.382 50.541 56.448 43.059 56.448 C 35.576 56.448 29.51 50.382 29.51 42.899 Z"
+            android:strokeWidth="1"
+            android:fillType="evenOdd"/>
+          <path
+            android:name="path_2"
+            android:pathData="M 18.105 42.88 C 18.105 45.38 16.078 47.407 13.579 47.407 C 11.079 47.407 9.052 45.38 9.052 42.88 C 9.052 40.381 11.079 38.354 13.579 38.354 C 16.078 38.354 18.105 40.381 18.105 42.88 Z"
+            android:strokeWidth="1"/>
+        </group>
+      </group>
+    </vector>
+  </aapt:attr>
+  <target android:name="path">
+    <aapt:attr name="android:animation">
+      <objectAnimator
+        android:propertyName="fillColor"
+        android:duration="1000"
+        android:valueFrom="#00ffffff"
+        android:valueTo="#161c2d"
+        android:valueType="colorType"
+        android:interpolator="@android:interpolator/fast_out_slow_in"/>
+    </aapt:attr>
+  </target>
+  <target android:name="path_1">
+    <aapt:attr name="android:animation">
+      <objectAnimator
+        android:propertyName="fillColor"
+        android:duration="1000"
+        android:valueFrom="#00ffffff"
+        android:valueTo="#f9f9fb"
+        android:valueType="colorType"
+        android:interpolator="@android:interpolator/fast_out_slow_in"/>
+    </aapt:attr>
+  </target>
+  <target android:name="path_2">
+    <aapt:attr name="android:animation">
+      <objectAnimator
+        android:propertyName="fillColor"
+        android:duration="1000"
+        android:valueFrom="#00ffffff"
+        android:valueTo="#f9f9fb"
+        android:valueType="colorType"
+        android:interpolator="@android:interpolator/fast_out_slow_in"/>
+    </aapt:attr>
+  </target>
+</animated-vector>
diff --git a/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/Resources/drawable-v31/avalonia_anim.xml b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/Resources/drawable-v31/avalonia_anim.xml
new file mode 100644
index 0000000..94f27d9
--- /dev/null
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/Resources/drawable-v31/avalonia_anim.xml
@@ -0,0 +1,71 @@
+<animated-vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+    <aapt:attr name="android:drawable">
+        <vector
+            android:name="vector"
+            android:width="128dp"
+            android:height="128dp"
+            android:viewportWidth="128"
+            android:viewportHeight="128">
+            <group
+                android:name="wrapper"
+                android:translateX="21"
+                android:translateY="21">
+                <group android:name="group">
+                    <path
+                        android:name="path"
+                        android:pathData="M 74.853 85.823 L 75.368 85.823 C 80.735 85.823 85.144 81.803 85.761 76.602 L 85.836 41.76 C 85.225 18.593 66.254 0 42.939 0 C 19.24 0 0.028 19.212 0.028 42.912 C 0.028 66.357 18.831 85.418 42.18 85.823 L 74.853 85.823 Z"
+                        android:fillColor="#00ffffff"
+                        android:strokeWidth="1"/>
+                    <path
+                        android:name="path_1"
+                        android:pathData="M 43.059 14.614 C 29.551 14.614 18.256 24.082 15.445 36.743 C 18.136 37.498 20.109 39.968 20.109 42.899 C 20.109 45.831 18.136 48.301 15.445 49.055 C 18.256 61.716 29.551 71.184 43.059 71.184 C 47.975 71.184 52.599 69.93 56.628 67.723 L 56.628 70.993 L 71.344 70.993 L 71.344 44.072 C 71.357 43.714 71.344 43.26 71.344 42.899 C 71.344 27.278 58.68 14.614 43.059 14.614 Z M 29.51 42.899 C 29.51 35.416 35.576 29.35 43.059 29.35 C 50.541 29.35 56.607 35.416 56.607 42.899 C 56.607 50.382 50.541 56.448 43.059 56.448 C 35.576 56.448 29.51 50.382 29.51 42.899 Z"
+                        android:fillColor="#00ffffff"
+                        android:strokeWidth="1"
+                        android:fillType="evenOdd"/>
+                    <path
+                        android:name="path_2"
+                        android:pathData="M 18.105 42.88 C 18.105 45.38 16.078 47.407 13.579 47.407 C 11.079 47.407 9.052 45.38 9.052 42.88 C 9.052 40.381 11.079 38.354 13.579 38.354 C 16.078 38.354 18.105 40.381 18.105 42.88 Z"
+                        android:fillColor="#00ffffff"
+                        android:strokeWidth="1"/>
+                </group>
+            </group>
+        </vector>
+    </aapt:attr>
+    <target android:name="path_2">
+        <aapt:attr name="android:animation">
+            <objectAnimator
+                android:propertyName="fillColor"
+                android:startOffset="100"
+                android:duration="900"
+                android:valueFrom="#00ffffff"
+                android:valueTo="#161c2d"
+                android:valueType="colorType"
+                android:interpolator="@android:interpolator/fast_out_slow_in"/>
+        </aapt:attr>
+    </target>
+    <target android:name="path">
+        <aapt:attr name="android:animation">
+            <objectAnimator
+                android:propertyName="fillColor"
+                android:duration="500"
+                android:valueFrom="#00ffffff"
+                android:valueTo="#f9f9fb"
+                android:valueType="colorType"
+                android:interpolator="@android:interpolator/fast_out_slow_in"/>
+        </aapt:attr>
+    </target>
+    <target android:name="path_1">
+        <aapt:attr name="android:animation">
+            <objectAnimator
+                android:propertyName="fillColor"
+                android:startOffset="100"
+                android:duration="900"
+                android:valueFrom="#00ffffff"
+                android:valueTo="#161c2d"
+                android:valueType="colorType"
+                android:interpolator="@android:interpolator/fast_out_slow_in"/>
+        </aapt:attr>
+    </target>
+</animated-vector>
diff --git a/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/Resources/drawable/splash_screen.xml b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/Resources/drawable/splash_screen.xml
new file mode 100644
index 0000000..2e920b4
--- /dev/null
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/Resources/drawable/splash_screen.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <item>
+    <color android:color="@color/splash_background"/>
+  </item>
+
+  <item android:drawable="@drawable/icon"
+        android:width="120dp"
+        android:height="120dp"
+        android:gravity="center" />
+
+</layer-list>
diff --git a/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/Resources/values-night/colors.xml b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/Resources/values-night/colors.xml
new file mode 100644
index 0000000..3d47b6f
--- /dev/null
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/Resources/values-night/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <color name="splash_background">#212121</color>
+</resources>
diff --git a/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/Resources/values-v31/styles.xml b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/Resources/values-v31/styles.xml
new file mode 100644
index 0000000..d5ecec4
--- /dev/null
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/Resources/values-v31/styles.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<resources>
+
+  <style name="MyTheme">
+  </style>
+
+  <style name="MyTheme.NoActionBar" parent="@style/Theme.AppCompat.NoActionBar">
+    <item name="android:windowActionBar">false</item>
+    <item name="android:windowBackground">@null</item>
+    <item name="android:windowNoTitle">true</item>
+    <item name="android:windowSplashScreenBackground">@color/splash_background</item>
+    <item name="android:windowSplashScreenAnimatedIcon">@drawable/avalonia_anim</item>
+    <item name="android:windowSplashScreenAnimationDuration">1000</item>
+    <item name="postSplashScreenTheme">@style/MyTheme.Main</item>
+
+  </style>
+  <style name="MyTheme.Main"
+         parent ="MyTheme.NoActionBar">
+    <item name="android:windowIsTranslucent">true</item>
+  </style>
+</resources>
diff --git a/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/Resources/values/colors.xml b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/Resources/values/colors.xml
new file mode 100644
index 0000000..59279d5
--- /dev/null
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/Resources/values/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <color name="splash_background">#FFFFFF</color>
+</resources>
diff --git a/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/Resources/values/styles.xml b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/Resources/values/styles.xml
new file mode 100644
index 0000000..6e534de
--- /dev/null
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/Resources/values/styles.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<resources>
+
+  <style name="MyTheme">
+  </style>
+
+  <style name="MyTheme.NoActionBar" parent="@style/Theme.AppCompat.DayNight.NoActionBar">
+    <item name="android:windowActionBar">false</item>
+    <item name="android:windowBackground">@drawable/splash_screen</item>
+    <item name="android:windowNoTitle">true</item>
+  </style>
+</resources>
diff --git a/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/tech.irihi.GeneralUpdate.Samples-Signed.apk b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/tech.irihi.GeneralUpdate.Samples-Signed.apk
new file mode 100644
index 0000000..eaba5ed
Binary files /dev/null and b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Android/tech.irihi.GeneralUpdate.Samples-Signed.apk differ
diff --git a/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Desktop/GeneralUpdate.Samples.Mafia.Desktop.csproj b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Desktop/GeneralUpdate.Samples.Mafia.Desktop.csproj
new file mode 100644
index 0000000..c833607
--- /dev/null
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Desktop/GeneralUpdate.Samples.Mafia.Desktop.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <OutputType>WinExe</OutputType>
+        <!--If you are willing to use platform-specific APIs, use conditional compilation.
+        See https://docs.avaloniaui.net/docs/guides/platforms/platform-specific-code/dotnet for more details.-->
+        <TargetFramework>net10.0</TargetFramework>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <ApplicationManifest>app.manifest</ApplicationManifest>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Avalonia.Desktop"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\GeneralUpdate.Samples.Mafia\GeneralUpdate.Samples.Mafia.csproj"/>
+    </ItemGroup>
+</Project>
diff --git a/UI/SemiUrsaMafia/Mobile.Avalonia/Program.cs b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Desktop/Program.cs
similarity index 93%
rename from UI/SemiUrsaMafia/Mobile.Avalonia/Program.cs
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Desktop/Program.cs
index 3026e03..0dda4e3 100644
--- a/UI/SemiUrsaMafia/Mobile.Avalonia/Program.cs
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Desktop/Program.cs
@@ -1,7 +1,7 @@
 using Avalonia;
 using System;
 
-namespace Sandbox;
+namespace GeneralUpdate.Samples.Mafia.Desktop;
 
 sealed class Program
 {
diff --git a/UI/SemiUrsaMafia/Mobile.Avalonia/app.manifest b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Desktop/app.manifest
similarity index 91%
rename from UI/SemiUrsaMafia/Mobile.Avalonia/app.manifest
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Desktop/app.manifest
index e3ab431..168c7fd 100644
--- a/UI/SemiUrsaMafia/Mobile.Avalonia/app.manifest
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia.Desktop/app.manifest
@@ -3,7 +3,7 @@
   <!-- This manifest is used on Windows only.
        Don't remove it as it might cause problems with window transparency and embedded controls.
        For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
-  <assemblyIdentity version="1.0.0.0" name="Sandbox.Desktop"/>
+  <assemblyIdentity version="1.0.0.0" name="GeneralUpdate.Samples.Mafia.Desktop"/>
 
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>
diff --git a/UI/SemiUrsaMafia/Mobile.Avalonia/App.axaml b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/App.axaml
similarity index 88%
rename from UI/SemiUrsaMafia/Mobile.Avalonia/App.axaml
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/App.axaml
index 5d8f021..3e278fb 100644
--- a/UI/SemiUrsaMafia/Mobile.Avalonia/App.axaml
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/App.axaml
@@ -1,6 +1,6 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="Sandbox.App"
+             x:Class="GeneralUpdate.Samples.Mafia.App"
              xmlns:td="https://irihi.tech/td"
              RequestedThemeVariant="Default">
     <!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
diff --git a/UI/SemiUrsaMafia/Mobile.Avalonia/App.axaml.cs b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/App.axaml.cs
similarity index 55%
rename from UI/SemiUrsaMafia/Mobile.Avalonia/App.axaml.cs
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/App.axaml.cs
index 3b906cd..1993949 100644
--- a/UI/SemiUrsaMafia/Mobile.Avalonia/App.axaml.cs
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/App.axaml.cs
@@ -1,9 +1,9 @@
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
-using Sandbox.Views;
+using GeneralUpdate.Samples.Mafia.Views;
 
-namespace Sandbox;
+namespace GeneralUpdate.Samples.Mafia;
 
 public partial class App : Application
 {
@@ -18,7 +18,15 @@ public override void OnFrameworkInitializationCompleted()
         {
             desktop.MainWindow = new MainWindow();
         }
+        else if (ApplicationLifetime is IActivityApplicationLifetime activity)
+        {
+            activity.MainViewFactory = () => new MainView();
+        }
+        else if (ApplicationLifetime is ISingleViewApplicationLifetime singleViewPlatform)
+        {
+            singleViewPlatform.MainView = new MainView();
+        }
 
         base.OnFrameworkInitializationCompleted();
     }
-}
\ No newline at end of file
+}
diff --git a/UI/SemiUrsaMafia/Mobile.Avalonia/Mobile.Avalonia.csproj b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/GeneralUpdate.Samples.Mafia.csproj
similarity index 61%
rename from UI/SemiUrsaMafia/Mobile.Avalonia/Mobile.Avalonia.csproj
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/GeneralUpdate.Samples.Mafia.csproj
index 4164a51..c80b86c 100644
--- a/UI/SemiUrsaMafia/Mobile.Avalonia/Mobile.Avalonia.csproj
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/GeneralUpdate.Samples.Mafia.csproj
@@ -1,10 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <OutputType>WinExe</OutputType>
         <TargetFramework>net10.0</TargetFramework>
         <Nullable>enable</Nullable>
-        <ApplicationManifest>app.manifest</ApplicationManifest>
-        <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
     </PropertyGroup>
 
     <ItemGroup>
@@ -17,6 +14,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Common.Avalonia\Common.Avalonia.csproj"/>
+        <ProjectReference Include="..\GeneralUpdate.Samples.Shared\GeneralUpdate.Samples.Shared.csproj" />
     </ItemGroup>
 </Project>
diff --git a/UI/SemiUrsaMafia/Mobile.Avalonia/ViewModels/SettingsPageViewModel.cs b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/ViewModels/SettingsPageViewModel.cs
similarity index 94%
rename from UI/SemiUrsaMafia/Mobile.Avalonia/ViewModels/SettingsPageViewModel.cs
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/ViewModels/SettingsPageViewModel.cs
index e37119f..fb888ba 100644
--- a/UI/SemiUrsaMafia/Mobile.Avalonia/ViewModels/SettingsPageViewModel.cs
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/ViewModels/SettingsPageViewModel.cs
@@ -1,12 +1,12 @@
 using System.Collections.ObjectModel;
 using Avalonia;
 using Avalonia.Styling;
-using Common.Avalonia.Models;
-using Common.Avalonia.Services;
+using GeneralUpdate.Samples.Shared.Models;
+using GeneralUpdate.Samples.Shared.Services;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 
-namespace Sandbox.ViewModels;
+namespace GeneralUpdate.Samples.Mafia.ViewModels;
 
 public partial class SettingsPageViewModel : ViewModelBase
 {
diff --git a/UI/SemiUrsaMafia/Mobile.Avalonia/ViewModels/ViewModelBase.cs b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/ViewModels/ViewModelBase.cs
similarity index 68%
rename from UI/SemiUrsaMafia/Mobile.Avalonia/ViewModels/ViewModelBase.cs
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/ViewModels/ViewModelBase.cs
index d35d485..dbea543 100644
--- a/UI/SemiUrsaMafia/Mobile.Avalonia/ViewModels/ViewModelBase.cs
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/ViewModels/ViewModelBase.cs
@@ -1,6 +1,6 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 
-namespace Sandbox.ViewModels;
+namespace GeneralUpdate.Samples.Mafia.ViewModels;
 
 public abstract class ViewModelBase : ObservableObject
 {
diff --git a/UI/SemiUrsaMafia/Mobile.Avalonia/Views/MainView.axaml b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/Views/MainView.axaml
similarity index 89%
rename from UI/SemiUrsaMafia/Mobile.Avalonia/Views/MainView.axaml
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/Views/MainView.axaml
index 964c01c..ecfcf0f 100644
--- a/UI/SemiUrsaMafia/Mobile.Avalonia/Views/MainView.axaml
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/Views/MainView.axaml
@@ -2,10 +2,10 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:pages="using:Sandbox.Views.Pages"
+             xmlns:pages="using:GeneralUpdate.Samples.Mafia.Views.Pages"
              xmlns:td="https://irihi.tech/td"
              mc:Ignorable="d" d:DesignWidth="375" d:DesignHeight="812"
-             x:Class="Sandbox.Views.MainView">
+             x:Class="GeneralUpdate.Samples.Mafia.Views.MainView">
     <TabbedPage SelectedIndex="1" TabPlacement="Bottom" Classes="Tag">
         <TabbedPage.PageTransition>
             <CompositePageTransition>
diff --git a/UI/SemiUrsaMafia/Mobile.Avalonia/Views/MainView.axaml.cs b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/Views/MainView.axaml.cs
similarity index 63%
rename from UI/SemiUrsaMafia/Mobile.Avalonia/Views/MainView.axaml.cs
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/Views/MainView.axaml.cs
index e97846d..317f3fa 100644
--- a/UI/SemiUrsaMafia/Mobile.Avalonia/Views/MainView.axaml.cs
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/Views/MainView.axaml.cs
@@ -1,8 +1,8 @@
 using Avalonia.Controls;
-using Common.Avalonia.Services;
-using Sandbox.ViewModels;
+using GeneralUpdate.Samples.Shared.Services;
+using GeneralUpdate.Samples.Mafia.ViewModels;
 
-namespace Sandbox.Views;
+namespace GeneralUpdate.Samples.Mafia.Views;
 
 public partial class MainView : UserControl
 {
diff --git a/UI/SemiUrsaMafia/Mobile.Avalonia/Views/MainWindow.axaml b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/Views/MainWindow.axaml
similarity index 72%
rename from UI/SemiUrsaMafia/Mobile.Avalonia/Views/MainWindow.axaml
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/Views/MainWindow.axaml
index a49d292..13079ed 100644
--- a/UI/SemiUrsaMafia/Mobile.Avalonia/Views/MainWindow.axaml
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/Views/MainWindow.axaml
@@ -2,13 +2,13 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:views="using:Sandbox.Views"
+        xmlns:views="using:GeneralUpdate.Samples.Mafia.Views"
         mc:Ignorable="d" d:DesignWidth="375" d:DesignHeight="812"
         Width="375" Height="812"
         MinWidth="300" MinHeight="700"
         WindowStartupLocation="CenterScreen"
-        Icon="avares://Common.Avalonia/Assets/irihi.ico"
-        x:Class="Sandbox.Views.MainWindow"
+        Icon="avares://GeneralUpdate.Samples.Shared/Assets/irihi.ico"
+        x:Class="GeneralUpdate.Samples.Mafia.Views.MainWindow"
         Title="General Update Demo">
     <views:MainView />
 </Window>
\ No newline at end of file
diff --git a/UI/SemiUrsaMafia/Mobile.Avalonia/Views/MainWindow.axaml.cs b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/Views/MainWindow.axaml.cs
similarity index 75%
rename from UI/SemiUrsaMafia/Mobile.Avalonia/Views/MainWindow.axaml.cs
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/Views/MainWindow.axaml.cs
index d880a6a..06b062f 100644
--- a/UI/SemiUrsaMafia/Mobile.Avalonia/Views/MainWindow.axaml.cs
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/Views/MainWindow.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Sandbox.Views;
+namespace GeneralUpdate.Samples.Mafia.Views;
 
 public partial class MainWindow : Window
 {
diff --git a/UI/SemiUrsaMafia/Mobile.Avalonia/Views/Pages/HomePageView.axaml b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/Views/Pages/HomePageView.axaml
similarity index 82%
rename from UI/SemiUrsaMafia/Mobile.Avalonia/Views/Pages/HomePageView.axaml
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/Views/Pages/HomePageView.axaml
index 7e2089e..1f21487 100644
--- a/UI/SemiUrsaMafia/Mobile.Avalonia/Views/Pages/HomePageView.axaml
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/Views/Pages/HomePageView.axaml
@@ -5,12 +5,12 @@
              xmlns:iri="https://irihi.tech/shared"
              xmlns:td="https://irihi.tech/td"
              mc:Ignorable="d" d:DesignWidth="375" d:DesignHeight="812"
-             x:Class="Sandbox.Views.Pages.HomePageView">
+             x:Class="GeneralUpdate.Samples.Mafia.Views.Pages.HomePageView">
     <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Spacing="8">
         <Image
             Width="150"
             Height="150"
-            Source="avares://Common.Avalonia/Assets/GeneralUpdate.png" />
+            Source="avares://GeneralUpdate.Samples.Shared/Assets/GeneralUpdate.png" />
         <td:Close Width="60" Height="60" />
         <iri:IrihiBand Label="Mafia" Fill="{DynamicResource TDBrandColor}" Width="250" HorizontalAlignment="Center" />
     </StackPanel>
diff --git a/UI/SemiUrsaMafia/Mobile.Avalonia/Views/Pages/HomePageView.axaml.cs b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/Views/Pages/HomePageView.axaml.cs
similarity index 74%
rename from UI/SemiUrsaMafia/Mobile.Avalonia/Views/Pages/HomePageView.axaml.cs
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/Views/Pages/HomePageView.axaml.cs
index 2ef6203..e622212 100644
--- a/UI/SemiUrsaMafia/Mobile.Avalonia/Views/Pages/HomePageView.axaml.cs
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/Views/Pages/HomePageView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Sandbox.Views.Pages;
+namespace GeneralUpdate.Samples.Mafia.Views.Pages;
 
 public partial class HomePageView : UserControl
 {
diff --git a/UI/SemiUrsaMafia/Mobile.Avalonia/Views/Pages/SettingsPageView.axaml b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/Views/Pages/SettingsPageView.axaml
similarity index 98%
rename from UI/SemiUrsaMafia/Mobile.Avalonia/Views/Pages/SettingsPageView.axaml
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/Views/Pages/SettingsPageView.axaml
index e317858..3fe43ca 100644
--- a/UI/SemiUrsaMafia/Mobile.Avalonia/Views/Pages/SettingsPageView.axaml
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/Views/Pages/SettingsPageView.axaml
@@ -2,11 +2,11 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:vm="using:Sandbox.ViewModels"
+             xmlns:vm="using:GeneralUpdate.Samples.Mafia.ViewModels"
              xmlns:m="https://irihi.tech/mafia"
              xmlns:td="https://irihi.tech/td"
              mc:Ignorable="d" d:DesignWidth="375" d:DesignHeight="812"
-             x:Class="Sandbox.Views.Pages.SettingsPageView"
+             x:Class="GeneralUpdate.Samples.Mafia.Views.Pages.SettingsPageView"
              x:DataType="vm:SettingsPageViewModel">
     <Panel>
         <ScrollViewer>
diff --git a/UI/SemiUrsaMafia/Mobile.Avalonia/Views/Pages/SettingsPageView.axaml.cs b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/Views/Pages/SettingsPageView.axaml.cs
similarity index 75%
rename from UI/SemiUrsaMafia/Mobile.Avalonia/Views/Pages/SettingsPageView.axaml.cs
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/Views/Pages/SettingsPageView.axaml.cs
index 244ec2a..cfc2517 100644
--- a/UI/SemiUrsaMafia/Mobile.Avalonia/Views/Pages/SettingsPageView.axaml.cs
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/Views/Pages/SettingsPageView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Sandbox.Views.Pages;
+namespace GeneralUpdate.Samples.Mafia.Views.Pages;
 
 public partial class SettingsPageView : UserControl
 {
diff --git a/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/app.manifest b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/app.manifest
new file mode 100644
index 0000000..168c7fd
--- /dev/null
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Mafia/app.manifest
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <!-- This manifest is used on Windows only.
+       Don't remove it as it might cause problems with window transparency and embedded controls.
+       For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
+  <assemblyIdentity version="1.0.0.0" name="GeneralUpdate.Samples.Mafia.Desktop"/>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- A list of the Windows versions that this application has been tested on
+           and is designed to work with. Uncomment the appropriate elements
+           and Windows will automatically select the most compatible environment. -->
+
+      <!-- Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+    </application>
+  </compatibility>
+</assembly>
diff --git a/UI/SemiUrsaMafia/Client.Avalonia/App.axaml b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/App.axaml
similarity index 71%
rename from UI/SemiUrsaMafia/Client.Avalonia/App.axaml
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/App.axaml
index a0ed5e4..bcae9ee 100644
--- a/UI/SemiUrsaMafia/Client.Avalonia/App.axaml
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/App.axaml
@@ -1,7 +1,7 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="Client.Avalonia.App"
-             xmlns:local="using:Client.Avalonia"
+             x:Class="GeneralUpdate.Samples.Semi.Desktop.App"
+             xmlns:local="using:GeneralUpdate.Samples.Semi.Desktop"
              xmlns:semi="https://irihi.tech/semi">
     <Application.DataTemplates>
         <local:ViewLocator />
@@ -14,7 +14,7 @@
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceInclude Source="avares://Common.Avalonia/Themes/Controls/_index.axaml" />
+                <ResourceInclude Source="avares://GeneralUpdate.Samples.Shared/Themes/Controls/_index.axaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/UI/SemiUrsaMafia/Client.Avalonia/App.axaml.cs b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/App.axaml.cs
similarity index 82%
rename from UI/SemiUrsaMafia/Client.Avalonia/App.axaml.cs
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/App.axaml.cs
index a533140..af99bf0 100644
--- a/UI/SemiUrsaMafia/Client.Avalonia/App.axaml.cs
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/App.axaml.cs
@@ -1,12 +1,12 @@
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
-using Client.Avalonia.ViewModels;
-using Client.Avalonia.Views;
-using Common.Avalonia.Services;
+using GeneralUpdate.Samples.Semi.Desktop.ViewModels;
+using GeneralUpdate.Samples.Semi.Desktop.Views;
+using GeneralUpdate.Samples.Shared.Services;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Client.Avalonia;
+namespace GeneralUpdate.Samples.Semi.Desktop;
 
 public partial class App : Application
 {
diff --git a/UI/SemiUrsaMafia/Client.Avalonia/Client.Avalonia.csproj b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/GeneralUpdate.Samples.Semi.Desktop.csproj
similarity index 79%
rename from UI/SemiUrsaMafia/Client.Avalonia/Client.Avalonia.csproj
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/GeneralUpdate.Samples.Semi.Desktop.csproj
index 47e533a..cad5402 100644
--- a/UI/SemiUrsaMafia/Client.Avalonia/Client.Avalonia.csproj
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/GeneralUpdate.Samples.Semi.Desktop.csproj
@@ -6,6 +6,7 @@
         <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
         <ApplicationManifest>app.manifest</ApplicationManifest>
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
+        <RootNamespace>Client.Avalonia</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
@@ -17,6 +18,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Common.Avalonia\Common.Avalonia.csproj"/>
+        <ProjectReference Include="..\GeneralUpdate.Samples.Shared\GeneralUpdate.Samples.Shared.csproj" />
     </ItemGroup>
 </Project>
diff --git a/UI/SemiUrsaMafia/Client.Avalonia/Program.cs b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/Program.cs
similarity index 92%
rename from UI/SemiUrsaMafia/Client.Avalonia/Program.cs
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/Program.cs
index 58dbf0f..c46eb95 100644
--- a/UI/SemiUrsaMafia/Client.Avalonia/Program.cs
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/Program.cs
@@ -1,7 +1,6 @@
 using Avalonia;
-using System;
 
-namespace Client.Avalonia;
+namespace GeneralUpdate.Samples.Semi.Desktop;
 
 sealed class Program
 {
diff --git a/UI/SemiUrsaMafia/Client.Avalonia/ViewLocator.cs b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/ViewLocator.cs
similarity index 86%
rename from UI/SemiUrsaMafia/Client.Avalonia/ViewLocator.cs
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/ViewLocator.cs
index 9ce44f2..67aad2c 100644
--- a/UI/SemiUrsaMafia/Client.Avalonia/ViewLocator.cs
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/ViewLocator.cs
@@ -1,9 +1,9 @@
 using System;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
-using Client.Avalonia.ViewModels;
+using GeneralUpdate.Samples.Semi.Desktop.ViewModels;
 
-namespace Client.Avalonia;
+namespace GeneralUpdate.Samples.Semi.Desktop;
 
 public class ViewLocator : IDataTemplate
 {
diff --git a/UI/SemiUrsaMafia/Client.Avalonia/ViewModels/MainViewViewModel.cs b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/ViewModels/MainViewViewModel.cs
similarity index 94%
rename from UI/SemiUrsaMafia/Client.Avalonia/ViewModels/MainViewViewModel.cs
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/ViewModels/MainViewViewModel.cs
index 6bc8839..e345a64 100644
--- a/UI/SemiUrsaMafia/Client.Avalonia/ViewModels/MainViewViewModel.cs
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/ViewModels/MainViewViewModel.cs
@@ -2,12 +2,12 @@
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Controls.Notifications;
-using Common.Avalonia.Models;
-using Common.Avalonia.Services;
+using GeneralUpdate.Samples.Shared.Models;
+using GeneralUpdate.Samples.Shared.Services;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 
-namespace Client.Avalonia.ViewModels;
+namespace GeneralUpdate.Samples.Semi.Desktop.ViewModels;
 
 public partial class MainViewViewModel : ViewModelBase
 {
diff --git a/UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/ViewModels/MainWindowViewModel.cs b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/ViewModels/MainWindowViewModel.cs
new file mode 100644
index 0000000..d5f7495
--- /dev/null
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/ViewModels/MainWindowViewModel.cs
@@ -0,0 +1,3 @@
+namespace GeneralUpdate.Samples.Semi.Desktop.ViewModels;
+
+public partial class MainWindowViewModel : ViewModelBase;
\ No newline at end of file
diff --git a/UI/SemiUrsaMafia/Upgrade.Avalonia/ViewModels/ViewModelBase.cs b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/ViewModels/ViewModelBase.cs
similarity index 63%
rename from UI/SemiUrsaMafia/Upgrade.Avalonia/ViewModels/ViewModelBase.cs
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/ViewModels/ViewModelBase.cs
index b23cc72..3c03ea6 100644
--- a/UI/SemiUrsaMafia/Upgrade.Avalonia/ViewModels/ViewModelBase.cs
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/ViewModels/ViewModelBase.cs
@@ -1,6 +1,6 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 
-namespace Upgrade.Avalonia.ViewModels;
+namespace GeneralUpdate.Samples.Semi.Desktop.ViewModels;
 
 public class ViewModelBase : ObservableObject
 {
diff --git a/UI/SemiUrsaMafia/Client.Avalonia/Views/MainView.axaml b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/Views/MainView.axaml
similarity index 92%
rename from UI/SemiUrsaMafia/Client.Avalonia/Views/MainView.axaml
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/Views/MainView.axaml
index 48b9214..28aae4a 100644
--- a/UI/SemiUrsaMafia/Client.Avalonia/Views/MainView.axaml
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/Views/MainView.axaml
@@ -3,12 +3,12 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls"
-             xmlns:vm="clr-namespace:Client.Avalonia.ViewModels"
-             xmlns:services="clr-namespace:Common.Avalonia.Services;assembly=Common.Avalonia"
-             xmlns:cvt="clr-namespace:Common.Avalonia.Converters;assembly=Common.Avalonia"
+             xmlns:vm="clr-namespace:GeneralUpdate.Samples.Semi.Desktop.ViewModels"
+             xmlns:services="clr-namespace:GeneralUpdate.Samples.Shared.Services;assembly=GeneralUpdate.Samples.Shared"
+             xmlns:cvt="clr-namespace:GeneralUpdate.Samples.Shared.Converters;assembly=GeneralUpdate.Samples.Shared"
              xmlns:iri="https://irihi.tech/shared"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Client.Avalonia.Views.MainView"
+             x:Class="GeneralUpdate.Samples.Semi.Desktop.Views.MainView"
              x:DataType="vm:MainViewViewModel">
     <UserControl.Resources>
         <converters:EnumToBoolConverter x:Key="EnumToBooleanConverter" />
@@ -19,7 +19,7 @@
             <Image
                 Width="150"
                 Height="150"
-                Source="avares://Common.Avalonia/Assets/GeneralUpdate.png" />
+                Source="avares://GeneralUpdate.Samples.Shared/Assets/GeneralUpdate.png" />
             <PathIcon Data="{DynamicResource SemiIconClose}"/>
             <iri:IrihiBand
                 Label="Semi"
diff --git a/UI/SemiUrsaMafia/Upgrade.Avalonia/Views/MainView.axaml.cs b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/Views/MainView.axaml.cs
similarity index 72%
rename from UI/SemiUrsaMafia/Upgrade.Avalonia/Views/MainView.axaml.cs
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/Views/MainView.axaml.cs
index 9a400e0..0e9150e 100644
--- a/UI/SemiUrsaMafia/Upgrade.Avalonia/Views/MainView.axaml.cs
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/Views/MainView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Upgrade.Avalonia.Views;
+namespace GeneralUpdate.Samples.Semi.Desktop.Views;
 
 public partial class MainView : UserControl
 {
diff --git a/UI/SemiUrsaMafia/Client.Avalonia/Views/MainWindow.axaml b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/Views/MainWindow.axaml
similarity index 65%
rename from UI/SemiUrsaMafia/Client.Avalonia/Views/MainWindow.axaml
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/Views/MainWindow.axaml
index e0443e1..8c4a0d3 100644
--- a/UI/SemiUrsaMafia/Client.Avalonia/Views/MainWindow.axaml
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/Views/MainWindow.axaml
@@ -1,13 +1,13 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="using:Client.Avalonia.ViewModels"
+        xmlns:vm="using:GeneralUpdate.Samples.Semi.Desktop.ViewModels"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:views="clr-namespace:Client.Avalonia.Views"
+        xmlns:views="clr-namespace:GeneralUpdate.Samples.Semi.Desktop.Views"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-        x:Class="Client.Avalonia.Views.MainWindow"
+        x:Class="GeneralUpdate.Samples.Semi.Desktop.Views.MainWindow"
         x:DataType="vm:MainWindowViewModel"
-        Icon="avares://Common.Avalonia/Assets/irihi.ico"
+        Icon="avares://GeneralUpdate.Samples.Shared/Assets/irihi.ico"
         RequestedThemeVariant="Dark"
         Width="800" Height="450"
         WindowStartupLocation="CenterScreen"
diff --git a/UI/SemiUrsaMafia/Client.Avalonia/Views/MainWindow.axaml.cs b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/Views/MainWindow.axaml.cs
similarity index 79%
rename from UI/SemiUrsaMafia/Client.Avalonia/Views/MainWindow.axaml.cs
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/Views/MainWindow.axaml.cs
index 1c64c5f..4a0fbf5 100644
--- a/UI/SemiUrsaMafia/Client.Avalonia/Views/MainWindow.axaml.cs
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/Views/MainWindow.axaml.cs
@@ -1,9 +1,9 @@
 using Avalonia.Controls;
 using Avalonia.Interactivity;
-using Client.Avalonia.ViewModels;
+using GeneralUpdate.Samples.Semi.Desktop.ViewModels;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Client.Avalonia.Views;
+namespace GeneralUpdate.Samples.Semi.Desktop.Views;
 
 public partial class MainWindow : Window
 {
diff --git a/UI/SemiUrsaMafia/Client.Avalonia/app.manifest b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/app.manifest
similarity index 100%
rename from UI/SemiUrsaMafia/Client.Avalonia/app.manifest
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Semi.Desktop/app.manifest
diff --git a/UI/SemiUrsaMafia/Common.Avalonia/Assets/GeneralUpdate.png b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Shared/Assets/GeneralUpdate.png
similarity index 100%
rename from UI/SemiUrsaMafia/Common.Avalonia/Assets/GeneralUpdate.png
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Shared/Assets/GeneralUpdate.png
diff --git a/UI/SemiUrsaMafia/Common.Avalonia/Assets/irihi.ico b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Shared/Assets/irihi.ico
similarity index 100%
rename from UI/SemiUrsaMafia/Common.Avalonia/Assets/irihi.ico
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Shared/Assets/irihi.ico
diff --git a/UI/SemiUrsaMafia/Common.Avalonia/Converters/EnumConverter.cs b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Shared/Converters/EnumConverter.cs
similarity index 91%
rename from UI/SemiUrsaMafia/Common.Avalonia/Converters/EnumConverter.cs
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Shared/Converters/EnumConverter.cs
index c4cb66b..eb3b481 100644
--- a/UI/SemiUrsaMafia/Common.Avalonia/Converters/EnumConverter.cs
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Shared/Converters/EnumConverter.cs
@@ -2,7 +2,7 @@
 using System.Reflection;
 using Avalonia.Data.Converters;
 
-namespace Common.Avalonia.Converters;
+namespace GeneralUpdate.Samples.Shared.Converters;
 
 public static class EnumConverter
 {
diff --git a/UI/SemiUrsaMafia/Common.Avalonia/Converters/ProgressConverter.cs b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Shared/Converters/ProgressConverter.cs
similarity index 91%
rename from UI/SemiUrsaMafia/Common.Avalonia/Converters/ProgressConverter.cs
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Shared/Converters/ProgressConverter.cs
index 8971be7..ef7c653 100644
--- a/UI/SemiUrsaMafia/Common.Avalonia/Converters/ProgressConverter.cs
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Shared/Converters/ProgressConverter.cs
@@ -1,6 +1,6 @@
 using Avalonia.Data.Converters;
 
-namespace Common.Avalonia.Converters;
+namespace GeneralUpdate.Samples.Shared.Converters;
 
 public class ProgressConverter
 {
diff --git a/UI/SemiUrsaMafia/Common.Avalonia/Common.Avalonia.csproj b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Shared/GeneralUpdate.Samples.Shared.csproj
similarity index 93%
rename from UI/SemiUrsaMafia/Common.Avalonia/Common.Avalonia.csproj
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Shared/GeneralUpdate.Samples.Shared.csproj
index fe25ed1..b24ec72 100644
--- a/UI/SemiUrsaMafia/Common.Avalonia/Common.Avalonia.csproj
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Shared/GeneralUpdate.Samples.Shared.csproj
@@ -4,6 +4,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+        <RootNamespace>Common.Avalonia</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/UI/SemiUrsaMafia/Common.Avalonia/Models/DownloadStatistics.cs b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Shared/Models/DownloadStatistics.cs
similarity index 95%
rename from UI/SemiUrsaMafia/Common.Avalonia/Models/DownloadStatistics.cs
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Shared/Models/DownloadStatistics.cs
index 221eb52..15b8369 100644
--- a/UI/SemiUrsaMafia/Common.Avalonia/Models/DownloadStatistics.cs
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Shared/Models/DownloadStatistics.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using CommunityToolkit.Mvvm.ComponentModel;
 
-namespace Common.Avalonia.Models;
+namespace GeneralUpdate.Samples.Shared.Models;
 
 public partial class DownloadStatistics : ObservableObject
 {
diff --git a/UI/SemiUrsaMafia/Common.Avalonia/Services/IDownloadService.cs b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Shared/Services/IDownloadService.cs
similarity index 86%
rename from UI/SemiUrsaMafia/Common.Avalonia/Services/IDownloadService.cs
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Shared/Services/IDownloadService.cs
index df557a1..37eadee 100644
--- a/UI/SemiUrsaMafia/Common.Avalonia/Services/IDownloadService.cs
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Shared/Services/IDownloadService.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel;
-using Common.Avalonia.Models;
+using GeneralUpdate.Samples.Shared.Models;
 
-namespace Common.Avalonia.Services;
+namespace GeneralUpdate.Samples.Shared.Services;
 
 public interface IDownloadService
 {
diff --git a/UI/SemiUrsaMafia/Common.Avalonia/Services/MockDownloadService.cs b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Shared/Services/MockDownloadService.cs
similarity index 97%
rename from UI/SemiUrsaMafia/Common.Avalonia/Services/MockDownloadService.cs
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Shared/Services/MockDownloadService.cs
index c88c338..6d7a413 100644
--- a/UI/SemiUrsaMafia/Common.Avalonia/Services/MockDownloadService.cs
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Shared/Services/MockDownloadService.cs
@@ -1,7 +1,7 @@
 using Avalonia.Threading;
-using Common.Avalonia.Models;
+using GeneralUpdate.Samples.Shared.Models;
 
-namespace Common.Avalonia.Services;
+namespace GeneralUpdate.Samples.Shared.Services;
 
 public class MockDownloadService : IDownloadService
 {
diff --git a/UI/SemiUrsaMafia/Common.Avalonia/Themes/Controls/ToggleSwitch.axaml b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Shared/Themes/Controls/ToggleSwitch.axaml
similarity index 100%
rename from UI/SemiUrsaMafia/Common.Avalonia/Themes/Controls/ToggleSwitch.axaml
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Shared/Themes/Controls/ToggleSwitch.axaml
diff --git a/UI/SemiUrsaMafia/Common.Avalonia/Themes/Controls/_index.axaml b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Shared/Themes/Controls/_index.axaml
similarity index 100%
rename from UI/SemiUrsaMafia/Common.Avalonia/Themes/Controls/_index.axaml
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Shared/Themes/Controls/_index.axaml
diff --git a/UI/SemiUrsaMafia/Upgrade.Avalonia/App.axaml b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/App.axaml
similarity index 72%
rename from UI/SemiUrsaMafia/Upgrade.Avalonia/App.axaml
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/App.axaml
index 7452c96..c57cab0 100644
--- a/UI/SemiUrsaMafia/Upgrade.Avalonia/App.axaml
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/App.axaml
@@ -1,7 +1,7 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="Upgrade.Avalonia.App"
-             xmlns:local="using:Upgrade.Avalonia"
+             x:Class="GeneralUpdate.Samples.Ursa.Desktop.App"
+             xmlns:local="using:GeneralUpdate.Samples.Ursa.Desktop"
              xmlns:semi="https://irihi.tech/semi">
     <Application.DataTemplates>
         <local:ViewLocator />
@@ -15,7 +15,7 @@
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceInclude Source="avares://Common.Avalonia/Themes/Controls/_index.axaml" />
+                <ResourceInclude Source="avares://GeneralUpdate.Samples.Shared/Themes/Controls/_index.axaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/UI/SemiUrsaMafia/Upgrade.Avalonia/App.axaml.cs b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/App.axaml.cs
similarity index 82%
rename from UI/SemiUrsaMafia/Upgrade.Avalonia/App.axaml.cs
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/App.axaml.cs
index bc30c24..bde96cf 100644
--- a/UI/SemiUrsaMafia/Upgrade.Avalonia/App.axaml.cs
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/App.axaml.cs
@@ -1,12 +1,12 @@
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
-using Common.Avalonia.Services;
+using GeneralUpdate.Samples.Shared.Services;
+using GeneralUpdate.Samples.Ursa.Desktop.ViewModels;
+using GeneralUpdate.Samples.Ursa.Desktop.Views;
 using Microsoft.Extensions.DependencyInjection;
-using Upgrade.Avalonia.ViewModels;
-using Upgrade.Avalonia.Views;
 
-namespace Upgrade.Avalonia;
+namespace GeneralUpdate.Samples.Ursa.Desktop;
 
 public partial class App : Application
 {
diff --git a/UI/SemiUrsaMafia/Upgrade.Avalonia/Upgrade.Avalonia.csproj b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/GeneralUpdate.Samples.Ursa.Desktop.csproj
similarity index 84%
rename from UI/SemiUrsaMafia/Upgrade.Avalonia/Upgrade.Avalonia.csproj
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/GeneralUpdate.Samples.Ursa.Desktop.csproj
index c50a1ea..4c8e38d 100644
--- a/UI/SemiUrsaMafia/Upgrade.Avalonia/Upgrade.Avalonia.csproj
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/GeneralUpdate.Samples.Ursa.Desktop.csproj
@@ -13,12 +13,11 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Semi.Avalonia"/>
         <PackageReference Include="Irihi.Ursa"/>
         <PackageReference Include="Irihi.Ursa.Themes.Semi"/>
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Common.Avalonia\Common.Avalonia.csproj"/>
+        <ProjectReference Include="..\GeneralUpdate.Samples.Shared\GeneralUpdate.Samples.Shared.csproj" />
     </ItemGroup>
 </Project>
diff --git a/UI/SemiUrsaMafia/Upgrade.Avalonia/Program.cs b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/Program.cs
similarity index 93%
rename from UI/SemiUrsaMafia/Upgrade.Avalonia/Program.cs
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/Program.cs
index d97eb65..d5f5595 100644
--- a/UI/SemiUrsaMafia/Upgrade.Avalonia/Program.cs
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/Program.cs
@@ -1,7 +1,7 @@
 using Avalonia;
 using System;
 
-namespace Upgrade.Avalonia;
+namespace GeneralUpdate.Samples.Ursa.Desktop;
 
 sealed class Program
 {
diff --git a/UI/SemiUrsaMafia/Upgrade.Avalonia/ViewLocator.cs b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/ViewLocator.cs
similarity index 86%
rename from UI/SemiUrsaMafia/Upgrade.Avalonia/ViewLocator.cs
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/ViewLocator.cs
index 61ac6c4..704a013 100644
--- a/UI/SemiUrsaMafia/Upgrade.Avalonia/ViewLocator.cs
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/ViewLocator.cs
@@ -1,9 +1,9 @@
 using System;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
-using Upgrade.Avalonia.ViewModels;
+using GeneralUpdate.Samples.Ursa.Desktop.ViewModels;
 
-namespace Upgrade.Avalonia;
+namespace GeneralUpdate.Samples.Ursa.Desktop;
 
 public class ViewLocator : IDataTemplate
 {
diff --git a/UI/SemiUrsaMafia/Upgrade.Avalonia/ViewModels/MainViewViewModel.cs b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/ViewModels/MainViewViewModel.cs
similarity index 94%
rename from UI/SemiUrsaMafia/Upgrade.Avalonia/ViewModels/MainViewViewModel.cs
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/ViewModels/MainViewViewModel.cs
index d6d3dae..ceaa68d 100644
--- a/UI/SemiUrsaMafia/Upgrade.Avalonia/ViewModels/MainViewViewModel.cs
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/ViewModels/MainViewViewModel.cs
@@ -2,13 +2,13 @@
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Controls.Notifications;
-using Common.Avalonia.Models;
-using Common.Avalonia.Services;
+using GeneralUpdate.Samples.Shared.Models;
+using GeneralUpdate.Samples.Shared.Services;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Ursa.Controls;
 
-namespace Upgrade.Avalonia.ViewModels;
+namespace GeneralUpdate.Samples.Ursa.Desktop.ViewModels;
 
 public partial class MainViewViewModel : ViewModelBase
 {
diff --git a/UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/ViewModels/MainWindowViewModel.cs b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/ViewModels/MainWindowViewModel.cs
new file mode 100644
index 0000000..514c56f
--- /dev/null
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/ViewModels/MainWindowViewModel.cs
@@ -0,0 +1,3 @@
+namespace GeneralUpdate.Samples.Ursa.Desktop.ViewModels;
+
+public partial class MainWindowViewModel : ViewModelBase;
\ No newline at end of file
diff --git a/UI/SemiUrsaMafia/Client.Avalonia/ViewModels/ViewModelBase.cs b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/ViewModels/ViewModelBase.cs
similarity index 63%
rename from UI/SemiUrsaMafia/Client.Avalonia/ViewModels/ViewModelBase.cs
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/ViewModels/ViewModelBase.cs
index 45381d0..fce30c2 100644
--- a/UI/SemiUrsaMafia/Client.Avalonia/ViewModels/ViewModelBase.cs
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/ViewModels/ViewModelBase.cs
@@ -1,6 +1,6 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 
-namespace Client.Avalonia.ViewModels;
+namespace GeneralUpdate.Samples.Ursa.Desktop.ViewModels;
 
 public class ViewModelBase : ObservableObject
 {
diff --git a/UI/SemiUrsaMafia/Upgrade.Avalonia/Views/MainView.axaml b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/Views/MainView.axaml
similarity index 92%
rename from UI/SemiUrsaMafia/Upgrade.Avalonia/Views/MainView.axaml
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/Views/MainView.axaml
index 3d8baa8..afb1ce2 100644
--- a/UI/SemiUrsaMafia/Upgrade.Avalonia/Views/MainView.axaml
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/Views/MainView.axaml
@@ -3,12 +3,12 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls"
-             xmlns:vm="clr-namespace:Upgrade.Avalonia.ViewModels"
-             xmlns:services="clr-namespace:Common.Avalonia.Services;assembly=Common.Avalonia"
-             xmlns:cvt="clr-namespace:Common.Avalonia.Converters;assembly=Common.Avalonia"
+             xmlns:vm="clr-namespace:GeneralUpdate.Samples.Ursa.Desktop.ViewModels"
+             xmlns:services="clr-namespace:GeneralUpdate.Samples.Shared.Services;assembly=GeneralUpdate.Samples.Shared"
+             xmlns:cvt="clr-namespace:GeneralUpdate.Samples.Shared.Converters;assembly=GeneralUpdate.Samples.Shared"
              xmlns:u="https://irihi.tech/ursa"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Upgrade.Avalonia.Views.MainView"
+             x:Class="GeneralUpdate.Samples.Ursa.Desktop.Views.MainView"
              x:DataType="vm:MainViewViewModel">
     <UserControl.Resources>
         <converters:EnumToBoolConverter x:Key="EnumToBooleanConverter" />
@@ -42,7 +42,7 @@
                 Height="150"
                 Opacity="{Binding Statistics.ProgressPercentage, 
                 Converter={x:Static cvt:ProgressConverter.ProgressToOpacityConverter}}"
-                Source="avares://Common.Avalonia/Assets/GeneralUpdate.png">
+                Source="avares://GeneralUpdate.Samples.Shared/Assets/GeneralUpdate.png">
                 <u:Avatar.Styles>
                     <Style Selector="Image">
                         <Setter Property="Transitions">
diff --git a/UI/SemiUrsaMafia/Client.Avalonia/Views/MainView.axaml.cs b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/Views/MainView.axaml.cs
similarity index 72%
rename from UI/SemiUrsaMafia/Client.Avalonia/Views/MainView.axaml.cs
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/Views/MainView.axaml.cs
index b52cf13..5db93e7 100644
--- a/UI/SemiUrsaMafia/Client.Avalonia/Views/MainView.axaml.cs
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/Views/MainView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Client.Avalonia.Views;
+namespace GeneralUpdate.Samples.Ursa.Desktop.Views;
 
 public partial class MainView : UserControl
 {
diff --git a/UI/SemiUrsaMafia/Upgrade.Avalonia/Views/MainWindow.axaml b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/Views/MainWindow.axaml
similarity index 82%
rename from UI/SemiUrsaMafia/Upgrade.Avalonia/Views/MainWindow.axaml
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/Views/MainWindow.axaml
index c83ceab..526899c 100644
--- a/UI/SemiUrsaMafia/Upgrade.Avalonia/Views/MainWindow.axaml
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/Views/MainWindow.axaml
@@ -1,16 +1,16 @@
 <u:UrsaWindow
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="clr-namespace:Upgrade.Avalonia.ViewModels"
+    xmlns:vm="clr-namespace:GeneralUpdate.Samples.Ursa.Desktop.ViewModels"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:views="clr-namespace:Upgrade.Avalonia.Views"
+    xmlns:views="clr-namespace:GeneralUpdate.Samples.Ursa.Desktop.Views"
     xmlns:u="https://irihi.tech/ursa"
     xmlns:iri="https://irihi.tech/shared"
     mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-    x:Class="Upgrade.Avalonia.Views.MainWindow"
+    x:Class="GeneralUpdate.Samples.Ursa.Desktop.Views.MainWindow"
     x:DataType="vm:MainWindowViewModel"
-    Icon="avares://Common.Avalonia/Assets/irihi.ico"
+    Icon="avares://GeneralUpdate.Samples.Shared/Assets/irihi.ico"
     Width="800" Height="450"
     WindowStartupLocation="CenterScreen"
     Title="General Update 服务端">
diff --git a/UI/SemiUrsaMafia/Upgrade.Avalonia/Views/MainWindow.axaml.cs b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/Views/MainWindow.axaml.cs
similarity index 79%
rename from UI/SemiUrsaMafia/Upgrade.Avalonia/Views/MainWindow.axaml.cs
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/Views/MainWindow.axaml.cs
index 5551e9d..2acc56e 100644
--- a/UI/SemiUrsaMafia/Upgrade.Avalonia/Views/MainWindow.axaml.cs
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/Views/MainWindow.axaml.cs
@@ -1,9 +1,9 @@
 using Avalonia.Interactivity;
+using GeneralUpdate.Samples.Ursa.Desktop.ViewModels;
 using Microsoft.Extensions.DependencyInjection;
-using Upgrade.Avalonia.ViewModels;
 using Ursa.Controls;
 
-namespace Upgrade.Avalonia.Views;
+namespace GeneralUpdate.Samples.Ursa.Desktop.Views;
 
 public partial class MainWindow : UrsaWindow
 {
diff --git a/UI/SemiUrsaMafia/Upgrade.Avalonia/app.manifest b/UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/app.manifest
similarity index 100%
rename from UI/SemiUrsaMafia/Upgrade.Avalonia/app.manifest
rename to UI/SemiUrsaMafia/GeneralUpdate.Samples.Ursa.Desktop/app.manifest
diff --git a/UI/SemiUrsaMafia/GeneralUpdate.Samples.slnx b/UI/SemiUrsaMafia/GeneralUpdate.Samples.slnx
new file mode 100644
index 0000000..6fc6943
--- /dev/null
+++ b/UI/SemiUrsaMafia/GeneralUpdate.Samples.slnx
@@ -0,0 +1,11 @@
+<Solution>
+  <Folder Name="/Solution Items/">
+    <File Path="Directory.Packages.props" />
+  </Folder>
+  <Project Path="GeneralUpdate.Samples.Mafia.Android/GeneralUpdate.Samples.Mafia.Android.csproj" />
+  <Project Path="GeneralUpdate.Samples.Mafia/GeneralUpdate.Samples.Mafia.csproj" />
+  <Project Path="GeneralUpdate.Samples.Mafia.Desktop/GeneralUpdate.Samples.Mafia.Desktop.csproj" />
+  <Project Path="GeneralUpdate.Samples.Semi.Desktop/GeneralUpdate.Samples.Semi.Desktop.csproj" />
+  <Project Path="GeneralUpdate.Samples.Shared/GeneralUpdate.Samples.Shared.csproj" />
+  <Project Path="GeneralUpdate.Samples.Ursa.Desktop/GeneralUpdate.Samples.Ursa.Desktop.csproj" />
+</Solution>
diff --git a/UI/SemiUrsaMafia/Upgrade.Avalonia.slnx b/UI/SemiUrsaMafia/Upgrade.Avalonia.slnx
deleted file mode 100644
index b4fa48e..0000000
--- a/UI/SemiUrsaMafia/Upgrade.Avalonia.slnx
+++ /dev/null
@@ -1,9 +0,0 @@
-<Solution>
-  <Folder Name="/Solution Items/">
-    <File Path="Directory.Packages.props" />
-  </Folder>
-  <Project Path="Client.Avalonia/Client.Avalonia.csproj" />
-  <Project Path="Common.Avalonia/Common.Avalonia.csproj" />
-  <Project Path="Mobile.Avalonia/Mobile.Avalonia.csproj" />
-  <Project Path="Upgrade.Avalonia/Upgrade.Avalonia.csproj" />
-</Solution>
diff --git a/UI/SemiUrsaMafia/Upgrade.Avalonia/ViewModels/MainWindowViewModel.cs b/UI/SemiUrsaMafia/Upgrade.Avalonia/ViewModels/MainWindowViewModel.cs
deleted file mode 100644
index fcd4484..0000000
--- a/UI/SemiUrsaMafia/Upgrade.Avalonia/ViewModels/MainWindowViewModel.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace Upgrade.Avalonia.ViewModels;
-
-public partial class MainWindowViewModel : ViewModelBase;
\ No newline at end of file