diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ddde5b8..afc9ab8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -205,7 +205,7 @@ jobs:
           export PATH=$ANDROID_HOME/ndk/$NDK_VER:$PATH
           export OUTPUT=$PWD/SDL3-CS/native/android
           rm -rf $OUTPUT && mkdir -p $OUTPUT
-        
+
           # Build SDL3
           sed -i 's/abi=.*/abi="armeabi-v7a arm64-v8a x86 x86_64"/g' ./build-scripts/androidbuildlibs.sh
           ./build-scripts/androidbuildlibs.sh NDK_LIBS_OUT="$OUTPUT"
@@ -214,7 +214,7 @@ jobs:
         run: |
           export JAVA_HOME=$JAVA_HOME_11_X64
           export PATH=$JAVA_HOME_11_X64/bin:$PATH
-          export OUTPUT=$PWD/SDL3-CS/SDL3-CS-Android/Jars/
+          export OUTPUT=$PWD/SDL3-CS/SDL3-CS.Android/Jars/
           rm -rf $OUTPUT && mkdir -p $OUTPUT
 
           # Build SDL3 Android Java part
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 17e6bf1..48c67f7 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -6,7 +6,7 @@ on:
       - '*'
 
 jobs:
-  pack:
+  desktop:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -17,7 +17,7 @@ jobs:
           dotnet-version: 8.0.x
 
       - name: Build
-        run: dotnet build SDL3-CS.sln -c Release
+        run: dotnet build SDL3-CS.Desktop.slnf -c Release
 
       - name: Pack
         run: dotnet pack SDL3-CS/SDL3-CS.csproj -c Release /p:Version=$(git describe --exact-match --tags HEAD)
@@ -30,3 +30,31 @@ jobs:
 
       - name: Publish tagged release to nuget.org
         run: dotnet nuget push SDL3-CS/bin/Release/ppy.*.nupkg -s https://api.nuget.org/v3/index.json --api-key ${{secrets.NUGET_API_KEY}}
+
+  android:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 8.0.x
+
+      - name: Install Android workload
+        run: dotnet workload install android
+
+      - name: Build
+        run: dotnet build SDL3-CS.Android.slnf -c Release
+
+      - name: Pack
+        run: dotnet pack SDL3-CS.Android/SDL3-CS.Android.csproj -c Release /p:Version=$(git describe --exact-match --tags HEAD)
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: SDL3-CS.Android
+          path: SDL3-CS.Android/bin/Release/ppy.*.nupkg
+
+      - name: Publish tagged release to nuget.org
+        run: dotnet nuget push SDL3-CS.Android/bin/Release/ppy.*.nupkg -s https://api.nuget.org/v3/index.json --api-key ${{secrets.NUGET_API_KEY}}
diff --git a/SDL3-CS.Android.slnf b/SDL3-CS.Android.slnf
new file mode 100644
index 0000000..3b36e0a
--- /dev/null
+++ b/SDL3-CS.Android.slnf
@@ -0,0 +1,8 @@
+{
+  "solution": {
+    "path": "SDL3-CS.sln",
+    "projects": [
+      "SDL3-CS.Android\\SDL3-CS.Android.csproj"
+    ]
+  }
+}
diff --git a/SDL3-CS-Android/Additions/AboutAdditions.txt b/SDL3-CS.Android/Additions/AboutAdditions.txt
similarity index 100%
rename from SDL3-CS-Android/Additions/AboutAdditions.txt
rename to SDL3-CS.Android/Additions/AboutAdditions.txt
diff --git a/SDL3-CS-Android/SDL3-CS-Android.csproj b/SDL3-CS.Android/SDL3-CS.Android.csproj
similarity index 53%
rename from SDL3-CS-Android/SDL3-CS-Android.csproj
rename to SDL3-CS.Android/SDL3-CS.Android.csproj
index c304bdd..4d62153 100644
--- a/SDL3-CS-Android/SDL3-CS-Android.csproj
+++ b/SDL3-CS.Android/SDL3-CS.Android.csproj
@@ -2,17 +2,31 @@
   <PropertyGroup>
     <TargetFramework>net8.0-android</TargetFramework>
     <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
-    <RootNamespace>SDL3_CS_Android</RootNamespace>
+    <RootNamespace>SDL3.Android</RootNamespace>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
+
+  <PropertyGroup Label="NuGet">
+    <Authors>ppy Pty Ltd</Authors>
+    <Company>ppy Pty Ltd</Company>
+    <Copyright>Copyright (c) 2024 ppy Pty Ltd</Copyright>
+    <Product>ppy.SDL3-CS.Android</Product>
+    <PackageId>ppy.SDL3-CS.Android</PackageId>
+    <PackageReleaseNotes>Automated release.</PackageReleaseNotes>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/ppy/SDL3-CS</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/ppy/SDL3-CS</RepositoryUrl>
+  </PropertyGroup>
+
   <ItemGroup>
     <EmbeddedJar Include="Jars\SDL3AndroidBridge.jar" />
   </ItemGroup>
+
   <ItemGroup>
     <EmbeddedNativeLibrary Include="..\native\android\armeabi-v7a\libSDL3.so" />
     <EmbeddedNativeLibrary Include="..\native\android\arm64-v8a\libSDL3.so" />
     <EmbeddedNativeLibrary Include="..\native\android\x86\libSDL3.so" />
     <EmbeddedNativeLibrary Include="..\native\android\x86_64\libSDL3.so" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/SDL3-CS-Android/Transforms/EnumFields.xml b/SDL3-CS.Android/Transforms/EnumFields.xml
similarity index 100%
rename from SDL3-CS-Android/Transforms/EnumFields.xml
rename to SDL3-CS.Android/Transforms/EnumFields.xml
diff --git a/SDL3-CS-Android/Transforms/EnumMethods.xml b/SDL3-CS.Android/Transforms/EnumMethods.xml
similarity index 100%
rename from SDL3-CS-Android/Transforms/EnumMethods.xml
rename to SDL3-CS.Android/Transforms/EnumMethods.xml
diff --git a/SDL3-CS-Android/Transforms/Metadata.xml b/SDL3-CS.Android/Transforms/Metadata.xml
similarity index 100%
rename from SDL3-CS-Android/Transforms/Metadata.xml
rename to SDL3-CS.Android/Transforms/Metadata.xml
diff --git a/SDL3-CS.Desktop.slnf b/SDL3-CS.Desktop.slnf
new file mode 100644
index 0000000..e163357
--- /dev/null
+++ b/SDL3-CS.Desktop.slnf
@@ -0,0 +1,10 @@
+{
+  "solution": {
+    "path": "SDL3-CS.sln",
+    "projects": [
+      "SDL3-CS\\SDL3-CS.csproj",
+      "SDL3-CS.SourceGeneration\\SDL3-CS.SourceGeneration.csproj",
+      "SDL3-CS.Tests\\SDL3-CS.Tests.csproj"
+    ]
+  }
+}
diff --git a/SDL3-CS.sln b/SDL3-CS.sln
index 6b4a898..a9e57ab 100644
--- a/SDL3-CS.sln
+++ b/SDL3-CS.sln
@@ -19,7 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SDL3-CS.SourceGeneration",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SDL3-CS.Tests", "SDL3-CS.Tests\SDL3-CS.Tests.csproj", "{CF980481-8227-4BED-970E-6433C83F64CB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SDL3-CS-Android", "SDL3-CS-Android\SDL3-CS-Android.csproj", "{CA28F49C-D0BE-47D6-9E82-7A0B8C380B8B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SDL3-CS.Android", "SDL3-CS.Android\SDL3-CS.Android.csproj", "{CA28F49C-D0BE-47D6-9E82-7A0B8C380B8B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution