diff --git a/Raylib-cs.Android/AndroidManifest.xml b/Raylib-cs.Android.Sample/AndroidManifest.xml
similarity index 100%
rename from Raylib-cs.Android/AndroidManifest.xml
rename to Raylib-cs.Android.Sample/AndroidManifest.xml
diff --git a/Raylib-cs.Android/Assembly.cs b/Raylib-cs.Android.Sample/Assembly.cs
similarity index 100%
rename from Raylib-cs.Android/Assembly.cs
rename to Raylib-cs.Android.Sample/Assembly.cs
diff --git a/Raylib-cs.Android/MainActivity.cs b/Raylib-cs.Android.Sample/MainActivity.cs
similarity index 78%
rename from Raylib-cs.Android/MainActivity.cs
rename to Raylib-cs.Android.Sample/MainActivity.cs
index 590690e..72dcadf 100644
--- a/Raylib-cs.Android/MainActivity.cs
+++ b/Raylib-cs.Android.Sample/MainActivity.cs
@@ -17,14 +17,9 @@ namespace Raylib_cs.Android;
     IntentFilter(new[] { Intent.ActionMain }),
     MetaData(NativeActivity.MetaDataLibName, Value = "raylib")
 ]
-public class MainActivity : NativeActivity
+public class MainActivity : RaylibActivity
 {
-    static MainActivity()
-    {
-        RaylibSetAndroidCallback(Main);
-    }
-
-    private static void Main()
+    protected override void OnReady()
     {
         Raylib.InitWindow(0, 0, "android_window");
         while (!Raylib.WindowShouldClose())
@@ -36,7 +31,4 @@ public class MainActivity : NativeActivity
             Raylib.EndDrawing();
         }
     }
-
-    [DllImport("raylib")]
-    private static extern void RaylibSetAndroidCallback(Action callback);
 }
diff --git a/Raylib-cs.Android/README.md b/Raylib-cs.Android.Sample/README.md
similarity index 100%
rename from Raylib-cs.Android/README.md
rename to Raylib-cs.Android.Sample/README.md
diff --git a/Raylib-cs.Android.Sample/Raylib-cs.Android.Sample.csproj b/Raylib-cs.Android.Sample/Raylib-cs.Android.Sample.csproj
new file mode 100644
index 0000000..64842e7
--- /dev/null
+++ b/Raylib-cs.Android.Sample/Raylib-cs.Android.Sample.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net7.0-android</TargetFramework>
+    <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
+    <RootNamespace>Raylib_cs.Android.Sample</RootNamespace>
+    <OutputType>Exe</OutputType>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <ApplicationId>com.raylib.cs</ApplicationId>
+    <ApplicationVersion>1</ApplicationVersion>
+    <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
+    <EmbedAssembliesIntoApk Condition="$(Configuration) == 'Debug'">true</EmbedAssembliesIntoApk>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Raylib-cs" Version="4.5.0.2" />
+    <ProjectReference Include="../Raylib-cs.Android/Raylib-cs.Android.csproj" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Raylib-cs.Android/Resources/AboutResources.txt b/Raylib-cs.Android.Sample/Resources/AboutResources.txt
similarity index 100%
rename from Raylib-cs.Android/Resources/AboutResources.txt
rename to Raylib-cs.Android.Sample/Resources/AboutResources.txt
diff --git a/Raylib-cs.Android/Resources/layout/activity_main.xml b/Raylib-cs.Android.Sample/Resources/layout/activity_main.xml
similarity index 100%
rename from Raylib-cs.Android/Resources/layout/activity_main.xml
rename to Raylib-cs.Android.Sample/Resources/layout/activity_main.xml
diff --git a/Raylib-cs.Android/Resources/mipmap-anydpi-v26/appicon.xml b/Raylib-cs.Android.Sample/Resources/mipmap-anydpi-v26/appicon.xml
similarity index 100%
rename from Raylib-cs.Android/Resources/mipmap-anydpi-v26/appicon.xml
rename to Raylib-cs.Android.Sample/Resources/mipmap-anydpi-v26/appicon.xml
diff --git a/Raylib-cs.Android/Resources/mipmap-anydpi-v26/appicon_round.xml b/Raylib-cs.Android.Sample/Resources/mipmap-anydpi-v26/appicon_round.xml
similarity index 100%
rename from Raylib-cs.Android/Resources/mipmap-anydpi-v26/appicon_round.xml
rename to Raylib-cs.Android.Sample/Resources/mipmap-anydpi-v26/appicon_round.xml
diff --git a/Raylib-cs.Android/Resources/mipmap-hdpi/appicon.png b/Raylib-cs.Android.Sample/Resources/mipmap-hdpi/appicon.png
similarity index 100%
rename from Raylib-cs.Android/Resources/mipmap-hdpi/appicon.png
rename to Raylib-cs.Android.Sample/Resources/mipmap-hdpi/appicon.png
diff --git a/Raylib-cs.Android/Resources/mipmap-hdpi/appicon_background.png b/Raylib-cs.Android.Sample/Resources/mipmap-hdpi/appicon_background.png
similarity index 100%
rename from Raylib-cs.Android/Resources/mipmap-hdpi/appicon_background.png
rename to Raylib-cs.Android.Sample/Resources/mipmap-hdpi/appicon_background.png
diff --git a/Raylib-cs.Android/Resources/mipmap-hdpi/appicon_foreground.png b/Raylib-cs.Android.Sample/Resources/mipmap-hdpi/appicon_foreground.png
similarity index 100%
rename from Raylib-cs.Android/Resources/mipmap-hdpi/appicon_foreground.png
rename to Raylib-cs.Android.Sample/Resources/mipmap-hdpi/appicon_foreground.png
diff --git a/Raylib-cs.Android/Resources/mipmap-mdpi/appicon.png b/Raylib-cs.Android.Sample/Resources/mipmap-mdpi/appicon.png
similarity index 100%
rename from Raylib-cs.Android/Resources/mipmap-mdpi/appicon.png
rename to Raylib-cs.Android.Sample/Resources/mipmap-mdpi/appicon.png
diff --git a/Raylib-cs.Android/Resources/mipmap-mdpi/appicon_background.png b/Raylib-cs.Android.Sample/Resources/mipmap-mdpi/appicon_background.png
similarity index 100%
rename from Raylib-cs.Android/Resources/mipmap-mdpi/appicon_background.png
rename to Raylib-cs.Android.Sample/Resources/mipmap-mdpi/appicon_background.png
diff --git a/Raylib-cs.Android/Resources/mipmap-mdpi/appicon_foreground.png b/Raylib-cs.Android.Sample/Resources/mipmap-mdpi/appicon_foreground.png
similarity index 100%
rename from Raylib-cs.Android/Resources/mipmap-mdpi/appicon_foreground.png
rename to Raylib-cs.Android.Sample/Resources/mipmap-mdpi/appicon_foreground.png
diff --git a/Raylib-cs.Android/Resources/mipmap-xhdpi/appicon.png b/Raylib-cs.Android.Sample/Resources/mipmap-xhdpi/appicon.png
similarity index 100%
rename from Raylib-cs.Android/Resources/mipmap-xhdpi/appicon.png
rename to Raylib-cs.Android.Sample/Resources/mipmap-xhdpi/appicon.png
diff --git a/Raylib-cs.Android/Resources/mipmap-xhdpi/appicon_background.png b/Raylib-cs.Android.Sample/Resources/mipmap-xhdpi/appicon_background.png
similarity index 100%
rename from Raylib-cs.Android/Resources/mipmap-xhdpi/appicon_background.png
rename to Raylib-cs.Android.Sample/Resources/mipmap-xhdpi/appicon_background.png
diff --git a/Raylib-cs.Android/Resources/mipmap-xhdpi/appicon_foreground.png b/Raylib-cs.Android.Sample/Resources/mipmap-xhdpi/appicon_foreground.png
similarity index 100%
rename from Raylib-cs.Android/Resources/mipmap-xhdpi/appicon_foreground.png
rename to Raylib-cs.Android.Sample/Resources/mipmap-xhdpi/appicon_foreground.png
diff --git a/Raylib-cs.Android/Resources/mipmap-xxhdpi/appicon.png b/Raylib-cs.Android.Sample/Resources/mipmap-xxhdpi/appicon.png
similarity index 100%
rename from Raylib-cs.Android/Resources/mipmap-xxhdpi/appicon.png
rename to Raylib-cs.Android.Sample/Resources/mipmap-xxhdpi/appicon.png
diff --git a/Raylib-cs.Android/Resources/mipmap-xxhdpi/appicon_background.png b/Raylib-cs.Android.Sample/Resources/mipmap-xxhdpi/appicon_background.png
similarity index 100%
rename from Raylib-cs.Android/Resources/mipmap-xxhdpi/appicon_background.png
rename to Raylib-cs.Android.Sample/Resources/mipmap-xxhdpi/appicon_background.png
diff --git a/Raylib-cs.Android/Resources/mipmap-xxhdpi/appicon_foreground.png b/Raylib-cs.Android.Sample/Resources/mipmap-xxhdpi/appicon_foreground.png
similarity index 100%
rename from Raylib-cs.Android/Resources/mipmap-xxhdpi/appicon_foreground.png
rename to Raylib-cs.Android.Sample/Resources/mipmap-xxhdpi/appicon_foreground.png
diff --git a/Raylib-cs.Android/Resources/mipmap-xxxhdpi/appicon.png b/Raylib-cs.Android.Sample/Resources/mipmap-xxxhdpi/appicon.png
similarity index 100%
rename from Raylib-cs.Android/Resources/mipmap-xxxhdpi/appicon.png
rename to Raylib-cs.Android.Sample/Resources/mipmap-xxxhdpi/appicon.png
diff --git a/Raylib-cs.Android/Resources/mipmap-xxxhdpi/appicon_background.png b/Raylib-cs.Android.Sample/Resources/mipmap-xxxhdpi/appicon_background.png
similarity index 100%
rename from Raylib-cs.Android/Resources/mipmap-xxxhdpi/appicon_background.png
rename to Raylib-cs.Android.Sample/Resources/mipmap-xxxhdpi/appicon_background.png
diff --git a/Raylib-cs.Android/Resources/mipmap-xxxhdpi/appicon_foreground.png b/Raylib-cs.Android.Sample/Resources/mipmap-xxxhdpi/appicon_foreground.png
similarity index 100%
rename from Raylib-cs.Android/Resources/mipmap-xxxhdpi/appicon_foreground.png
rename to Raylib-cs.Android.Sample/Resources/mipmap-xxxhdpi/appicon_foreground.png
diff --git a/Raylib-cs.Android/Resources/values/ic_launcher_background.xml b/Raylib-cs.Android.Sample/Resources/values/ic_launcher_background.xml
similarity index 100%
rename from Raylib-cs.Android/Resources/values/ic_launcher_background.xml
rename to Raylib-cs.Android.Sample/Resources/values/ic_launcher_background.xml
diff --git a/Raylib-cs.Android/Resources/values/strings.xml b/Raylib-cs.Android.Sample/Resources/values/strings.xml
similarity index 100%
rename from Raylib-cs.Android/Resources/values/strings.xml
rename to Raylib-cs.Android.Sample/Resources/values/strings.xml
diff --git a/Raylib-cs.Android/Raylib-cs.Android.csproj b/Raylib-cs.Android/Raylib-cs.Android.csproj
index 0beccd5..367d3ba 100644
--- a/Raylib-cs.Android/Raylib-cs.Android.csproj
+++ b/Raylib-cs.Android/Raylib-cs.Android.csproj
@@ -1,16 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFramework>net7.0-android</TargetFramework>
     <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
     <RootNamespace>Raylib_cs.Android</RootNamespace>
-    <OutputType>Exe</OutputType>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <ApplicationId>com.companyname.Raylib_cs.Android</ApplicationId>
-    <ApplicationVersion>1</ApplicationVersion>
-    <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
+    <AssemblyName>Raylibcs.Android</AssemblyName>
   </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Raylib-cs" Version="4.5.0.2" />
-  </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/Raylib-cs.Android/RaylibActivity.cs b/Raylib-cs.Android/RaylibActivity.cs
new file mode 100644
index 0000000..f060c83
--- /dev/null
+++ b/Raylib-cs.Android/RaylibActivity.cs
@@ -0,0 +1,17 @@
+using System.Runtime.InteropServices;
+
+namespace Raylib_cs;
+
+public abstract class RaylibActivity : NativeActivity
+{
+    protected override void OnCreate(Bundle? savedInstanceState)
+    {
+        base.OnCreate(savedInstanceState);
+        RaylibSetAndroidCallback(OnReady);
+    }
+
+    protected abstract void OnReady();
+
+    [DllImport("raylib")]
+    private static extern void RaylibSetAndroidCallback(Action callback);
+}
diff --git a/Raylib-cs.sln b/Raylib-cs.sln
index db6ca67..757b546 100644
--- a/Raylib-cs.sln
+++ b/Raylib-cs.sln
@@ -9,6 +9,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Raylib-cs.Tests", "Raylib-c
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Raylib-cs.Android", "Raylib-cs.Android\Raylib-cs.Android.csproj", "{FF57C585-9887-4DC1-A240-5B3D85E9C459}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Raylib-cs.Android.Sample", "Raylib-cs.Android.Sample\Raylib-cs.Android.Sample.csproj", "{83FB8D25-FD15-4893-9F57-1736D2C0F616}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -39,6 +41,18 @@ Global
 		{FF57C585-9887-4DC1-A240-5B3D85E9C459}.Release|x64.Build.0 = Release|Any CPU
 		{FF57C585-9887-4DC1-A240-5B3D85E9C459}.Release|x86.ActiveCfg = Release|Any CPU
 		{FF57C585-9887-4DC1-A240-5B3D85E9C459}.Release|x86.Build.0 = Release|Any CPU
+		{83FB8D25-FD15-4893-9F57-1736D2C0F616}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83FB8D25-FD15-4893-9F57-1736D2C0F616}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83FB8D25-FD15-4893-9F57-1736D2C0F616}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{83FB8D25-FD15-4893-9F57-1736D2C0F616}.Debug|x64.Build.0 = Debug|Any CPU
+		{83FB8D25-FD15-4893-9F57-1736D2C0F616}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{83FB8D25-FD15-4893-9F57-1736D2C0F616}.Debug|x86.Build.0 = Debug|Any CPU
+		{83FB8D25-FD15-4893-9F57-1736D2C0F616}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{83FB8D25-FD15-4893-9F57-1736D2C0F616}.Release|Any CPU.Build.0 = Release|Any CPU
+		{83FB8D25-FD15-4893-9F57-1736D2C0F616}.Release|x64.ActiveCfg = Release|Any CPU
+		{83FB8D25-FD15-4893-9F57-1736D2C0F616}.Release|x64.Build.0 = Release|Any CPU
+		{83FB8D25-FD15-4893-9F57-1736D2C0F616}.Release|x86.ActiveCfg = Release|Any CPU
+		{83FB8D25-FD15-4893-9F57-1736D2C0F616}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE