diff --git a/src/KeePass.sln b/src/KeePass.sln
index 8f9058fd..55081b4e 100644
--- a/src/KeePass.sln
+++ b/src/KeePass.sln
@@ -23,7 +23,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZlibAndroid", "ZlibAndroid\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PCloudBindings", "PCloudBindings\PCloudBindings.csproj", "{2DB80C77-D46F-4970-B967-E9FFA9B2AC2E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "keepass2android", "keepass2android\keepass2android.csproj", "{8DB32725-479F-43E9-9805-38FD370704F8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "keepass2android-app", "keepass2android\keepass2android-app.csproj", "{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SamsungPass", "SamsungPass\Xamarin.SamsungPass\SamsungPass\SamsungPass.csproj", "{3A4B8E88-FA9B-4663-BCDA-21C12E3AF98A}"
 EndProject
@@ -249,42 +249,42 @@ Global
 		{2DB80C77-D46F-4970-B967-E9FFA9B2AC2E}.ReleaseNoNet|Win32.Build.0 = ReleaseNoNet|Any CPU
 		{2DB80C77-D46F-4970-B967-E9FFA9B2AC2E}.ReleaseNoNet|x64.ActiveCfg = ReleaseNoNet|Any CPU
 		{2DB80C77-D46F-4970-B967-E9FFA9B2AC2E}.ReleaseNoNet|x64.Build.0 = ReleaseNoNet|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.Debug|Mixed Platforms.Deploy.0 = Debug|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.Debug|Win32.Build.0 = Debug|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.Debug|Win32.Deploy.0 = Debug|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.Debug|x64.Build.0 = Debug|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.Debug|x64.Deploy.0 = Debug|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.Release|Mixed Platforms.Deploy.0 = Release|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.Release|Win32.ActiveCfg = Release|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.Release|Win32.Build.0 = Release|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.Release|Win32.Deploy.0 = Release|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.Release|x64.ActiveCfg = Release|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.Release|x64.Build.0 = Release|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.Release|x64.Deploy.0 = Release|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.ReleaseNoNet|Any CPU.Deploy.0 = Release|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.ReleaseNoNet|Mixed Platforms.Deploy.0 = Release|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.ReleaseNoNet|Win32.Build.0 = Release|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.ReleaseNoNet|Win32.Deploy.0 = Release|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.ReleaseNoNet|x64.Build.0 = Release|Any CPU
-		{8DB32725-479F-43E9-9805-38FD370704F8}.ReleaseNoNet|x64.Deploy.0 = Release|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Debug|Mixed Platforms.Deploy.0 = Debug|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Debug|Win32.Build.0 = Debug|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Debug|Win32.Deploy.0 = Debug|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Debug|x64.Build.0 = Debug|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Debug|x64.Deploy.0 = Debug|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Release|Mixed Platforms.Deploy.0 = Release|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Release|Win32.ActiveCfg = Release|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Release|Win32.Build.0 = Release|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Release|Win32.Deploy.0 = Release|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Release|x64.ActiveCfg = Release|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Release|x64.Build.0 = Release|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.Release|x64.Deploy.0 = Release|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.ReleaseNoNet|Any CPU.Deploy.0 = Release|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.ReleaseNoNet|Mixed Platforms.Deploy.0 = Release|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.ReleaseNoNet|Win32.Build.0 = Release|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.ReleaseNoNet|Win32.Deploy.0 = Release|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.ReleaseNoNet|x64.Build.0 = Release|Any CPU
+		{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}.ReleaseNoNet|x64.Deploy.0 = Release|Any CPU
 		{3A4B8E88-FA9B-4663-BCDA-21C12E3AF98A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3A4B8E88-FA9B-4663-BCDA-21C12E3AF98A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3A4B8E88-FA9B-4663-BCDA-21C12E3AF98A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
diff --git a/src/keepass2android/keepass2android.csproj b/src/keepass2android/keepass2android-app.csproj
similarity index 99%
rename from src/keepass2android/keepass2android.csproj
rename to src/keepass2android/keepass2android-app.csproj
index 07b92a03..a6ce1cf8 100644
--- a/src/keepass2android/keepass2android.csproj
+++ b/src/keepass2android/keepass2android-app.csproj
@@ -5,7 +5,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{8DB32725-479F-43E9-9805-38FD370704F8}</ProjectGuid>
+    <ProjectGuid>{D4C32E0A-0193-4496-9DB4-02CC126FD9F3}</ProjectGuid>
     <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TemplateGuid>{84dd83c5-0fe3-4294-9419-09e7c8ba324f}</TemplateGuid>
     <OutputType>Library</OutputType>