diff --git a/src/keepass2android/AboutActivity.cs b/src/keepass2android-app/AboutActivity.cs
similarity index 100%
rename from src/keepass2android/AboutActivity.cs
rename to src/keepass2android-app/AboutActivity.cs
diff --git a/src/keepass2android/AboutDialog.cs b/src/keepass2android-app/AboutDialog.cs
similarity index 100%
rename from src/keepass2android/AboutDialog.cs
rename to src/keepass2android-app/AboutDialog.cs
diff --git a/src/keepass2android/ActivityLaunchMode.cs b/src/keepass2android-app/ActivityLaunchMode.cs
similarity index 100%
rename from src/keepass2android/ActivityLaunchMode.cs
rename to src/keepass2android-app/ActivityLaunchMode.cs
diff --git a/src/keepass2android/AppKilledInfo.cs b/src/keepass2android-app/AppKilledInfo.cs
similarity index 100%
rename from src/keepass2android/AppKilledInfo.cs
rename to src/keepass2android-app/AppKilledInfo.cs
diff --git a/src/keepass2android/AssemblyInfo.cs b/src/keepass2android-app/AssemblyInfo.cs
similarity index 100%
rename from src/keepass2android/AssemblyInfo.cs
rename to src/keepass2android-app/AssemblyInfo.cs
diff --git a/src/keepass2android/Assets/LICENSE_SourceCodePro.txt b/src/keepass2android-app/Assets/LICENSE_SourceCodePro.txt
similarity index 100%
rename from src/keepass2android/Assets/LICENSE_SourceCodePro.txt
rename to src/keepass2android-app/Assets/LICENSE_SourceCodePro.txt
diff --git a/src/keepass2android/Assets/SourceCodePro-Regular.ttf b/src/keepass2android-app/Assets/SourceCodePro-Regular.ttf
similarity index 100%
rename from src/keepass2android/Assets/SourceCodePro-Regular.ttf
rename to src/keepass2android-app/Assets/SourceCodePro-Regular.ttf
diff --git a/src/keepass2android/Assets/fontawesome-webfont.ttf b/src/keepass2android-app/Assets/fontawesome-webfont.ttf
similarity index 100%
rename from src/keepass2android/Assets/fontawesome-webfont.ttf
rename to src/keepass2android-app/Assets/fontawesome-webfont.ttf
diff --git a/src/keepass2android/Assets/publicsuffix.txt b/src/keepass2android-app/Assets/publicsuffix.txt
similarity index 100%
rename from src/keepass2android/Assets/publicsuffix.txt
rename to src/keepass2android-app/Assets/publicsuffix.txt
diff --git a/src/keepass2android/AttachmentContentProvider.cs b/src/keepass2android-app/AttachmentContentProvider.cs
similarity index 100%
rename from src/keepass2android/AttachmentContentProvider.cs
rename to src/keepass2android-app/AttachmentContentProvider.cs
diff --git a/src/keepass2android/AutoOpenEdit.cs b/src/keepass2android-app/AutoOpenEdit.cs
similarity index 100%
rename from src/keepass2android/AutoOpenEdit.cs
rename to src/keepass2android-app/AutoOpenEdit.cs
diff --git a/src/keepass2android/BiometricModule.cs b/src/keepass2android-app/BiometricModule.cs
similarity index 100%
rename from src/keepass2android/BiometricModule.cs
rename to src/keepass2android-app/BiometricModule.cs
diff --git a/src/keepass2android/CancelDialog.cs b/src/keepass2android-app/CancelDialog.cs
similarity index 100%
rename from src/keepass2android/CancelDialog.cs
rename to src/keepass2android-app/CancelDialog.cs
diff --git a/src/keepass2android/ChallengeInfo.cs b/src/keepass2android-app/ChallengeInfo.cs
similarity index 100%
rename from src/keepass2android/ChallengeInfo.cs
rename to src/keepass2android-app/ChallengeInfo.cs
diff --git a/src/keepass2android/ChallengeXCKey.cs b/src/keepass2android-app/ChallengeXCKey.cs
similarity index 100%
rename from src/keepass2android/ChallengeXCKey.cs
rename to src/keepass2android-app/ChallengeXCKey.cs
diff --git a/src/keepass2android/ChangeLog.cs b/src/keepass2android-app/ChangeLog.cs
similarity index 100%
rename from src/keepass2android/ChangeLog.cs
rename to src/keepass2android-app/ChangeLog.cs
diff --git a/src/keepass2android/CloseImmediatelyActivity.cs b/src/keepass2android-app/CloseImmediatelyActivity.cs
similarity index 100%
rename from src/keepass2android/CloseImmediatelyActivity.cs
rename to src/keepass2android-app/CloseImmediatelyActivity.cs
diff --git a/src/keepass2android/ConfigureChildDatabasesActivity.cs b/src/keepass2android-app/ConfigureChildDatabasesActivity.cs
similarity index 100%
rename from src/keepass2android/ConfigureChildDatabasesActivity.cs
rename to src/keepass2android-app/ConfigureChildDatabasesActivity.cs
diff --git a/src/keepass2android/CreateDatabaseActivity.cs b/src/keepass2android-app/CreateDatabaseActivity.cs
similarity index 100%
rename from src/keepass2android/CreateDatabaseActivity.cs
rename to src/keepass2android-app/CreateDatabaseActivity.cs
diff --git a/src/keepass2android/CreateNewFilename.cs b/src/keepass2android-app/CreateNewFilename.cs
similarity index 100%
rename from src/keepass2android/CreateNewFilename.cs
rename to src/keepass2android-app/CreateNewFilename.cs
diff --git a/src/keepass2android/DisableAutofillForQueryActivity.cs b/src/keepass2android-app/DisableAutofillForQueryActivity.cs
similarity index 100%
rename from src/keepass2android/DisableAutofillForQueryActivity.cs
rename to src/keepass2android-app/DisableAutofillForQueryActivity.cs
diff --git a/src/keepass2android/DonateReminder.cs b/src/keepass2android-app/DonateReminder.cs
similarity index 100%
rename from src/keepass2android/DonateReminder.cs
rename to src/keepass2android-app/DonateReminder.cs
diff --git a/src/keepass2android/EntryActivity.cs b/src/keepass2android-app/EntryActivity.cs
similarity index 100%
rename from src/keepass2android/EntryActivity.cs
rename to src/keepass2android-app/EntryActivity.cs
diff --git a/src/keepass2android/EntryActivityClasses/CopyToClipboardPopupMenuIcon.cs b/src/keepass2android-app/EntryActivityClasses/CopyToClipboardPopupMenuIcon.cs
similarity index 100%
rename from src/keepass2android/EntryActivityClasses/CopyToClipboardPopupMenuIcon.cs
rename to src/keepass2android-app/EntryActivityClasses/CopyToClipboardPopupMenuIcon.cs
diff --git a/src/keepass2android/EntryActivityClasses/ExtraStringView.cs b/src/keepass2android-app/EntryActivityClasses/ExtraStringView.cs
similarity index 100%
rename from src/keepass2android/EntryActivityClasses/ExtraStringView.cs
rename to src/keepass2android-app/EntryActivityClasses/ExtraStringView.cs
diff --git a/src/keepass2android/EntryActivityClasses/GotoUrlMenuItem.cs b/src/keepass2android-app/EntryActivityClasses/GotoUrlMenuItem.cs
similarity index 100%
rename from src/keepass2android/EntryActivityClasses/GotoUrlMenuItem.cs
rename to src/keepass2android-app/EntryActivityClasses/GotoUrlMenuItem.cs
diff --git a/src/keepass2android/EntryActivityClasses/IPopupMenuItem.cs b/src/keepass2android-app/EntryActivityClasses/IPopupMenuItem.cs
similarity index 100%
rename from src/keepass2android/EntryActivityClasses/IPopupMenuItem.cs
rename to src/keepass2android-app/EntryActivityClasses/IPopupMenuItem.cs
diff --git a/src/keepass2android/EntryActivityClasses/IStringView.cs b/src/keepass2android-app/EntryActivityClasses/IStringView.cs
similarity index 100%
rename from src/keepass2android/EntryActivityClasses/IStringView.cs
rename to src/keepass2android-app/EntryActivityClasses/IStringView.cs
diff --git a/src/keepass2android/EntryActivityClasses/OpenBinaryPopupItem.cs b/src/keepass2android-app/EntryActivityClasses/OpenBinaryPopupItem.cs
similarity index 100%
rename from src/keepass2android/EntryActivityClasses/OpenBinaryPopupItem.cs
rename to src/keepass2android-app/EntryActivityClasses/OpenBinaryPopupItem.cs
diff --git a/src/keepass2android/EntryActivityClasses/PluginMenuOption.cs b/src/keepass2android-app/EntryActivityClasses/PluginMenuOption.cs
similarity index 100%
rename from src/keepass2android/EntryActivityClasses/PluginMenuOption.cs
rename to src/keepass2android-app/EntryActivityClasses/PluginMenuOption.cs
diff --git a/src/keepass2android/EntryActivityClasses/PluginPopupMenuItem.cs b/src/keepass2android-app/EntryActivityClasses/PluginPopupMenuItem.cs
similarity index 100%
rename from src/keepass2android/EntryActivityClasses/PluginPopupMenuItem.cs
rename to src/keepass2android-app/EntryActivityClasses/PluginPopupMenuItem.cs
diff --git a/src/keepass2android/EntryActivityClasses/StandardStringView.cs b/src/keepass2android-app/EntryActivityClasses/StandardStringView.cs
similarity index 100%
rename from src/keepass2android/EntryActivityClasses/StandardStringView.cs
rename to src/keepass2android-app/EntryActivityClasses/StandardStringView.cs
diff --git a/src/keepass2android/EntryActivityClasses/ToggleVisibilityPopupMenuItem.cs b/src/keepass2android-app/EntryActivityClasses/ToggleVisibilityPopupMenuItem.cs
similarity index 100%
rename from src/keepass2android/EntryActivityClasses/ToggleVisibilityPopupMenuItem.cs
rename to src/keepass2android-app/EntryActivityClasses/ToggleVisibilityPopupMenuItem.cs
diff --git a/src/keepass2android/EntryActivityClasses/ViewImagePopupItem.cs b/src/keepass2android-app/EntryActivityClasses/ViewImagePopupItem.cs
similarity index 100%
rename from src/keepass2android/EntryActivityClasses/ViewImagePopupItem.cs
rename to src/keepass2android-app/EntryActivityClasses/ViewImagePopupItem.cs
diff --git a/src/keepass2android/EntryActivityClasses/WriteBinaryToFilePopupItem.cs b/src/keepass2android-app/EntryActivityClasses/WriteBinaryToFilePopupItem.cs
similarity index 100%
rename from src/keepass2android/EntryActivityClasses/WriteBinaryToFilePopupItem.cs
rename to src/keepass2android-app/EntryActivityClasses/WriteBinaryToFilePopupItem.cs
diff --git a/src/keepass2android/EntryEditActivity.cs b/src/keepass2android-app/EntryEditActivity.cs
similarity index 100%
rename from src/keepass2android/EntryEditActivity.cs
rename to src/keepass2android-app/EntryEditActivity.cs
diff --git a/src/keepass2android/EntryEditActivityState.cs b/src/keepass2android-app/EntryEditActivityState.cs
similarity index 100%
rename from src/keepass2android/EntryEditActivityState.cs
rename to src/keepass2android-app/EntryEditActivityState.cs
diff --git a/src/keepass2android/ExportDatabaseActivity.cs b/src/keepass2android-app/ExportDatabaseActivity.cs
similarity index 100%
rename from src/keepass2android/ExportDatabaseActivity.cs
rename to src/keepass2android-app/ExportDatabaseActivity.cs
diff --git a/src/keepass2android/FileSaveProcessManager.cs b/src/keepass2android-app/FileSaveProcessManager.cs
similarity index 100%
rename from src/keepass2android/FileSaveProcessManager.cs
rename to src/keepass2android-app/FileSaveProcessManager.cs
diff --git a/src/keepass2android/FileSelectHelper.cs b/src/keepass2android-app/FileSelectHelper.cs
similarity index 100%
rename from src/keepass2android/FileSelectHelper.cs
rename to src/keepass2android-app/FileSelectHelper.cs
diff --git a/src/keepass2android/FileStorageSelectionActivity.cs b/src/keepass2android-app/FileStorageSelectionActivity.cs
similarity index 100%
rename from src/keepass2android/FileStorageSelectionActivity.cs
rename to src/keepass2android-app/FileStorageSelectionActivity.cs
diff --git a/src/keepass2android/FingerprintSetupActivity.cs b/src/keepass2android-app/FingerprintSetupActivity.cs
similarity index 100%
rename from src/keepass2android/FingerprintSetupActivity.cs
rename to src/keepass2android-app/FingerprintSetupActivity.cs
diff --git a/src/keepass2android/FingerprintUnlockMode.cs b/src/keepass2android-app/FingerprintUnlockMode.cs
similarity index 100%
rename from src/keepass2android/FingerprintUnlockMode.cs
rename to src/keepass2android-app/FingerprintUnlockMode.cs
diff --git a/src/keepass2android/FixedDrawerLayout.cs b/src/keepass2android-app/FixedDrawerLayout.cs
similarity index 100%
rename from src/keepass2android/FixedDrawerLayout.cs
rename to src/keepass2android-app/FixedDrawerLayout.cs
diff --git a/src/keepass2android/GeneratePasswordActivity.cs b/src/keepass2android-app/GeneratePasswordActivity.cs
similarity index 100%
rename from src/keepass2android/GeneratePasswordActivity.cs
rename to src/keepass2android-app/GeneratePasswordActivity.cs
diff --git a/src/keepass2android/GroupActivity.cs b/src/keepass2android-app/GroupActivity.cs
similarity index 100%
rename from src/keepass2android/GroupActivity.cs
rename to src/keepass2android-app/GroupActivity.cs
diff --git a/src/keepass2android/GroupBaseActivity.cs b/src/keepass2android-app/GroupBaseActivity.cs
similarity index 100%
rename from src/keepass2android/GroupBaseActivity.cs
rename to src/keepass2android-app/GroupBaseActivity.cs
diff --git a/src/keepass2android/GroupEditActivity.cs b/src/keepass2android-app/GroupEditActivity.cs
similarity index 100%
rename from src/keepass2android/GroupEditActivity.cs
rename to src/keepass2android-app/GroupEditActivity.cs
diff --git a/src/keepass2android/ILockCloseActivity.cs b/src/keepass2android-app/ILockCloseActivity.cs
similarity index 100%
rename from src/keepass2android/ILockCloseActivity.cs
rename to src/keepass2android-app/ILockCloseActivity.cs
diff --git a/src/keepass2android/IconPickerActivity.cs b/src/keepass2android-app/IconPickerActivity.cs
similarity index 100%
rename from src/keepass2android/IconPickerActivity.cs
rename to src/keepass2android-app/IconPickerActivity.cs
diff --git a/src/keepass2android/ImageViewActivity.cs b/src/keepass2android-app/ImageViewActivity.cs
similarity index 100%
rename from src/keepass2android/ImageViewActivity.cs
rename to src/keepass2android-app/ImageViewActivity.cs
diff --git a/src/keepass2android/KeeAutoExec.cs b/src/keepass2android-app/KeeAutoExec.cs
similarity index 100%
rename from src/keepass2android/KeeAutoExec.cs
rename to src/keepass2android-app/KeeAutoExec.cs
diff --git a/src/keepass2android/KeeChallenge.cs b/src/keepass2android-app/KeeChallenge.cs
similarity index 100%
rename from src/keepass2android/KeeChallenge.cs
rename to src/keepass2android-app/KeeChallenge.cs
diff --git a/src/keepass2android/KeePass.cs b/src/keepass2android-app/KeePass.cs
similarity index 100%
rename from src/keepass2android/KeePass.cs
rename to src/keepass2android-app/KeePass.cs
diff --git a/src/keepass2android/KpEntryTemplatedEdit.cs b/src/keepass2android-app/KpEntryTemplatedEdit.cs
similarity index 100%
rename from src/keepass2android/KpEntryTemplatedEdit.cs
rename to src/keepass2android-app/KpEntryTemplatedEdit.cs
diff --git a/src/keepass2android/LifecycleAwareActivity.cs b/src/keepass2android-app/LifecycleAwareActivity.cs
similarity index 100%
rename from src/keepass2android/LifecycleAwareActivity.cs
rename to src/keepass2android-app/LifecycleAwareActivity.cs
diff --git a/src/keepass2android/LockCloseActivity.cs b/src/keepass2android-app/LockCloseActivity.cs
similarity index 100%
rename from src/keepass2android/LockCloseActivity.cs
rename to src/keepass2android-app/LockCloseActivity.cs
diff --git a/src/keepass2android/LockCloseActivityBroadcastReceiver.cs b/src/keepass2android-app/LockCloseActivityBroadcastReceiver.cs
similarity index 100%
rename from src/keepass2android/LockCloseActivityBroadcastReceiver.cs
rename to src/keepass2android-app/LockCloseActivityBroadcastReceiver.cs
diff --git a/src/keepass2android/LockCloseListActivity.cs b/src/keepass2android-app/LockCloseListActivity.cs
similarity index 100%
rename from src/keepass2android/LockCloseListActivity.cs
rename to src/keepass2android-app/LockCloseListActivity.cs
diff --git a/src/keepass2android/LockingActivity.cs b/src/keepass2android-app/LockingActivity.cs
similarity index 100%
rename from src/keepass2android/LockingActivity.cs
rename to src/keepass2android-app/LockingActivity.cs
diff --git a/src/keepass2android/LockingClosePreferenceActivity.cs b/src/keepass2android-app/LockingClosePreferenceActivity.cs
similarity index 100%
rename from src/keepass2android/LockingClosePreferenceActivity.cs
rename to src/keepass2android-app/LockingClosePreferenceActivity.cs
diff --git a/src/keepass2android/LockingListActivity.cs b/src/keepass2android-app/LockingListActivity.cs
similarity index 100%
rename from src/keepass2android/LockingListActivity.cs
rename to src/keepass2android-app/LockingListActivity.cs
diff --git a/src/keepass2android/LockingPreferenceActivity.cs b/src/keepass2android-app/LockingPreferenceActivity.cs
similarity index 100%
rename from src/keepass2android/LockingPreferenceActivity.cs
rename to src/keepass2android-app/LockingPreferenceActivity.cs
diff --git a/src/keepass2android/Manifests/AndroidManifest_debug.xml b/src/keepass2android-app/Manifests/AndroidManifest_debug.xml
similarity index 100%
rename from src/keepass2android/Manifests/AndroidManifest_debug.xml
rename to src/keepass2android-app/Manifests/AndroidManifest_debug.xml
diff --git a/src/keepass2android/Manifests/AndroidManifest_light.xml b/src/keepass2android-app/Manifests/AndroidManifest_light.xml
similarity index 100%
rename from src/keepass2android/Manifests/AndroidManifest_light.xml
rename to src/keepass2android-app/Manifests/AndroidManifest_light.xml
diff --git a/src/keepass2android/Manifests/AndroidManifest_net.xml b/src/keepass2android-app/Manifests/AndroidManifest_net.xml
similarity index 100%
rename from src/keepass2android/Manifests/AndroidManifest_net.xml
rename to src/keepass2android-app/Manifests/AndroidManifest_net.xml
diff --git a/src/keepass2android/Manifests/AndroidManifest_nonet.xml b/src/keepass2android-app/Manifests/AndroidManifest_nonet.xml
similarity index 100%
rename from src/keepass2android/Manifests/AndroidManifest_nonet.xml
rename to src/keepass2android-app/Manifests/AndroidManifest_nonet.xml
diff --git a/src/keepass2android/MeasuringLinearLayout.cs b/src/keepass2android-app/MeasuringLinearLayout.cs
similarity index 100%
rename from src/keepass2android/MeasuringLinearLayout.cs
rename to src/keepass2android-app/MeasuringLinearLayout.cs
diff --git a/src/keepass2android/NfcOtpActivity.cs b/src/keepass2android-app/NfcOtpActivity.cs
similarity index 100%
rename from src/keepass2android/NfcOtpActivity.cs
rename to src/keepass2android-app/NfcOtpActivity.cs
diff --git a/src/keepass2android/NoSecureDisplayActivity.cs b/src/keepass2android-app/NoSecureDisplayActivity.cs
similarity index 100%
rename from src/keepass2android/NoSecureDisplayActivity.cs
rename to src/keepass2android-app/NoSecureDisplayActivity.cs
diff --git a/src/keepass2android/PasswordActivity.cs b/src/keepass2android-app/PasswordActivity.cs
similarity index 100%
rename from src/keepass2android/PasswordActivity.cs
rename to src/keepass2android-app/PasswordActivity.cs
diff --git a/src/keepass2android/PasswordFont.cs b/src/keepass2android-app/PasswordFont.cs
similarity index 100%
rename from src/keepass2android/PasswordFont.cs
rename to src/keepass2android-app/PasswordFont.cs
diff --git a/src/keepass2android/PwGroupListAdapter.cs b/src/keepass2android-app/PwGroupListAdapter.cs
similarity index 100%
rename from src/keepass2android/PwGroupListAdapter.cs
rename to src/keepass2android-app/PwGroupListAdapter.cs
diff --git a/src/keepass2android/QueryCredentialsActivity.cs b/src/keepass2android-app/QueryCredentialsActivity.cs
similarity index 100%
rename from src/keepass2android/QueryCredentialsActivity.cs
rename to src/keepass2android-app/QueryCredentialsActivity.cs
diff --git a/src/keepass2android/QuickUnlock.cs b/src/keepass2android-app/QuickUnlock.cs
similarity index 100%
rename from src/keepass2android/QuickUnlock.cs
rename to src/keepass2android-app/QuickUnlock.cs
diff --git a/src/keepass2android/Resources/anim/anim_enter.xml b/src/keepass2android-app/Resources/anim/anim_enter.xml
similarity index 100%
rename from src/keepass2android/Resources/anim/anim_enter.xml
rename to src/keepass2android-app/Resources/anim/anim_enter.xml
diff --git a/src/keepass2android/Resources/anim/anim_enter_back.xml b/src/keepass2android-app/Resources/anim/anim_enter_back.xml
similarity index 100%
rename from src/keepass2android/Resources/anim/anim_enter_back.xml
rename to src/keepass2android-app/Resources/anim/anim_enter_back.xml
diff --git a/src/keepass2android/Resources/anim/anim_leave.xml b/src/keepass2android-app/Resources/anim/anim_leave.xml
similarity index 100%
rename from src/keepass2android/Resources/anim/anim_leave.xml
rename to src/keepass2android-app/Resources/anim/anim_leave.xml
diff --git a/src/keepass2android/Resources/anim/anim_leave_back.xml b/src/keepass2android-app/Resources/anim/anim_leave_back.xml
similarity index 100%
rename from src/keepass2android/Resources/anim/anim_leave_back.xml
rename to src/keepass2android-app/Resources/anim/anim_leave_back.xml
diff --git a/src/keepass2android/Resources/drawable-hdpi-v4/ic_launcher.png b/src/keepass2android-app/Resources/drawable-hdpi-v4/ic_launcher.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-hdpi-v4/ic_launcher.png
rename to src/keepass2android-app/Resources/drawable-hdpi-v4/ic_launcher.png
diff --git a/src/keepass2android/Resources/drawable-hdpi-v4/ic_launcher_offline.png b/src/keepass2android-app/Resources/drawable-hdpi-v4/ic_launcher_offline.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-hdpi-v4/ic_launcher_offline.png
rename to src/keepass2android-app/Resources/drawable-hdpi-v4/ic_launcher_offline.png
diff --git a/src/keepass2android/Resources/drawable-mdpi-v4/ic_launcher.png b/src/keepass2android-app/Resources/drawable-mdpi-v4/ic_launcher.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi-v4/ic_launcher.png
rename to src/keepass2android-app/Resources/drawable-mdpi-v4/ic_launcher.png
diff --git a/src/keepass2android/Resources/drawable-mdpi-v4/ic_launcher_offline.png b/src/keepass2android-app/Resources/drawable-mdpi-v4/ic_launcher_offline.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi-v4/ic_launcher_offline.png
rename to src/keepass2android-app/Resources/drawable-mdpi-v4/ic_launcher_offline.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/donate_cake.png b/src/keepass2android-app/Resources/drawable-mdpi/donate_cake.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/donate_cake.png
rename to src/keepass2android-app/Resources/drawable-mdpi/donate_cake.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic00.png b/src/keepass2android-app/Resources/drawable-mdpi/ic00.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic00.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic00.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic01.png b/src/keepass2android-app/Resources/drawable-mdpi/ic01.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic01.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic01.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic02.png b/src/keepass2android-app/Resources/drawable-mdpi/ic02.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic02.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic02.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic03.png b/src/keepass2android-app/Resources/drawable-mdpi/ic03.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic03.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic03.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic04.png b/src/keepass2android-app/Resources/drawable-mdpi/ic04.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic04.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic04.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic05.png b/src/keepass2android-app/Resources/drawable-mdpi/ic05.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic05.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic05.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic06.png b/src/keepass2android-app/Resources/drawable-mdpi/ic06.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic06.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic06.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic07.png b/src/keepass2android-app/Resources/drawable-mdpi/ic07.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic07.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic07.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic08.png b/src/keepass2android-app/Resources/drawable-mdpi/ic08.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic08.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic08.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic09.png b/src/keepass2android-app/Resources/drawable-mdpi/ic09.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic09.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic09.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic10.png b/src/keepass2android-app/Resources/drawable-mdpi/ic10.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic10.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic10.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic11.png b/src/keepass2android-app/Resources/drawable-mdpi/ic11.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic11.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic11.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic12.png b/src/keepass2android-app/Resources/drawable-mdpi/ic12.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic12.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic12.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic13.png b/src/keepass2android-app/Resources/drawable-mdpi/ic13.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic13.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic13.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic14.png b/src/keepass2android-app/Resources/drawable-mdpi/ic14.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic14.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic14.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic15.png b/src/keepass2android-app/Resources/drawable-mdpi/ic15.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic15.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic15.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic16.png b/src/keepass2android-app/Resources/drawable-mdpi/ic16.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic16.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic16.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic17.png b/src/keepass2android-app/Resources/drawable-mdpi/ic17.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic17.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic17.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic18.png b/src/keepass2android-app/Resources/drawable-mdpi/ic18.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic18.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic18.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic19.png b/src/keepass2android-app/Resources/drawable-mdpi/ic19.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic19.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic19.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic20.png b/src/keepass2android-app/Resources/drawable-mdpi/ic20.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic20.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic20.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic21.png b/src/keepass2android-app/Resources/drawable-mdpi/ic21.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic21.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic21.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic22.png b/src/keepass2android-app/Resources/drawable-mdpi/ic22.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic22.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic22.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic23.png b/src/keepass2android-app/Resources/drawable-mdpi/ic23.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic23.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic23.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic24.png b/src/keepass2android-app/Resources/drawable-mdpi/ic24.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic24.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic24.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic25.png b/src/keepass2android-app/Resources/drawable-mdpi/ic25.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic25.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic25.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic26.png b/src/keepass2android-app/Resources/drawable-mdpi/ic26.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic26.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic26.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic27.png b/src/keepass2android-app/Resources/drawable-mdpi/ic27.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic27.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic27.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic28.png b/src/keepass2android-app/Resources/drawable-mdpi/ic28.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic28.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic28.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic29.png b/src/keepass2android-app/Resources/drawable-mdpi/ic29.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic29.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic29.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic30.png b/src/keepass2android-app/Resources/drawable-mdpi/ic30.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic30.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic30.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic31.png b/src/keepass2android-app/Resources/drawable-mdpi/ic31.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic31.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic31.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic32.png b/src/keepass2android-app/Resources/drawable-mdpi/ic32.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic32.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic32.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic33.png b/src/keepass2android-app/Resources/drawable-mdpi/ic33.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic33.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic33.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic34.png b/src/keepass2android-app/Resources/drawable-mdpi/ic34.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic34.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic34.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic35.png b/src/keepass2android-app/Resources/drawable-mdpi/ic35.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic35.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic35.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic36.png b/src/keepass2android-app/Resources/drawable-mdpi/ic36.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic36.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic36.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic37.png b/src/keepass2android-app/Resources/drawable-mdpi/ic37.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic37.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic37.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic38.png b/src/keepass2android-app/Resources/drawable-mdpi/ic38.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic38.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic38.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic39.png b/src/keepass2android-app/Resources/drawable-mdpi/ic39.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic39.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic39.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic40.png b/src/keepass2android-app/Resources/drawable-mdpi/ic40.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic40.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic40.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic41.png b/src/keepass2android-app/Resources/drawable-mdpi/ic41.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic41.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic41.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic42.png b/src/keepass2android-app/Resources/drawable-mdpi/ic42.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic42.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic42.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic43.png b/src/keepass2android-app/Resources/drawable-mdpi/ic43.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic43.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic43.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic44.png b/src/keepass2android-app/Resources/drawable-mdpi/ic44.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic44.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic44.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic45.png b/src/keepass2android-app/Resources/drawable-mdpi/ic45.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic45.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic45.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic46.png b/src/keepass2android-app/Resources/drawable-mdpi/ic46.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic46.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic46.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic47.png b/src/keepass2android-app/Resources/drawable-mdpi/ic47.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic47.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic47.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic48.png b/src/keepass2android-app/Resources/drawable-mdpi/ic48.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic48.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic48.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic49.png b/src/keepass2android-app/Resources/drawable-mdpi/ic49.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic49.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic49.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic50.png b/src/keepass2android-app/Resources/drawable-mdpi/ic50.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic50.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic50.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic51.png b/src/keepass2android-app/Resources/drawable-mdpi/ic51.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic51.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic51.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic52.png b/src/keepass2android-app/Resources/drawable-mdpi/ic52.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic52.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic52.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic53.png b/src/keepass2android-app/Resources/drawable-mdpi/ic53.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic53.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic53.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic54.png b/src/keepass2android-app/Resources/drawable-mdpi/ic54.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic54.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic54.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic55.png b/src/keepass2android-app/Resources/drawable-mdpi/ic55.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic55.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic55.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic56.png b/src/keepass2android-app/Resources/drawable-mdpi/ic56.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic56.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic56.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic57.png b/src/keepass2android-app/Resources/drawable-mdpi/ic57.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic57.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic57.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic58.png b/src/keepass2android-app/Resources/drawable-mdpi/ic58.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic58.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic58.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic59.png b/src/keepass2android-app/Resources/drawable-mdpi/ic59.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic59.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic59.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic60.png b/src/keepass2android-app/Resources/drawable-mdpi/ic60.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic60.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic60.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic61.png b/src/keepass2android-app/Resources/drawable-mdpi/ic61.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic61.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic61.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic62.png b/src/keepass2android-app/Resources/drawable-mdpi/ic62.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic62.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic62.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic63.png b/src/keepass2android-app/Resources/drawable-mdpi/ic63.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic63.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic63.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic64.png b/src/keepass2android-app/Resources/drawable-mdpi/ic64.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic64.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic64.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic65.png b/src/keepass2android-app/Resources/drawable-mdpi/ic65.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic65.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic65.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic66.png b/src/keepass2android-app/Resources/drawable-mdpi/ic66.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic66.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic66.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic67.png b/src/keepass2android-app/Resources/drawable-mdpi/ic67.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic67.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic67.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic68.png b/src/keepass2android-app/Resources/drawable-mdpi/ic68.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic68.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic68.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic_menu_donatebeer.png b/src/keepass2android-app/Resources/drawable-mdpi/ic_menu_donatebeer.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic_menu_donatebeer.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic_menu_donatebeer.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic_notify.png b/src/keepass2android-app/Resources/drawable-mdpi/ic_notify.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic_notify.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic_notify.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic_notify_keyboard.png b/src/keepass2android-app/Resources/drawable-mdpi/ic_notify_keyboard.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic_notify_keyboard.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic_notify_keyboard.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic_notify_loaded.png b/src/keepass2android-app/Resources/drawable-mdpi/ic_notify_loaded.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic_notify_loaded.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic_notify_loaded.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic_notify_locked.png b/src/keepass2android-app/Resources/drawable-mdpi/ic_notify_locked.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic_notify_locked.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic_notify_locked.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic_notify_offline.png b/src/keepass2android-app/Resources/drawable-mdpi/ic_notify_offline.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic_notify_offline.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic_notify_offline.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic_storage_androidget.png b/src/keepass2android-app/Resources/drawable-mdpi/ic_storage_androidget.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic_storage_androidget.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic_storage_androidget.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic_storage_androidsend.png b/src/keepass2android-app/Resources/drawable-mdpi/ic_storage_androidsend.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic_storage_androidsend.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic_storage_androidsend.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic_storage_content.png b/src/keepass2android-app/Resources/drawable-mdpi/ic_storage_content.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic_storage_content.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic_storage_content.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic_storage_dropbox.png b/src/keepass2android-app/Resources/drawable-mdpi/ic_storage_dropbox.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic_storage_dropbox.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic_storage_dropbox.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic_storage_dropboxKP2A.png b/src/keepass2android-app/Resources/drawable-mdpi/ic_storage_dropboxKP2A.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic_storage_dropboxKP2A.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic_storage_dropboxKP2A.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic_storage_file.png b/src/keepass2android-app/Resources/drawable-mdpi/ic_storage_file.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic_storage_file.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic_storage_file.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic_storage_ftp.png b/src/keepass2android-app/Resources/drawable-mdpi/ic_storage_ftp.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic_storage_ftp.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic_storage_ftp.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic_storage_ftps.png b/src/keepass2android-app/Resources/drawable-mdpi/ic_storage_ftps.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic_storage_ftps.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic_storage_ftps.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic_storage_gdrive.png b/src/keepass2android-app/Resources/drawable-mdpi/ic_storage_gdrive.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic_storage_gdrive.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic_storage_gdrive.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic_storage_gdriveKP2A.png b/src/keepass2android-app/Resources/drawable-mdpi/ic_storage_gdriveKP2A.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic_storage_gdriveKP2A.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic_storage_gdriveKP2A.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic_storage_http.png b/src/keepass2android-app/Resources/drawable-mdpi/ic_storage_http.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic_storage_http.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic_storage_http.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic_storage_https.png b/src/keepass2android-app/Resources/drawable-mdpi/ic_storage_https.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic_storage_https.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic_storage_https.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic_storage_kp2a b/src/keepass2android-app/Resources/drawable-mdpi/ic_storage_kp2a
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic_storage_kp2a
rename to src/keepass2android-app/Resources/drawable-mdpi/ic_storage_kp2a
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic_storage_mega.png b/src/keepass2android-app/Resources/drawable-mdpi/ic_storage_mega.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic_storage_mega.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic_storage_mega.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic_storage_nextcloud.png b/src/keepass2android-app/Resources/drawable-mdpi/ic_storage_nextcloud.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic_storage_nextcloud.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic_storage_nextcloud.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic_storage_onedrive.png b/src/keepass2android-app/Resources/drawable-mdpi/ic_storage_onedrive.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic_storage_onedrive.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic_storage_onedrive.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic_storage_onedrive2.png b/src/keepass2android-app/Resources/drawable-mdpi/ic_storage_onedrive2.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic_storage_onedrive2.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic_storage_onedrive2.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic_storage_owncloud.png b/src/keepass2android-app/Resources/drawable-mdpi/ic_storage_owncloud.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic_storage_owncloud.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic_storage_owncloud.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic_storage_pcloud.png b/src/keepass2android-app/Resources/drawable-mdpi/ic_storage_pcloud.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic_storage_pcloud.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic_storage_pcloud.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic_storage_pcloudall.png b/src/keepass2android-app/Resources/drawable-mdpi/ic_storage_pcloudall.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic_storage_pcloudall.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic_storage_pcloudall.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic_storage_sftp.png b/src/keepass2android-app/Resources/drawable-mdpi/ic_storage_sftp.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/ic_storage_sftp.png
rename to src/keepass2android-app/Resources/drawable-mdpi/ic_storage_sftp.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf00.png b/src/keepass2android-app/Resources/drawable-mdpi/icf00.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf00.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf00.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf01.png b/src/keepass2android-app/Resources/drawable-mdpi/icf01.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf01.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf01.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf02.png b/src/keepass2android-app/Resources/drawable-mdpi/icf02.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf02.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf02.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf03.png b/src/keepass2android-app/Resources/drawable-mdpi/icf03.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf03.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf03.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf04.png b/src/keepass2android-app/Resources/drawable-mdpi/icf04.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf04.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf04.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf05.png b/src/keepass2android-app/Resources/drawable-mdpi/icf05.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf05.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf05.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf06.png b/src/keepass2android-app/Resources/drawable-mdpi/icf06.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf06.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf06.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf07.png b/src/keepass2android-app/Resources/drawable-mdpi/icf07.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf07.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf07.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf08.png b/src/keepass2android-app/Resources/drawable-mdpi/icf08.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf08.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf08.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf09.png b/src/keepass2android-app/Resources/drawable-mdpi/icf09.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf09.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf09.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf10.png b/src/keepass2android-app/Resources/drawable-mdpi/icf10.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf10.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf10.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf11.png b/src/keepass2android-app/Resources/drawable-mdpi/icf11.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf11.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf11.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf12.png b/src/keepass2android-app/Resources/drawable-mdpi/icf12.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf12.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf12.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf13.png b/src/keepass2android-app/Resources/drawable-mdpi/icf13.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf13.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf13.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf14.png b/src/keepass2android-app/Resources/drawable-mdpi/icf14.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf14.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf14.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf15.png b/src/keepass2android-app/Resources/drawable-mdpi/icf15.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf15.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf15.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf16.png b/src/keepass2android-app/Resources/drawable-mdpi/icf16.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf16.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf16.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf17.png b/src/keepass2android-app/Resources/drawable-mdpi/icf17.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf17.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf17.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf18.png b/src/keepass2android-app/Resources/drawable-mdpi/icf18.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf18.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf18.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf19.png b/src/keepass2android-app/Resources/drawable-mdpi/icf19.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf19.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf19.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf20.png b/src/keepass2android-app/Resources/drawable-mdpi/icf20.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf20.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf20.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf21.png b/src/keepass2android-app/Resources/drawable-mdpi/icf21.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf21.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf21.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf22.png b/src/keepass2android-app/Resources/drawable-mdpi/icf22.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf22.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf22.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf23.png b/src/keepass2android-app/Resources/drawable-mdpi/icf23.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf23.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf23.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf24.png b/src/keepass2android-app/Resources/drawable-mdpi/icf24.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf24.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf24.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf25.png b/src/keepass2android-app/Resources/drawable-mdpi/icf25.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf25.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf25.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf26.png b/src/keepass2android-app/Resources/drawable-mdpi/icf26.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf26.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf26.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf27.png b/src/keepass2android-app/Resources/drawable-mdpi/icf27.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf27.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf27.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf28.png b/src/keepass2android-app/Resources/drawable-mdpi/icf28.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf28.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf28.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf29.png b/src/keepass2android-app/Resources/drawable-mdpi/icf29.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf29.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf29.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf30.png b/src/keepass2android-app/Resources/drawable-mdpi/icf30.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf30.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf30.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf31.png b/src/keepass2android-app/Resources/drawable-mdpi/icf31.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf31.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf31.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf32.png b/src/keepass2android-app/Resources/drawable-mdpi/icf32.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf32.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf32.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf33.png b/src/keepass2android-app/Resources/drawable-mdpi/icf33.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf33.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf33.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf34.png b/src/keepass2android-app/Resources/drawable-mdpi/icf34.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf34.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf34.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf35.png b/src/keepass2android-app/Resources/drawable-mdpi/icf35.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf35.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf35.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf36.png b/src/keepass2android-app/Resources/drawable-mdpi/icf36.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf36.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf36.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf37.png b/src/keepass2android-app/Resources/drawable-mdpi/icf37.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf37.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf37.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf38.png b/src/keepass2android-app/Resources/drawable-mdpi/icf38.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf38.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf38.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf39.png b/src/keepass2android-app/Resources/drawable-mdpi/icf39.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf39.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf39.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf40.png b/src/keepass2android-app/Resources/drawable-mdpi/icf40.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf40.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf40.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf41.png b/src/keepass2android-app/Resources/drawable-mdpi/icf41.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf41.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf41.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf42.png b/src/keepass2android-app/Resources/drawable-mdpi/icf42.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf42.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf42.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf43.png b/src/keepass2android-app/Resources/drawable-mdpi/icf43.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf43.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf43.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf44.png b/src/keepass2android-app/Resources/drawable-mdpi/icf44.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf44.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf44.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf45.png b/src/keepass2android-app/Resources/drawable-mdpi/icf45.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf45.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf45.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf46.png b/src/keepass2android-app/Resources/drawable-mdpi/icf46.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf46.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf46.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf47.png b/src/keepass2android-app/Resources/drawable-mdpi/icf47.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf47.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf47.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf49.png b/src/keepass2android-app/Resources/drawable-mdpi/icf49.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf49.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf49.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf50.png b/src/keepass2android-app/Resources/drawable-mdpi/icf50.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf50.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf50.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf51.png b/src/keepass2android-app/Resources/drawable-mdpi/icf51.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf51.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf51.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf52.png b/src/keepass2android-app/Resources/drawable-mdpi/icf52.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf52.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf52.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf53.png b/src/keepass2android-app/Resources/drawable-mdpi/icf53.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf53.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf53.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf54.png b/src/keepass2android-app/Resources/drawable-mdpi/icf54.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf54.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf54.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf55.png b/src/keepass2android-app/Resources/drawable-mdpi/icf55.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf55.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf55.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf56.png b/src/keepass2android-app/Resources/drawable-mdpi/icf56.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf56.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf56.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf57.png b/src/keepass2android-app/Resources/drawable-mdpi/icf57.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf57.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf57.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf58.png b/src/keepass2android-app/Resources/drawable-mdpi/icf58.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf58.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf58.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf59.png b/src/keepass2android-app/Resources/drawable-mdpi/icf59.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf59.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf59.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf60.png b/src/keepass2android-app/Resources/drawable-mdpi/icf60.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf60.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf60.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf61.png b/src/keepass2android-app/Resources/drawable-mdpi/icf61.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf61.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf61.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf62.png b/src/keepass2android-app/Resources/drawable-mdpi/icf62.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf62.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf62.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf63.png b/src/keepass2android-app/Resources/drawable-mdpi/icf63.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf63.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf63.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf64.png b/src/keepass2android-app/Resources/drawable-mdpi/icf64.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf64.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf64.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf65.png b/src/keepass2android-app/Resources/drawable-mdpi/icf65.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf65.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf65.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf66.png b/src/keepass2android-app/Resources/drawable-mdpi/icf66.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf66.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf66.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf67.png b/src/keepass2android-app/Resources/drawable-mdpi/icf67.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf67.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf67.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/icf68.png b/src/keepass2android-app/Resources/drawable-mdpi/icf68.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/icf68.png
rename to src/keepass2android-app/Resources/drawable-mdpi/icf68.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/navheader_bg.png b/src/keepass2android-app/Resources/drawable-mdpi/navheader_bg.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/navheader_bg.png
rename to src/keepass2android-app/Resources/drawable-mdpi/navheader_bg.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/oktoberfest.png b/src/keepass2android-app/Resources/drawable-mdpi/oktoberfest.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/oktoberfest.png
rename to src/keepass2android-app/Resources/drawable-mdpi/oktoberfest.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/splashlogo.png b/src/keepass2android-app/Resources/drawable-mdpi/splashlogo.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/splashlogo.png
rename to src/keepass2android-app/Resources/drawable-mdpi/splashlogo.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/splashlogo_offline.png b/src/keepass2android-app/Resources/drawable-mdpi/splashlogo_offline.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/splashlogo_offline.png
rename to src/keepass2android-app/Resources/drawable-mdpi/splashlogo_offline.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/toolbar_bg.png b/src/keepass2android-app/Resources/drawable-mdpi/toolbar_bg.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/toolbar_bg.png
rename to src/keepass2android-app/Resources/drawable-mdpi/toolbar_bg.png
diff --git a/src/keepass2android/Resources/drawable-mdpi/toolbar_bg_quickunlock.png b/src/keepass2android-app/Resources/drawable-mdpi/toolbar_bg_quickunlock.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/toolbar_bg_quickunlock.png
rename to src/keepass2android-app/Resources/drawable-mdpi/toolbar_bg_quickunlock.png
diff --git a/src/keepass2android/Resources/drawable-night-mdpi/splashlogo.png b/src/keepass2android-app/Resources/drawable-night-mdpi/splashlogo.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-night-mdpi/splashlogo.png
rename to src/keepass2android-app/Resources/drawable-night-mdpi/splashlogo.png
diff --git a/src/keepass2android/Resources/drawable-night-xhdpi/splashlogo.png b/src/keepass2android-app/Resources/drawable-night-xhdpi/splashlogo.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-night-xhdpi/splashlogo.png
rename to src/keepass2android-app/Resources/drawable-night-xhdpi/splashlogo.png
diff --git a/src/keepass2android/Resources/drawable-night-xhdpi/toolbar_bg.png b/src/keepass2android-app/Resources/drawable-night-xhdpi/toolbar_bg.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-night-xhdpi/toolbar_bg.png
rename to src/keepass2android-app/Resources/drawable-night-xhdpi/toolbar_bg.png
diff --git a/src/keepass2android/Resources/drawable-night-xhdpi/toolbar_bg_quickunlock.png b/src/keepass2android-app/Resources/drawable-night-xhdpi/toolbar_bg_quickunlock.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-night-xhdpi/toolbar_bg_quickunlock.png
rename to src/keepass2android-app/Resources/drawable-night-xhdpi/toolbar_bg_quickunlock.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi-v4/ic_launcher.png b/src/keepass2android-app/Resources/drawable-xhdpi-v4/ic_launcher.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi-v4/ic_launcher.png
rename to src/keepass2android-app/Resources/drawable-xhdpi-v4/ic_launcher.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi-v4/ic_launcher_offline.png b/src/keepass2android-app/Resources/drawable-xhdpi-v4/ic_launcher_offline.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi-v4/ic_launcher_offline.png
rename to src/keepass2android-app/Resources/drawable-xhdpi-v4/ic_launcher_offline.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi-v4/ic_launcher_online.png b/src/keepass2android-app/Resources/drawable-xhdpi-v4/ic_launcher_online.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi-v4/ic_launcher_online.png
rename to src/keepass2android-app/Resources/drawable-xhdpi-v4/ic_launcher_online.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic00.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic00.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic00.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic00.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic01.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic01.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic01.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic01.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic02.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic02.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic02.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic02.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic03.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic03.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic03.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic03.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic04.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic04.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic04.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic04.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic05.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic05.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic05.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic05.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic06.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic06.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic06.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic06.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic07.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic07.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic07.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic07.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic08.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic08.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic08.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic08.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic09.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic09.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic09.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic09.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic10.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic10.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic10.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic10.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic11.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic11.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic11.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic11.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic12.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic12.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic12.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic12.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic13.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic13.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic13.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic13.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic14.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic14.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic14.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic14.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic15.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic15.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic15.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic15.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic16.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic16.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic16.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic16.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic17.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic17.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic17.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic17.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic18.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic18.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic18.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic18.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic19.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic19.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic19.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic19.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic20.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic20.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic20.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic20.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic21.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic21.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic21.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic21.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic22.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic22.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic22.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic22.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic23.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic23.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic23.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic23.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic24.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic24.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic24.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic24.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic25.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic25.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic25.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic25.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic26.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic26.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic26.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic26.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic27.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic27.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic27.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic27.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic28.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic28.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic28.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic28.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic29.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic29.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic29.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic29.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic30.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic30.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic30.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic30.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic31.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic31.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic31.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic31.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic32.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic32.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic32.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic32.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic33.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic33.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic33.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic33.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic34.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic34.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic34.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic34.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic35.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic35.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic35.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic35.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic36.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic36.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic36.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic36.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic37.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic37.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic37.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic37.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic38.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic38.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic38.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic38.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic39.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic39.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic39.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic39.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic40.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic40.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic40.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic40.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic41.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic41.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic41.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic41.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic42.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic42.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic42.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic42.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic43.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic43.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic43.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic43.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic44.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic44.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic44.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic44.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic45.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic45.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic45.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic45.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic46.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic46.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic46.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic46.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic47.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic47.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic47.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic47.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic48.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic48.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic48.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic48.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic49.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic49.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic49.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic49.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic50.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic50.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic50.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic50.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic51.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic51.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic51.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic51.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic52.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic52.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic52.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic52.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic53.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic53.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic53.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic53.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic54.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic54.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic54.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic54.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic55.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic55.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic55.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic55.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic56.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic56.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic56.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic56.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic57.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic57.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic57.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic57.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic58.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic58.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic58.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic58.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic59.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic59.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic59.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic59.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic60.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic60.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic60.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic60.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic61.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic61.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic61.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic61.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic62.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic62.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic62.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic62.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic63.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic63.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic63.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic63.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic64.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic64.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic64.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic64.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic65.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic65.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic65.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic65.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic66.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic66.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic66.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic66.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic67.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic67.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic67.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic67.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic68.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic68.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic68.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic68.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_launcher_gray.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic_launcher_gray.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic_launcher_gray.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic_launcher_gray.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_notify.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic_notify.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic_notify.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic_notify.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_notify_keyboard.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic_notify_keyboard.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic_notify_keyboard.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic_notify_keyboard.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_storage_androidget.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_androidget.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic_storage_androidget.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_androidget.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_storage_androidsend.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_androidsend.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic_storage_androidsend.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_androidsend.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_storage_content.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_content.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic_storage_content.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_content.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_storage_dropbox.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_dropbox.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic_storage_dropbox.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_dropbox.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_storage_dropboxKP2A.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_dropboxKP2A.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic_storage_dropboxKP2A.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_dropboxKP2A.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_storage_file.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_file.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic_storage_file.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_file.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_storage_ftp.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_ftp.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic_storage_ftp.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_ftp.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_storage_ftps.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_ftps.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic_storage_ftps.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_ftps.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_storage_gdrive.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_gdrive.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic_storage_gdrive.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_gdrive.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_storage_gdriveKP2A.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_gdriveKP2A.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic_storage_gdriveKP2A.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_gdriveKP2A.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_storage_http.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_http.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic_storage_http.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_http.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_storage_https.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_https.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic_storage_https.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_https.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_storage_kp2a.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_kp2a.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic_storage_kp2a.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_kp2a.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_storage_mega.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_mega.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic_storage_mega.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_mega.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_storage_nextcloud.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_nextcloud.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic_storage_nextcloud.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_nextcloud.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_storage_onedrive.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_onedrive.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic_storage_onedrive.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_onedrive.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_storage_onedrive2.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_onedrive2.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic_storage_onedrive2.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_onedrive2.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_storage_owncloud.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_owncloud.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic_storage_owncloud.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_owncloud.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_storage_pcloud.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_pcloud.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic_storage_pcloud.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_pcloud.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_storage_pcloudall.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_pcloudall.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic_storage_pcloudall.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_pcloudall.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_storage_sftp.png b/src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_sftp.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/ic_storage_sftp.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/ic_storage_sftp.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf00.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf00.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf00.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf00.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf01.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf01.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf01.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf01.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf02.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf02.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf02.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf02.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf03.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf03.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf03.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf03.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf04.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf04.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf04.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf04.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf05.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf05.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf05.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf05.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf06.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf06.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf06.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf06.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf07.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf07.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf07.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf07.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf08.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf08.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf08.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf08.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf09.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf09.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf09.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf09.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf10.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf10.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf10.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf10.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf11.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf11.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf11.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf11.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf12.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf12.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf12.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf12.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf13.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf13.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf13.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf13.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf14.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf14.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf14.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf14.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf15.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf15.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf15.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf15.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf16.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf16.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf16.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf16.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf17.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf17.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf17.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf17.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf18.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf18.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf18.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf18.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf19.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf19.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf19.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf19.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf20.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf20.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf20.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf20.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf21.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf21.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf21.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf21.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf22.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf22.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf22.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf22.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf23.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf23.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf23.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf23.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf24.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf24.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf24.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf24.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf25.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf25.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf25.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf25.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf26.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf26.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf26.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf26.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf27.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf27.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf27.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf27.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf28.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf28.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf28.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf28.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf29.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf29.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf29.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf29.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf30.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf30.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf30.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf30.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf31.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf31.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf31.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf31.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf32.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf32.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf32.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf32.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf33.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf33.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf33.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf33.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf34.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf34.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf34.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf34.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf35.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf35.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf35.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf35.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf36.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf36.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf36.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf36.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf37.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf37.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf37.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf37.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf38.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf38.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf38.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf38.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf39.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf39.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf39.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf39.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf40.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf40.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf40.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf40.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf41.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf41.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf41.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf41.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf42.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf42.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf42.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf42.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf43.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf43.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf43.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf43.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf44.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf44.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf44.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf44.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf45.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf45.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf45.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf45.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf46.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf46.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf46.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf46.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf47.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf47.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf47.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf47.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf48.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf48.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf48.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf48.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf49.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf49.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf49.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf49.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf50.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf50.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf50.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf50.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf51.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf51.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf51.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf51.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf52.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf52.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf52.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf52.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf53.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf53.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf53.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf53.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf54.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf54.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf54.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf54.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf55.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf55.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf55.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf55.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf56.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf56.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf56.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf56.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf57.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf57.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf57.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf57.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf58.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf58.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf58.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf58.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf59.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf59.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf59.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf59.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf60.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf60.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf60.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf60.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf61.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf61.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf61.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf61.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf62.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf62.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf62.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf62.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf63.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf63.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf63.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf63.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf64.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf64.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf64.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf64.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf65.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf65.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf65.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf65.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf66.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf66.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf66.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf66.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf67.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf67.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf67.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf67.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/icf68.png b/src/keepass2android-app/Resources/drawable-xhdpi/icf68.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/icf68.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/icf68.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/navheader_bg.png b/src/keepass2android-app/Resources/drawable-xhdpi/navheader_bg.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/navheader_bg.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/navheader_bg.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/oktoberfest.png b/src/keepass2android-app/Resources/drawable-xhdpi/oktoberfest.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/oktoberfest.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/oktoberfest.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/splashlogo.png b/src/keepass2android-app/Resources/drawable-xhdpi/splashlogo.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/splashlogo.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/splashlogo.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/splashlogo_offline.png b/src/keepass2android-app/Resources/drawable-xhdpi/splashlogo_offline.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/splashlogo_offline.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/splashlogo_offline.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/toolbar_bg.png b/src/keepass2android-app/Resources/drawable-xhdpi/toolbar_bg.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/toolbar_bg.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/toolbar_bg.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi/toolbar_bg_quickunlock.png b/src/keepass2android-app/Resources/drawable-xhdpi/toolbar_bg_quickunlock.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/toolbar_bg_quickunlock.png
rename to src/keepass2android-app/Resources/drawable-xhdpi/toolbar_bg_quickunlock.png
diff --git a/src/keepass2android/Resources/drawable/add_key.xml b/src/keepass2android-app/Resources/drawable/add_key.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/add_key.xml
rename to src/keepass2android-app/Resources/drawable/add_key.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_access_time_24.xml b/src/keepass2android-app/Resources/drawable/baseline_access_time_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_access_time_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_access_time_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_account_circle_24.xml b/src/keepass2android-app/Resources/drawable/baseline_account_circle_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_account_circle_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_account_circle_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_add_24.xml b/src/keepass2android-app/Resources/drawable/baseline_add_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_add_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_add_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_add_circle_outline_24.xml b/src/keepass2android-app/Resources/drawable/baseline_add_circle_outline_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_add_circle_outline_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_add_circle_outline_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_arrow_back_24.xml b/src/keepass2android-app/Resources/drawable/baseline_arrow_back_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_arrow_back_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_arrow_back_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_assignment_add_24.xml b/src/keepass2android-app/Resources/drawable/baseline_assignment_add_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_assignment_add_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_assignment_add_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_attachment_24.xml b/src/keepass2android-app/Resources/drawable/baseline_attachment_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_attachment_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_attachment_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_camera_alt_24.xml b/src/keepass2android-app/Resources/drawable/baseline_camera_alt_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_camera_alt_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_camera_alt_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_check_24.xml b/src/keepass2android-app/Resources/drawable/baseline_check_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_check_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_check_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_close_24.xml b/src/keepass2android-app/Resources/drawable/baseline_close_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_close_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_close_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_comment_24.xml b/src/keepass2android-app/Resources/drawable/baseline_comment_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_comment_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_comment_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_content_copy_24.xml b/src/keepass2android-app/Resources/drawable/baseline_content_copy_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_content_copy_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_content_copy_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_content_cut_24.xml b/src/keepass2android-app/Resources/drawable/baseline_content_cut_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_content_cut_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_content_cut_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_create_new_folder_24.xml b/src/keepass2android-app/Resources/drawable/baseline_create_new_folder_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_create_new_folder_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_create_new_folder_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_date_range_24.xml b/src/keepass2android-app/Resources/drawable/baseline_date_range_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_date_range_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_date_range_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_delete_24.xml b/src/keepass2android-app/Resources/drawable/baseline_delete_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_delete_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_delete_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_edit_24.xml b/src/keepass2android-app/Resources/drawable/baseline_edit_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_edit_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_edit_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_edit_calendar_24.xml b/src/keepass2android-app/Resources/drawable/baseline_edit_calendar_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_edit_calendar_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_edit_calendar_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_explicit_24.xml b/src/keepass2android-app/Resources/drawable/baseline_explicit_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_explicit_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_explicit_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_favorite_24.xml b/src/keepass2android-app/Resources/drawable/baseline_favorite_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_favorite_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_favorite_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_file_open_24.xml b/src/keepass2android-app/Resources/drawable/baseline_file_open_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_file_open_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_file_open_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_fingerprint_24.xml b/src/keepass2android-app/Resources/drawable/baseline_fingerprint_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_fingerprint_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_fingerprint_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_folder_24.xml b/src/keepass2android-app/Resources/drawable/baseline_folder_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_folder_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_folder_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_folder_open_24.xml b/src/keepass2android-app/Resources/drawable/baseline_folder_open_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_folder_open_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_folder_open_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_help_24.xml b/src/keepass2android-app/Resources/drawable/baseline_help_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_help_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_help_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_history_24.xml b/src/keepass2android-app/Resources/drawable/baseline_history_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_history_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_history_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_image_24.xml b/src/keepass2android-app/Resources/drawable/baseline_image_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_image_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_image_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_info_24.xml b/src/keepass2android-app/Resources/drawable/baseline_info_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_info_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_info_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_keyboard_arrow_right_24.xml b/src/keepass2android-app/Resources/drawable/baseline_keyboard_arrow_right_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_keyboard_arrow_right_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_keyboard_arrow_right_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_label_24.xml b/src/keepass2android-app/Resources/drawable/baseline_label_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_label_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_label_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_link_24.xml b/src/keepass2android-app/Resources/drawable/baseline_link_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_link_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_link_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_lock_24.xml b/src/keepass2android-app/Resources/drawable/baseline_lock_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_lock_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_lock_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_more_horiz_24.xml b/src/keepass2android-app/Resources/drawable/baseline_more_horiz_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_more_horiz_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_more_horiz_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_more_vert_24.xml b/src/keepass2android-app/Resources/drawable/baseline_more_vert_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_more_vert_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_more_vert_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_navigate_to_folder_24.xml b/src/keepass2android-app/Resources/drawable/baseline_navigate_to_folder_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_navigate_to_folder_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_navigate_to_folder_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_password_24.xml b/src/keepass2android-app/Resources/drawable/baseline_password_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_password_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_password_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_save_24.xml b/src/keepass2android-app/Resources/drawable/baseline_save_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_save_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_save_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_schedule_24.xml b/src/keepass2android-app/Resources/drawable/baseline_schedule_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_schedule_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_schedule_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_search_24.xml b/src/keepass2android-app/Resources/drawable/baseline_search_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_search_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_search_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_settings_24.xml b/src/keepass2android-app/Resources/drawable/baseline_settings_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_settings_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_settings_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_share_24.xml b/src/keepass2android-app/Resources/drawable/baseline_share_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_share_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_share_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_sort_24.xml b/src/keepass2android-app/Resources/drawable/baseline_sort_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_sort_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_sort_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_sync_24.xml b/src/keepass2android-app/Resources/drawable/baseline_sync_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_sync_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_sync_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_upload_24.xml b/src/keepass2android-app/Resources/drawable/baseline_upload_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_upload_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_upload_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_visibility_24.xml b/src/keepass2android-app/Resources/drawable/baseline_visibility_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_visibility_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_visibility_24.xml
diff --git a/src/keepass2android/Resources/drawable/baseline_vpn_key_24.xml b/src/keepass2android-app/Resources/drawable/baseline_vpn_key_24.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/baseline_vpn_key_24.xml
rename to src/keepass2android-app/Resources/drawable/baseline_vpn_key_24.xml
diff --git a/src/keepass2android/Resources/drawable/checked_drawable.xml b/src/keepass2android-app/Resources/drawable/checked_drawable.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/checked_drawable.xml
rename to src/keepass2android-app/Resources/drawable/checked_drawable.xml
diff --git a/src/keepass2android/Resources/drawable/donate_beer.xml b/src/keepass2android-app/Resources/drawable/donate_beer.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/donate_beer.xml
rename to src/keepass2android-app/Resources/drawable/donate_beer.xml
diff --git a/src/keepass2android/Resources/drawable/drawer_shadow.9.png b/src/keepass2android-app/Resources/drawable/drawer_shadow.9.png
similarity index 100%
rename from src/keepass2android/Resources/drawable/drawer_shadow.9.png
rename to src/keepass2android-app/Resources/drawable/drawer_shadow.9.png
diff --git a/src/keepass2android/Resources/drawable/entry_icon_bkg_drawable.xml b/src/keepass2android-app/Resources/drawable/entry_icon_bkg_drawable.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/entry_icon_bkg_drawable.xml
rename to src/keepass2android-app/Resources/drawable/entry_icon_bkg_drawable.xml
diff --git a/src/keepass2android/Resources/drawable/extra_string_header.xml b/src/keepass2android-app/Resources/drawable/extra_string_header.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/extra_string_header.xml
rename to src/keepass2android-app/Resources/drawable/extra_string_header.xml
diff --git a/src/keepass2android/Resources/drawable/group_icon_bkg_drawable.xml b/src/keepass2android-app/Resources/drawable/group_icon_bkg_drawable.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/group_icon_bkg_drawable.xml
rename to src/keepass2android-app/Resources/drawable/group_icon_bkg_drawable.xml
diff --git a/src/keepass2android/Resources/drawable/grouplistitem_selector.xml b/src/keepass2android-app/Resources/drawable/grouplistitem_selector.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/grouplistitem_selector.xml
rename to src/keepass2android-app/Resources/drawable/grouplistitem_selector.xml
diff --git a/src/keepass2android/Resources/drawable/ic59.txt b/src/keepass2android-app/Resources/drawable/ic59.txt
similarity index 100%
rename from src/keepass2android/Resources/drawable/ic59.txt
rename to src/keepass2android-app/Resources/drawable/ic59.txt
diff --git a/src/keepass2android/Resources/drawable/ic63.txt b/src/keepass2android-app/Resources/drawable/ic63.txt
similarity index 100%
rename from src/keepass2android/Resources/drawable/ic63.txt
rename to src/keepass2android-app/Resources/drawable/ic63.txt
diff --git a/src/keepass2android/Resources/drawable/ic68.png b/src/keepass2android-app/Resources/drawable/ic68.png
similarity index 100%
rename from src/keepass2android/Resources/drawable/ic68.png
rename to src/keepass2android-app/Resources/drawable/ic68.png
diff --git a/src/keepass2android/Resources/drawable/ic99_blank.png b/src/keepass2android-app/Resources/drawable/ic99_blank.png
similarity index 100%
rename from src/keepass2android/Resources/drawable/ic99_blank.png
rename to src/keepass2android-app/Resources/drawable/ic99_blank.png
diff --git a/src/keepass2android/Resources/drawable/ic_fingerprint_error.xml b/src/keepass2android-app/Resources/drawable/ic_fingerprint_error.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/ic_fingerprint_error.xml
rename to src/keepass2android-app/Resources/drawable/ic_fingerprint_error.xml
diff --git a/src/keepass2android/Resources/drawable/ic_fingerprint_success.xml b/src/keepass2android-app/Resources/drawable/ic_fingerprint_success.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/ic_fingerprint_success.xml
rename to src/keepass2android-app/Resources/drawable/ic_fingerprint_success.xml
diff --git a/src/keepass2android/Resources/drawable/ic_launcher_background_blue.xml b/src/keepass2android-app/Resources/drawable/ic_launcher_background_blue.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/ic_launcher_background_blue.xml
rename to src/keepass2android-app/Resources/drawable/ic_launcher_background_blue.xml
diff --git a/src/keepass2android/Resources/drawable/ic_launcher_background_green.xml b/src/keepass2android-app/Resources/drawable/ic_launcher_background_green.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/ic_launcher_background_green.xml
rename to src/keepass2android-app/Resources/drawable/ic_launcher_background_green.xml
diff --git a/src/keepass2android/Resources/drawable/ic_launcher_foreground.xml b/src/keepass2android-app/Resources/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/ic_launcher_foreground.xml
rename to src/keepass2android-app/Resources/drawable/ic_launcher_foreground.xml
diff --git a/src/keepass2android/Resources/drawable/ic_launcher_offline.png b/src/keepass2android-app/Resources/drawable/ic_launcher_offline.png
similarity index 100%
rename from src/keepass2android/Resources/drawable/ic_launcher_offline.png
rename to src/keepass2android-app/Resources/drawable/ic_launcher_offline.png
diff --git a/src/keepass2android/Resources/drawable/ic_launcher_online.png b/src/keepass2android-app/Resources/drawable/ic_launcher_online.png
similarity index 100%
rename from src/keepass2android/Resources/drawable/ic_launcher_online.png
rename to src/keepass2android-app/Resources/drawable/ic_launcher_online.png
diff --git a/src/keepass2android/Resources/drawable/search_dropdown_light.xml b/src/keepass2android-app/Resources/drawable/search_dropdown_light.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/search_dropdown_light.xml
rename to src/keepass2android-app/Resources/drawable/search_dropdown_light.xml
diff --git a/src/keepass2android/Resources/drawable/section_header.xml b/src/keepass2android-app/Resources/drawable/section_header.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/section_header.xml
rename to src/keepass2android-app/Resources/drawable/section_header.xml
diff --git a/src/keepass2android/Resources/drawable/splash_bg_selector.xml b/src/keepass2android-app/Resources/drawable/splash_bg_selector.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/splash_bg_selector.xml
rename to src/keepass2android-app/Resources/drawable/splash_bg_selector.xml
diff --git a/src/keepass2android/Resources/drawable/splash_button_bg.xml b/src/keepass2android-app/Resources/drawable/splash_button_bg.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/splash_button_bg.xml
rename to src/keepass2android-app/Resources/drawable/splash_button_bg.xml
diff --git a/src/keepass2android/Resources/drawable/storagetype_button_bg.xml b/src/keepass2android-app/Resources/drawable/storagetype_button_bg.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/storagetype_button_bg.xml
rename to src/keepass2android-app/Resources/drawable/storagetype_button_bg.xml
diff --git a/src/keepass2android/Resources/drawable/storagetype_button_bg_dark.xml b/src/keepass2android-app/Resources/drawable/storagetype_button_bg_dark.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/storagetype_button_bg_dark.xml
rename to src/keepass2android-app/Resources/drawable/storagetype_button_bg_dark.xml
diff --git a/src/keepass2android/Resources/drawable/storagetype_grid_bg.xml b/src/keepass2android-app/Resources/drawable/storagetype_grid_bg.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/storagetype_grid_bg.xml
rename to src/keepass2android-app/Resources/drawable/storagetype_grid_bg.xml
diff --git a/src/keepass2android/Resources/drawable/transparent.png b/src/keepass2android-app/Resources/drawable/transparent.png
similarity index 100%
rename from src/keepass2android/Resources/drawable/transparent.png
rename to src/keepass2android-app/Resources/drawable/transparent.png
diff --git a/src/keepass2android/Resources/layout-land/file_selection.xml b/src/keepass2android-app/Resources/layout-land/file_selection.xml
similarity index 100%
rename from src/keepass2android/Resources/layout-land/file_selection.xml
rename to src/keepass2android-app/Resources/layout-land/file_selection.xml
diff --git a/src/keepass2android/Resources/layout/EntryEditButtonAdd.axml b/src/keepass2android-app/Resources/layout/EntryEditButtonAdd.axml
similarity index 100%
rename from src/keepass2android/Resources/layout/EntryEditButtonAdd.axml
rename to src/keepass2android-app/Resources/layout/EntryEditButtonAdd.axml
diff --git a/src/keepass2android/Resources/layout/EntryEditButtonDelete.axml b/src/keepass2android-app/Resources/layout/EntryEditButtonDelete.axml
similarity index 100%
rename from src/keepass2android/Resources/layout/EntryEditButtonDelete.axml
rename to src/keepass2android-app/Resources/layout/EntryEditButtonDelete.axml
diff --git a/src/keepass2android/Resources/layout/ImageViewActivity.xml b/src/keepass2android-app/Resources/layout/ImageViewActivity.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/ImageViewActivity.xml
rename to src/keepass2android-app/Resources/layout/ImageViewActivity.xml
diff --git a/src/keepass2android/Resources/layout/InViewButton.xml b/src/keepass2android-app/Resources/layout/InViewButton.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/InViewButton.xml
rename to src/keepass2android-app/Resources/layout/InViewButton.xml
diff --git a/src/keepass2android/Resources/layout/Kopie_von_donate.xml b/src/keepass2android-app/Resources/layout/Kopie_von_donate.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/Kopie_von_donate.xml
rename to src/keepass2android-app/Resources/layout/Kopie_von_donate.xml
diff --git a/src/keepass2android/Resources/layout/ListViewPluginRow.xml b/src/keepass2android-app/Resources/layout/ListViewPluginRow.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/ListViewPluginRow.xml
rename to src/keepass2android-app/Resources/layout/ListViewPluginRow.xml
diff --git a/src/keepass2android/Resources/layout/QuickUnlock.xml b/src/keepass2android-app/Resources/layout/QuickUnlock.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/QuickUnlock.xml
rename to src/keepass2android-app/Resources/layout/QuickUnlock.xml
diff --git a/src/keepass2android/Resources/layout/StartScreenButtons.xml b/src/keepass2android-app/Resources/layout/StartScreenButtons.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/StartScreenButtons.xml
rename to src/keepass2android-app/Resources/layout/StartScreenButtons.xml
diff --git a/src/keepass2android/Resources/layout/VersionHistoryButton.axml b/src/keepass2android-app/Resources/layout/VersionHistoryButton.axml
similarity index 100%
rename from src/keepass2android/Resources/layout/VersionHistoryButton.axml
rename to src/keepass2android-app/Resources/layout/VersionHistoryButton.axml
diff --git a/src/keepass2android/Resources/layout/about.xml b/src/keepass2android-app/Resources/layout/about.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/about.xml
rename to src/keepass2android-app/Resources/layout/about.xml
diff --git a/src/keepass2android/Resources/layout/autofill_service_list_item.xml b/src/keepass2android-app/Resources/layout/autofill_service_list_item.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/autofill_service_list_item.xml
rename to src/keepass2android-app/Resources/layout/autofill_service_list_item.xml
diff --git a/src/keepass2android/Resources/layout/child_db_config_row.xml b/src/keepass2android-app/Resources/layout/child_db_config_row.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/child_db_config_row.xml
rename to src/keepass2android-app/Resources/layout/child_db_config_row.xml
diff --git a/src/keepass2android/Resources/layout/config_child_db.xml b/src/keepass2android-app/Resources/layout/config_child_db.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/config_child_db.xml
rename to src/keepass2android-app/Resources/layout/config_child_db.xml
diff --git a/src/keepass2android/Resources/layout/configure_totp_dialog.xml b/src/keepass2android-app/Resources/layout/configure_totp_dialog.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/configure_totp_dialog.xml
rename to src/keepass2android-app/Resources/layout/configure_totp_dialog.xml
diff --git a/src/keepass2android/Resources/layout/create_database.xml b/src/keepass2android-app/Resources/layout/create_database.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/create_database.xml
rename to src/keepass2android-app/Resources/layout/create_database.xml
diff --git a/src/keepass2android/Resources/layout/database_kdf_settings.xml b/src/keepass2android-app/Resources/layout/database_kdf_settings.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/database_kdf_settings.xml
rename to src/keepass2android-app/Resources/layout/database_kdf_settings.xml
diff --git a/src/keepass2android/Resources/layout/disabled_queries_preference_row.axml b/src/keepass2android-app/Resources/layout/disabled_queries_preference_row.axml
similarity index 100%
rename from src/keepass2android/Resources/layout/disabled_queries_preference_row.axml
rename to src/keepass2android-app/Resources/layout/disabled_queries_preference_row.axml
diff --git a/src/keepass2android/Resources/layout/donate.xml b/src/keepass2android-app/Resources/layout/donate.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/donate.xml
rename to src/keepass2android-app/Resources/layout/donate.xml
diff --git a/src/keepass2android/Resources/layout/donate_bday.xml b/src/keepass2android-app/Resources/layout/donate_bday.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/donate_bday.xml
rename to src/keepass2android-app/Resources/layout/donate_bday.xml
diff --git a/src/keepass2android/Resources/layout/donate_bdaymissed.xml b/src/keepass2android-app/Resources/layout/donate_bdaymissed.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/donate_bdaymissed.xml
rename to src/keepass2android-app/Resources/layout/donate_bdaymissed.xml
diff --git a/src/keepass2android/Resources/layout/edit_extra_string_dialog.xml b/src/keepass2android-app/Resources/layout/edit_extra_string_dialog.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/edit_extra_string_dialog.xml
rename to src/keepass2android-app/Resources/layout/edit_extra_string_dialog.xml
diff --git a/src/keepass2android/Resources/layout/entry_edit.xml b/src/keepass2android-app/Resources/layout/entry_edit.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/entry_edit.xml
rename to src/keepass2android-app/Resources/layout/entry_edit.xml
diff --git a/src/keepass2android/Resources/layout/entry_edit_section.xml b/src/keepass2android-app/Resources/layout/entry_edit_section.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/entry_edit_section.xml
rename to src/keepass2android-app/Resources/layout/entry_edit_section.xml
diff --git a/src/keepass2android/Resources/layout/entry_edit_section_bool.xml b/src/keepass2android-app/Resources/layout/entry_edit_section_bool.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/entry_edit_section_bool.xml
rename to src/keepass2android-app/Resources/layout/entry_edit_section_bool.xml
diff --git a/src/keepass2android/Resources/layout/entry_edit_section_file.xml b/src/keepass2android-app/Resources/layout/entry_edit_section_file.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/entry_edit_section_file.xml
rename to src/keepass2android-app/Resources/layout/entry_edit_section_file.xml
diff --git a/src/keepass2android/Resources/layout/entry_extrastring_title.xml b/src/keepass2android-app/Resources/layout/entry_extrastring_title.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/entry_extrastring_title.xml
rename to src/keepass2android-app/Resources/layout/entry_extrastring_title.xml
diff --git a/src/keepass2android/Resources/layout/entry_extrastring_value.xml b/src/keepass2android-app/Resources/layout/entry_extrastring_value.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/entry_extrastring_value.xml
rename to src/keepass2android-app/Resources/layout/entry_extrastring_value.xml
diff --git a/src/keepass2android/Resources/layout/entry_list_entry.xml b/src/keepass2android-app/Resources/layout/entry_list_entry.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/entry_list_entry.xml
rename to src/keepass2android-app/Resources/layout/entry_list_entry.xml
diff --git a/src/keepass2android/Resources/layout/entry_section.xml b/src/keepass2android-app/Resources/layout/entry_section.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/entry_section.xml
rename to src/keepass2android-app/Resources/layout/entry_section.xml
diff --git a/src/keepass2android/Resources/layout/entry_view.xml b/src/keepass2android-app/Resources/layout/entry_view.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/entry_view.xml
rename to src/keepass2android-app/Resources/layout/entry_view.xml
diff --git a/src/keepass2android/Resources/layout/entry_view_contents.xml b/src/keepass2android-app/Resources/layout/entry_view_contents.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/entry_view_contents.xml
rename to src/keepass2android-app/Resources/layout/entry_view_contents.xml
diff --git a/src/keepass2android/Resources/layout/entry_view_test.xml b/src/keepass2android-app/Resources/layout/entry_view_test.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/entry_view_test.xml
rename to src/keepass2android-app/Resources/layout/entry_view_test.xml
diff --git a/src/keepass2android/Resources/layout/file_row.xml b/src/keepass2android-app/Resources/layout/file_row.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/file_row.xml
rename to src/keepass2android-app/Resources/layout/file_row.xml
diff --git a/src/keepass2android/Resources/layout/file_selection.xml b/src/keepass2android-app/Resources/layout/file_selection.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/file_selection.xml
rename to src/keepass2android-app/Resources/layout/file_selection.xml
diff --git a/src/keepass2android/Resources/layout/file_selection_filename.xml b/src/keepass2android-app/Resources/layout/file_selection_filename.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/file_selection_filename.xml
rename to src/keepass2android-app/Resources/layout/file_selection_filename.xml
diff --git a/src/keepass2android/Resources/layout/file_storage_setup.xml b/src/keepass2android-app/Resources/layout/file_storage_setup.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/file_storage_setup.xml
rename to src/keepass2android-app/Resources/layout/file_storage_setup.xml
diff --git a/src/keepass2android/Resources/layout/filestorage_selection.xml b/src/keepass2android-app/Resources/layout/filestorage_selection.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/filestorage_selection.xml
rename to src/keepass2android-app/Resources/layout/filestorage_selection.xml
diff --git a/src/keepass2android/Resources/layout/fingerprint_setup.xml b/src/keepass2android-app/Resources/layout/fingerprint_setup.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/fingerprint_setup.xml
rename to src/keepass2android-app/Resources/layout/fingerprint_setup.xml
diff --git a/src/keepass2android/Resources/layout/ftpcredentials.xml b/src/keepass2android-app/Resources/layout/ftpcredentials.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/ftpcredentials.xml
rename to src/keepass2android-app/Resources/layout/ftpcredentials.xml
diff --git a/src/keepass2android/Resources/layout/generate_password.xml b/src/keepass2android-app/Resources/layout/generate_password.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/generate_password.xml
rename to src/keepass2android-app/Resources/layout/generate_password.xml
diff --git a/src/keepass2android/Resources/layout/group.xml b/src/keepass2android-app/Resources/layout/group.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/group.xml
rename to src/keepass2android-app/Resources/layout/group.xml
diff --git a/src/keepass2android/Resources/layout/group_edit.xml b/src/keepass2android-app/Resources/layout/group_edit.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/group_edit.xml
rename to src/keepass2android-app/Resources/layout/group_edit.xml
diff --git a/src/keepass2android/Resources/layout/group_empty.xml b/src/keepass2android-app/Resources/layout/group_empty.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/group_empty.xml
rename to src/keepass2android-app/Resources/layout/group_empty.xml
diff --git a/src/keepass2android/Resources/layout/group_list_entry.xml b/src/keepass2android-app/Resources/layout/group_list_entry.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/group_list_entry.xml
rename to src/keepass2android-app/Resources/layout/group_list_entry.xml
diff --git a/src/keepass2android/Resources/layout/httpcredentials.axml b/src/keepass2android-app/Resources/layout/httpcredentials.axml
similarity index 100%
rename from src/keepass2android/Resources/layout/httpcredentials.axml
rename to src/keepass2android-app/Resources/layout/httpcredentials.axml
diff --git a/src/keepass2android/Resources/layout/icon.xml b/src/keepass2android-app/Resources/layout/icon.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/icon.xml
rename to src/keepass2android-app/Resources/layout/icon.xml
diff --git a/src/keepass2android/Resources/layout/icon_picker.xml b/src/keepass2android-app/Resources/layout/icon_picker.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/icon_picker.xml
rename to src/keepass2android-app/Resources/layout/icon_picker.xml
diff --git a/src/keepass2android/Resources/layout/image_list_preference_row.xml b/src/keepass2android-app/Resources/layout/image_list_preference_row.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/image_list_preference_row.xml
rename to src/keepass2android-app/Resources/layout/image_list_preference_row.xml
diff --git a/src/keepass2android/Resources/layout/megacredentials.xml b/src/keepass2android-app/Resources/layout/megacredentials.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/megacredentials.xml
rename to src/keepass2android-app/Resources/layout/megacredentials.xml
diff --git a/src/keepass2android/Resources/layout/nav_header.xml b/src/keepass2android-app/Resources/layout/nav_header.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/nav_header.xml
rename to src/keepass2android-app/Resources/layout/nav_header.xml
diff --git a/src/keepass2android/Resources/layout/no_secure_display_layout.axml b/src/keepass2android-app/Resources/layout/no_secure_display_layout.axml
similarity index 100%
rename from src/keepass2android/Resources/layout/no_secure_display_layout.axml
rename to src/keepass2android-app/Resources/layout/no_secure_display_layout.axml
diff --git a/src/keepass2android/Resources/layout/open_db_selection.xml b/src/keepass2android-app/Resources/layout/open_db_selection.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/open_db_selection.xml
rename to src/keepass2android-app/Resources/layout/open_db_selection.xml
diff --git a/src/keepass2android/Resources/layout/owncloudcredentials.xml b/src/keepass2android-app/Resources/layout/owncloudcredentials.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/owncloudcredentials.xml
rename to src/keepass2android-app/Resources/layout/owncloudcredentials.xml
diff --git a/src/keepass2android/Resources/layout/password.xml b/src/keepass2android-app/Resources/layout/password.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/password.xml
rename to src/keepass2android-app/Resources/layout/password.xml
diff --git a/src/keepass2android/Resources/layout/plugin_details.xml b/src/keepass2android-app/Resources/layout/plugin_details.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/plugin_details.xml
rename to src/keepass2android-app/Resources/layout/plugin_details.xml
diff --git a/src/keepass2android/Resources/layout/plugin_list.xml b/src/keepass2android-app/Resources/layout/plugin_list.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/plugin_list.xml
rename to src/keepass2android-app/Resources/layout/plugin_list.xml
diff --git a/src/keepass2android/Resources/layout/preference.axml b/src/keepass2android-app/Resources/layout/preference.axml
similarity index 100%
rename from src/keepass2android/Resources/layout/preference.axml
rename to src/keepass2android-app/Resources/layout/preference.axml
diff --git a/src/keepass2android/Resources/layout/recent_files.xml b/src/keepass2android-app/Resources/layout/recent_files.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/recent_files.xml
rename to src/keepass2android-app/Resources/layout/recent_files.xml
diff --git a/src/keepass2android/Resources/layout/search.xml b/src/keepass2android-app/Resources/layout/search.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/search.xml
rename to src/keepass2android-app/Resources/layout/search.xml
diff --git a/src/keepass2android/Resources/layout/searchurlresults.xml b/src/keepass2android-app/Resources/layout/searchurlresults.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/searchurlresults.xml
rename to src/keepass2android-app/Resources/layout/searchurlresults.xml
diff --git a/src/keepass2android/Resources/layout/searchurlresults_empty.xml b/src/keepass2android-app/Resources/layout/searchurlresults_empty.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/searchurlresults_empty.xml
rename to src/keepass2android-app/Resources/layout/searchurlresults_empty.xml
diff --git a/src/keepass2android/Resources/layout/set_password.xml b/src/keepass2android-app/Resources/layout/set_password.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/set_password.xml
rename to src/keepass2android-app/Resources/layout/set_password.xml
diff --git a/src/keepass2android/Resources/layout/sftp_credentials.axml b/src/keepass2android-app/Resources/layout/sftp_credentials.axml
similarity index 100%
rename from src/keepass2android/Resources/layout/sftp_credentials.axml
rename to src/keepass2android-app/Resources/layout/sftp_credentials.axml
diff --git a/src/keepass2android/Resources/layout/sftpcredentials.xml b/src/keepass2android-app/Resources/layout/sftpcredentials.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/sftpcredentials.xml
rename to src/keepass2android-app/Resources/layout/sftpcredentials.xml
diff --git a/src/keepass2android/Resources/layout/switch_ime_activity_layout.xml b/src/keepass2android-app/Resources/layout/switch_ime_activity_layout.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/switch_ime_activity_layout.xml
rename to src/keepass2android-app/Resources/layout/switch_ime_activity_layout.xml
diff --git a/src/keepass2android/Resources/layout/text_with_help.xml b/src/keepass2android-app/Resources/layout/text_with_help.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/text_with_help.xml
rename to src/keepass2android-app/Resources/layout/text_with_help.xml
diff --git a/src/keepass2android/Resources/layout/url_credentials.xml b/src/keepass2android-app/Resources/layout/url_credentials.xml
similarity index 100%
rename from src/keepass2android/Resources/layout/url_credentials.xml
rename to src/keepass2android-app/Resources/layout/url_credentials.xml
diff --git a/src/keepass2android/Resources/menu/entry.xml b/src/keepass2android-app/Resources/menu/entry.xml
similarity index 100%
rename from src/keepass2android/Resources/menu/entry.xml
rename to src/keepass2android-app/Resources/menu/entry.xml
diff --git a/src/keepass2android/Resources/menu/entry_edit.xml b/src/keepass2android-app/Resources/menu/entry_edit.xml
similarity index 100%
rename from src/keepass2android/Resources/menu/entry_edit.xml
rename to src/keepass2android-app/Resources/menu/entry_edit.xml
diff --git a/src/keepass2android/Resources/menu/fileselect.xml b/src/keepass2android-app/Resources/menu/fileselect.xml
similarity index 100%
rename from src/keepass2android/Resources/menu/fileselect.xml
rename to src/keepass2android-app/Resources/menu/fileselect.xml
diff --git a/src/keepass2android/Resources/menu/group.xml b/src/keepass2android-app/Resources/menu/group.xml
similarity index 100%
rename from src/keepass2android/Resources/menu/group.xml
rename to src/keepass2android-app/Resources/menu/group.xml
diff --git a/src/keepass2android/Resources/menu/group_entriesselected.xml b/src/keepass2android-app/Resources/menu/group_entriesselected.xml
similarity index 100%
rename from src/keepass2android/Resources/menu/group_entriesselected.xml
rename to src/keepass2android-app/Resources/menu/group_entriesselected.xml
diff --git a/src/keepass2android/Resources/menu/menu_entryedit.xml b/src/keepass2android-app/Resources/menu/menu_entryedit.xml
similarity index 100%
rename from src/keepass2android/Resources/menu/menu_entryedit.xml
rename to src/keepass2android-app/Resources/menu/menu_entryedit.xml
diff --git a/src/keepass2android/Resources/menu/menu_selectdb.xml b/src/keepass2android-app/Resources/menu/menu_selectdb.xml
similarity index 100%
rename from src/keepass2android/Resources/menu/menu_selectdb.xml
rename to src/keepass2android-app/Resources/menu/menu_selectdb.xml
diff --git a/src/keepass2android/Resources/mipmap-anydpi-v26/ic_launcher_offline.xml b/src/keepass2android-app/Resources/mipmap-anydpi-v26/ic_launcher_offline.xml
similarity index 100%
rename from src/keepass2android/Resources/mipmap-anydpi-v26/ic_launcher_offline.xml
rename to src/keepass2android-app/Resources/mipmap-anydpi-v26/ic_launcher_offline.xml
diff --git a/src/keepass2android/Resources/mipmap-anydpi-v26/ic_launcher_offline_round.xml b/src/keepass2android-app/Resources/mipmap-anydpi-v26/ic_launcher_offline_round.xml
similarity index 100%
rename from src/keepass2android/Resources/mipmap-anydpi-v26/ic_launcher_offline_round.xml
rename to src/keepass2android-app/Resources/mipmap-anydpi-v26/ic_launcher_offline_round.xml
diff --git a/src/keepass2android/Resources/mipmap-anydpi-v26/ic_launcher_online.xml b/src/keepass2android-app/Resources/mipmap-anydpi-v26/ic_launcher_online.xml
similarity index 100%
rename from src/keepass2android/Resources/mipmap-anydpi-v26/ic_launcher_online.xml
rename to src/keepass2android-app/Resources/mipmap-anydpi-v26/ic_launcher_online.xml
diff --git a/src/keepass2android/Resources/mipmap-anydpi-v26/ic_launcher_online_round.xml b/src/keepass2android-app/Resources/mipmap-anydpi-v26/ic_launcher_online_round.xml
similarity index 100%
rename from src/keepass2android/Resources/mipmap-anydpi-v26/ic_launcher_online_round.xml
rename to src/keepass2android-app/Resources/mipmap-anydpi-v26/ic_launcher_online_round.xml
diff --git a/src/keepass2android/Resources/mipmap-hdpi/ic_launcher_offline.png b/src/keepass2android-app/Resources/mipmap-hdpi/ic_launcher_offline.png
similarity index 100%
rename from src/keepass2android/Resources/mipmap-hdpi/ic_launcher_offline.png
rename to src/keepass2android-app/Resources/mipmap-hdpi/ic_launcher_offline.png
diff --git a/src/keepass2android/Resources/mipmap-hdpi/ic_launcher_offline_round.png b/src/keepass2android-app/Resources/mipmap-hdpi/ic_launcher_offline_round.png
similarity index 100%
rename from src/keepass2android/Resources/mipmap-hdpi/ic_launcher_offline_round.png
rename to src/keepass2android-app/Resources/mipmap-hdpi/ic_launcher_offline_round.png
diff --git a/src/keepass2android/Resources/mipmap-hdpi/ic_launcher_online.png b/src/keepass2android-app/Resources/mipmap-hdpi/ic_launcher_online.png
similarity index 100%
rename from src/keepass2android/Resources/mipmap-hdpi/ic_launcher_online.png
rename to src/keepass2android-app/Resources/mipmap-hdpi/ic_launcher_online.png
diff --git a/src/keepass2android/Resources/mipmap-hdpi/ic_launcher_online_round.png b/src/keepass2android-app/Resources/mipmap-hdpi/ic_launcher_online_round.png
similarity index 100%
rename from src/keepass2android/Resources/mipmap-hdpi/ic_launcher_online_round.png
rename to src/keepass2android-app/Resources/mipmap-hdpi/ic_launcher_online_round.png
diff --git a/src/keepass2android/Resources/mipmap-mdpi/ic_launcher_offline.png b/src/keepass2android-app/Resources/mipmap-mdpi/ic_launcher_offline.png
similarity index 100%
rename from src/keepass2android/Resources/mipmap-mdpi/ic_launcher_offline.png
rename to src/keepass2android-app/Resources/mipmap-mdpi/ic_launcher_offline.png
diff --git a/src/keepass2android/Resources/mipmap-mdpi/ic_launcher_offline_round.png b/src/keepass2android-app/Resources/mipmap-mdpi/ic_launcher_offline_round.png
similarity index 100%
rename from src/keepass2android/Resources/mipmap-mdpi/ic_launcher_offline_round.png
rename to src/keepass2android-app/Resources/mipmap-mdpi/ic_launcher_offline_round.png
diff --git a/src/keepass2android/Resources/mipmap-mdpi/ic_launcher_online.png b/src/keepass2android-app/Resources/mipmap-mdpi/ic_launcher_online.png
similarity index 100%
rename from src/keepass2android/Resources/mipmap-mdpi/ic_launcher_online.png
rename to src/keepass2android-app/Resources/mipmap-mdpi/ic_launcher_online.png
diff --git a/src/keepass2android/Resources/mipmap-mdpi/ic_launcher_online_round.png b/src/keepass2android-app/Resources/mipmap-mdpi/ic_launcher_online_round.png
similarity index 100%
rename from src/keepass2android/Resources/mipmap-mdpi/ic_launcher_online_round.png
rename to src/keepass2android-app/Resources/mipmap-mdpi/ic_launcher_online_round.png
diff --git a/src/keepass2android/Resources/mipmap-xhdpi/ic_launcher_offline.png b/src/keepass2android-app/Resources/mipmap-xhdpi/ic_launcher_offline.png
similarity index 100%
rename from src/keepass2android/Resources/mipmap-xhdpi/ic_launcher_offline.png
rename to src/keepass2android-app/Resources/mipmap-xhdpi/ic_launcher_offline.png
diff --git a/src/keepass2android/Resources/mipmap-xhdpi/ic_launcher_offline_round.png b/src/keepass2android-app/Resources/mipmap-xhdpi/ic_launcher_offline_round.png
similarity index 100%
rename from src/keepass2android/Resources/mipmap-xhdpi/ic_launcher_offline_round.png
rename to src/keepass2android-app/Resources/mipmap-xhdpi/ic_launcher_offline_round.png
diff --git a/src/keepass2android/Resources/mipmap-xhdpi/ic_launcher_online.png b/src/keepass2android-app/Resources/mipmap-xhdpi/ic_launcher_online.png
similarity index 100%
rename from src/keepass2android/Resources/mipmap-xhdpi/ic_launcher_online.png
rename to src/keepass2android-app/Resources/mipmap-xhdpi/ic_launcher_online.png
diff --git a/src/keepass2android/Resources/mipmap-xhdpi/ic_launcher_online_round.png b/src/keepass2android-app/Resources/mipmap-xhdpi/ic_launcher_online_round.png
similarity index 100%
rename from src/keepass2android/Resources/mipmap-xhdpi/ic_launcher_online_round.png
rename to src/keepass2android-app/Resources/mipmap-xhdpi/ic_launcher_online_round.png
diff --git a/src/keepass2android/Resources/mipmap-xxhdpi/ic_launcher_offline.png b/src/keepass2android-app/Resources/mipmap-xxhdpi/ic_launcher_offline.png
similarity index 100%
rename from src/keepass2android/Resources/mipmap-xxhdpi/ic_launcher_offline.png
rename to src/keepass2android-app/Resources/mipmap-xxhdpi/ic_launcher_offline.png
diff --git a/src/keepass2android/Resources/mipmap-xxhdpi/ic_launcher_offline_round.png b/src/keepass2android-app/Resources/mipmap-xxhdpi/ic_launcher_offline_round.png
similarity index 100%
rename from src/keepass2android/Resources/mipmap-xxhdpi/ic_launcher_offline_round.png
rename to src/keepass2android-app/Resources/mipmap-xxhdpi/ic_launcher_offline_round.png
diff --git a/src/keepass2android/Resources/mipmap-xxhdpi/ic_launcher_online.png b/src/keepass2android-app/Resources/mipmap-xxhdpi/ic_launcher_online.png
similarity index 100%
rename from src/keepass2android/Resources/mipmap-xxhdpi/ic_launcher_online.png
rename to src/keepass2android-app/Resources/mipmap-xxhdpi/ic_launcher_online.png
diff --git a/src/keepass2android/Resources/mipmap-xxhdpi/ic_launcher_online_round.png b/src/keepass2android-app/Resources/mipmap-xxhdpi/ic_launcher_online_round.png
similarity index 100%
rename from src/keepass2android/Resources/mipmap-xxhdpi/ic_launcher_online_round.png
rename to src/keepass2android-app/Resources/mipmap-xxhdpi/ic_launcher_online_round.png
diff --git a/src/keepass2android/Resources/mipmap-xxxhdpi/ic_launcher_offline.png b/src/keepass2android-app/Resources/mipmap-xxxhdpi/ic_launcher_offline.png
similarity index 100%
rename from src/keepass2android/Resources/mipmap-xxxhdpi/ic_launcher_offline.png
rename to src/keepass2android-app/Resources/mipmap-xxxhdpi/ic_launcher_offline.png
diff --git a/src/keepass2android/Resources/mipmap-xxxhdpi/ic_launcher_offline_round.png b/src/keepass2android-app/Resources/mipmap-xxxhdpi/ic_launcher_offline_round.png
similarity index 100%
rename from src/keepass2android/Resources/mipmap-xxxhdpi/ic_launcher_offline_round.png
rename to src/keepass2android-app/Resources/mipmap-xxxhdpi/ic_launcher_offline_round.png
diff --git a/src/keepass2android/Resources/mipmap-xxxhdpi/ic_launcher_online.png b/src/keepass2android-app/Resources/mipmap-xxxhdpi/ic_launcher_online.png
similarity index 100%
rename from src/keepass2android/Resources/mipmap-xxxhdpi/ic_launcher_online.png
rename to src/keepass2android-app/Resources/mipmap-xxxhdpi/ic_launcher_online.png
diff --git a/src/keepass2android/Resources/mipmap-xxxhdpi/ic_launcher_online_round.png b/src/keepass2android-app/Resources/mipmap-xxxhdpi/ic_launcher_online_round.png
similarity index 100%
rename from src/keepass2android/Resources/mipmap-xxxhdpi/ic_launcher_online_round.png
rename to src/keepass2android-app/Resources/mipmap-xxxhdpi/ic_launcher_online_round.png
diff --git a/src/keepass2android/Resources/values-af/strings.xml b/src/keepass2android-app/Resources/values-af/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-af/strings.xml
rename to src/keepass2android-app/Resources/values-af/strings.xml
diff --git a/src/keepass2android/Resources/values-ar/strings.xml b/src/keepass2android-app/Resources/values-ar/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-ar/strings.xml
rename to src/keepass2android-app/Resources/values-ar/strings.xml
diff --git a/src/keepass2android/Resources/values-az/strings.xml b/src/keepass2android-app/Resources/values-az/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-az/strings.xml
rename to src/keepass2android-app/Resources/values-az/strings.xml
diff --git a/src/keepass2android/Resources/values-be/strings.xml b/src/keepass2android-app/Resources/values-be/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-be/strings.xml
rename to src/keepass2android-app/Resources/values-be/strings.xml
diff --git a/src/keepass2android/Resources/values-bg-rBG/strings.xml b/src/keepass2android-app/Resources/values-bg-rBG/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-bg-rBG/strings.xml
rename to src/keepass2android-app/Resources/values-bg-rBG/strings.xml
diff --git a/src/keepass2android/Resources/values-bg/strings.xml b/src/keepass2android-app/Resources/values-bg/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-bg/strings.xml
rename to src/keepass2android-app/Resources/values-bg/strings.xml
diff --git a/src/keepass2android/Resources/values-ca/strings.xml b/src/keepass2android-app/Resources/values-ca/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-ca/strings.xml
rename to src/keepass2android-app/Resources/values-ca/strings.xml
diff --git a/src/keepass2android/Resources/values-cs/strings.xml b/src/keepass2android-app/Resources/values-cs/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-cs/strings.xml
rename to src/keepass2android-app/Resources/values-cs/strings.xml
diff --git a/src/keepass2android/Resources/values-da/strings.xml b/src/keepass2android-app/Resources/values-da/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-da/strings.xml
rename to src/keepass2android-app/Resources/values-da/strings.xml
diff --git a/src/keepass2android/Resources/values-de/strings.xml b/src/keepass2android-app/Resources/values-de/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-de/strings.xml
rename to src/keepass2android-app/Resources/values-de/strings.xml
diff --git a/src/keepass2android/Resources/values-el/strings.xml b/src/keepass2android-app/Resources/values-el/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-el/strings.xml
rename to src/keepass2android-app/Resources/values-el/strings.xml
diff --git a/src/keepass2android/Resources/values-en-rGB/strings.xml b/src/keepass2android-app/Resources/values-en-rGB/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-en-rGB/strings.xml
rename to src/keepass2android-app/Resources/values-en-rGB/strings.xml
diff --git a/src/keepass2android/Resources/values-es-rUS/strings.xml b/src/keepass2android-app/Resources/values-es-rUS/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-es-rUS/strings.xml
rename to src/keepass2android-app/Resources/values-es-rUS/strings.xml
diff --git a/src/keepass2android/Resources/values-es/strings.xml b/src/keepass2android-app/Resources/values-es/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-es/strings.xml
rename to src/keepass2android-app/Resources/values-es/strings.xml
diff --git a/src/keepass2android/Resources/values-eu/strings.xml b/src/keepass2android-app/Resources/values-eu/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-eu/strings.xml
rename to src/keepass2android-app/Resources/values-eu/strings.xml
diff --git a/src/keepass2android/Resources/values-fa-rIR/strings.xml b/src/keepass2android-app/Resources/values-fa-rIR/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-fa-rIR/strings.xml
rename to src/keepass2android-app/Resources/values-fa-rIR/strings.xml
diff --git a/src/keepass2android/Resources/values-fa/strings.xml b/src/keepass2android-app/Resources/values-fa/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-fa/strings.xml
rename to src/keepass2android-app/Resources/values-fa/strings.xml
diff --git a/src/keepass2android/Resources/values-fi/strings.xml b/src/keepass2android-app/Resources/values-fi/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-fi/strings.xml
rename to src/keepass2android-app/Resources/values-fi/strings.xml
diff --git a/src/keepass2android/Resources/values-fr/strings.xml b/src/keepass2android-app/Resources/values-fr/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-fr/strings.xml
rename to src/keepass2android-app/Resources/values-fr/strings.xml
diff --git a/src/keepass2android/Resources/values-gl-rES/strings.xml b/src/keepass2android-app/Resources/values-gl-rES/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-gl-rES/strings.xml
rename to src/keepass2android-app/Resources/values-gl-rES/strings.xml
diff --git a/src/keepass2android/Resources/values-gl/strings.xml b/src/keepass2android-app/Resources/values-gl/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-gl/strings.xml
rename to src/keepass2android-app/Resources/values-gl/strings.xml
diff --git a/src/keepass2android/Resources/values-h540dp/dimens.xml b/src/keepass2android-app/Resources/values-h540dp/dimens.xml
similarity index 100%
rename from src/keepass2android/Resources/values-h540dp/dimens.xml
rename to src/keepass2android-app/Resources/values-h540dp/dimens.xml
diff --git a/src/keepass2android/Resources/values-he/strings.xml b/src/keepass2android-app/Resources/values-he/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-he/strings.xml
rename to src/keepass2android-app/Resources/values-he/strings.xml
diff --git a/src/keepass2android/Resources/values-hr-rHR/strings.xml b/src/keepass2android-app/Resources/values-hr-rHR/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-hr-rHR/strings.xml
rename to src/keepass2android-app/Resources/values-hr-rHR/strings.xml
diff --git a/src/keepass2android/Resources/values-hr/strings.xml b/src/keepass2android-app/Resources/values-hr/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-hr/strings.xml
rename to src/keepass2android-app/Resources/values-hr/strings.xml
diff --git a/src/keepass2android/Resources/values-hu/strings.xml b/src/keepass2android-app/Resources/values-hu/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-hu/strings.xml
rename to src/keepass2android-app/Resources/values-hu/strings.xml
diff --git a/src/keepass2android/Resources/values-id/strings.xml b/src/keepass2android-app/Resources/values-id/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-id/strings.xml
rename to src/keepass2android-app/Resources/values-id/strings.xml
diff --git a/src/keepass2android/Resources/values-in/strings.xml b/src/keepass2android-app/Resources/values-in/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-in/strings.xml
rename to src/keepass2android-app/Resources/values-in/strings.xml
diff --git a/src/keepass2android/Resources/values-it/strings.xml b/src/keepass2android-app/Resources/values-it/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-it/strings.xml
rename to src/keepass2android-app/Resources/values-it/strings.xml
diff --git a/src/keepass2android/Resources/values-iw/strings.xml b/src/keepass2android-app/Resources/values-iw/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-iw/strings.xml
rename to src/keepass2android-app/Resources/values-iw/strings.xml
diff --git a/src/keepass2android/Resources/values-ja/strings.xml b/src/keepass2android-app/Resources/values-ja/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-ja/strings.xml
rename to src/keepass2android-app/Resources/values-ja/strings.xml
diff --git a/src/keepass2android/Resources/values-ko/strings.xml b/src/keepass2android-app/Resources/values-ko/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-ko/strings.xml
rename to src/keepass2android-app/Resources/values-ko/strings.xml
diff --git a/src/keepass2android/Resources/values-lt/strings.xml b/src/keepass2android-app/Resources/values-lt/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-lt/strings.xml
rename to src/keepass2android-app/Resources/values-lt/strings.xml
diff --git a/src/keepass2android/Resources/values-lv/strings.xml b/src/keepass2android-app/Resources/values-lv/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-lv/strings.xml
rename to src/keepass2android-app/Resources/values-lv/strings.xml
diff --git a/src/keepass2android/Resources/values-ml/strings.xml b/src/keepass2android-app/Resources/values-ml/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-ml/strings.xml
rename to src/keepass2android-app/Resources/values-ml/strings.xml
diff --git a/src/keepass2android/Resources/values-nb/strings.xml b/src/keepass2android-app/Resources/values-nb/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-nb/strings.xml
rename to src/keepass2android-app/Resources/values-nb/strings.xml
diff --git a/src/keepass2android/Resources/values-night/colors.xml b/src/keepass2android-app/Resources/values-night/colors.xml
similarity index 100%
rename from src/keepass2android/Resources/values-night/colors.xml
rename to src/keepass2android-app/Resources/values-night/colors.xml
diff --git a/src/keepass2android/Resources/values-nl/strings.xml b/src/keepass2android-app/Resources/values-nl/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-nl/strings.xml
rename to src/keepass2android-app/Resources/values-nl/strings.xml
diff --git a/src/keepass2android/Resources/values-nn/strings.xml b/src/keepass2android-app/Resources/values-nn/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-nn/strings.xml
rename to src/keepass2android-app/Resources/values-nn/strings.xml
diff --git a/src/keepass2android/Resources/values-no/strings.xml b/src/keepass2android-app/Resources/values-no/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-no/strings.xml
rename to src/keepass2android-app/Resources/values-no/strings.xml
diff --git a/src/keepass2android/Resources/values-pl/strings.xml b/src/keepass2android-app/Resources/values-pl/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-pl/strings.xml
rename to src/keepass2android-app/Resources/values-pl/strings.xml
diff --git a/src/keepass2android/Resources/values-pt-rBR/strings.xml b/src/keepass2android-app/Resources/values-pt-rBR/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-pt-rBR/strings.xml
rename to src/keepass2android-app/Resources/values-pt-rBR/strings.xml
diff --git a/src/keepass2android/Resources/values-pt-rPT/strings.xml b/src/keepass2android-app/Resources/values-pt-rPT/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-pt-rPT/strings.xml
rename to src/keepass2android-app/Resources/values-pt-rPT/strings.xml
diff --git a/src/keepass2android/Resources/values-pt/strings.xml b/src/keepass2android-app/Resources/values-pt/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-pt/strings.xml
rename to src/keepass2android-app/Resources/values-pt/strings.xml
diff --git a/src/keepass2android/Resources/values-ro/strings.xml b/src/keepass2android-app/Resources/values-ro/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-ro/strings.xml
rename to src/keepass2android-app/Resources/values-ro/strings.xml
diff --git a/src/keepass2android/Resources/values-ru/strings.xml b/src/keepass2android-app/Resources/values-ru/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-ru/strings.xml
rename to src/keepass2android-app/Resources/values-ru/strings.xml
diff --git a/src/keepass2android/Resources/values-si/strings.xml b/src/keepass2android-app/Resources/values-si/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-si/strings.xml
rename to src/keepass2android-app/Resources/values-si/strings.xml
diff --git a/src/keepass2android/Resources/values-sk/strings.xml b/src/keepass2android-app/Resources/values-sk/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-sk/strings.xml
rename to src/keepass2android-app/Resources/values-sk/strings.xml
diff --git a/src/keepass2android/Resources/values-sl/strings.xml b/src/keepass2android-app/Resources/values-sl/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-sl/strings.xml
rename to src/keepass2android-app/Resources/values-sl/strings.xml
diff --git a/src/keepass2android/Resources/values-sr/strings.xml b/src/keepass2android-app/Resources/values-sr/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-sr/strings.xml
rename to src/keepass2android-app/Resources/values-sr/strings.xml
diff --git a/src/keepass2android/Resources/values-sv/strings.xml b/src/keepass2android-app/Resources/values-sv/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-sv/strings.xml
rename to src/keepass2android-app/Resources/values-sv/strings.xml
diff --git a/src/keepass2android/Resources/values-th/strings.xml b/src/keepass2android-app/Resources/values-th/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-th/strings.xml
rename to src/keepass2android-app/Resources/values-th/strings.xml
diff --git a/src/keepass2android/Resources/values-tl/strings.xml b/src/keepass2android-app/Resources/values-tl/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-tl/strings.xml
rename to src/keepass2android-app/Resources/values-tl/strings.xml
diff --git a/src/keepass2android/Resources/values-tr/strings.xml b/src/keepass2android-app/Resources/values-tr/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-tr/strings.xml
rename to src/keepass2android-app/Resources/values-tr/strings.xml
diff --git a/src/keepass2android/Resources/values-uk/strings.xml b/src/keepass2android-app/Resources/values-uk/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-uk/strings.xml
rename to src/keepass2android-app/Resources/values-uk/strings.xml
diff --git a/src/keepass2android/Resources/values-v21/styles.xml b/src/keepass2android-app/Resources/values-v21/styles.xml
similarity index 100%
rename from src/keepass2android/Resources/values-v21/styles.xml
rename to src/keepass2android-app/Resources/values-v21/styles.xml
diff --git a/src/keepass2android/Resources/values-vi/strings.xml b/src/keepass2android-app/Resources/values-vi/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-vi/strings.xml
rename to src/keepass2android-app/Resources/values-vi/strings.xml
diff --git a/src/keepass2android/Resources/values-w360dp/dimens.xml b/src/keepass2android-app/Resources/values-w360dp/dimens.xml
similarity index 100%
rename from src/keepass2android/Resources/values-w360dp/dimens.xml
rename to src/keepass2android-app/Resources/values-w360dp/dimens.xml
diff --git a/src/keepass2android/Resources/values-yo/strings.xml b/src/keepass2android-app/Resources/values-yo/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-yo/strings.xml
rename to src/keepass2android-app/Resources/values-yo/strings.xml
diff --git a/src/keepass2android/Resources/values-zh-rCN/strings.xml b/src/keepass2android-app/Resources/values-zh-rCN/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-zh-rCN/strings.xml
rename to src/keepass2android-app/Resources/values-zh-rCN/strings.xml
diff --git a/src/keepass2android/Resources/values-zh-rTW/strings.xml b/src/keepass2android-app/Resources/values-zh-rTW/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-zh-rTW/strings.xml
rename to src/keepass2android-app/Resources/values-zh-rTW/strings.xml
diff --git a/src/keepass2android/Resources/values-zh/strings.xml b/src/keepass2android-app/Resources/values-zh/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values-zh/strings.xml
rename to src/keepass2android-app/Resources/values-zh/strings.xml
diff --git a/src/keepass2android/Resources/values/attrs.xml b/src/keepass2android-app/Resources/values/attrs.xml
similarity index 100%
rename from src/keepass2android/Resources/values/attrs.xml
rename to src/keepass2android-app/Resources/values/attrs.xml
diff --git a/src/keepass2android/Resources/values/colors_kp2a.xml b/src/keepass2android-app/Resources/values/colors_kp2a.xml
similarity index 100%
rename from src/keepass2android/Resources/values/colors_kp2a.xml
rename to src/keepass2android-app/Resources/values/colors_kp2a.xml
diff --git a/src/keepass2android/Resources/values/config.xml b/src/keepass2android-app/Resources/values/config.xml
similarity index 100%
rename from src/keepass2android/Resources/values/config.xml
rename to src/keepass2android-app/Resources/values/config.xml
diff --git a/src/keepass2android/Resources/values/dimens.xml b/src/keepass2android-app/Resources/values/dimens.xml
similarity index 100%
rename from src/keepass2android/Resources/values/dimens.xml
rename to src/keepass2android-app/Resources/values/dimens.xml
diff --git a/src/keepass2android/Resources/values/fonts.xml b/src/keepass2android-app/Resources/values/fonts.xml
similarity index 100%
rename from src/keepass2android/Resources/values/fonts.xml
rename to src/keepass2android-app/Resources/values/fonts.xml
diff --git a/src/keepass2android/Resources/values/strings.xml b/src/keepass2android-app/Resources/values/strings.xml
similarity index 100%
rename from src/keepass2android/Resources/values/strings.xml
rename to src/keepass2android-app/Resources/values/strings.xml
diff --git a/src/keepass2android/Resources/values/styles.xml b/src/keepass2android-app/Resources/values/styles.xml
similarity index 100%
rename from src/keepass2android/Resources/values/styles.xml
rename to src/keepass2android-app/Resources/values/styles.xml
diff --git a/src/keepass2android/Resources/values/themes.xml b/src/keepass2android-app/Resources/values/themes.xml
similarity index 100%
rename from src/keepass2android/Resources/values/themes.xml
rename to src/keepass2android-app/Resources/values/themes.xml
diff --git a/src/keepass2android/Resources/xml/autofillservice.xml b/src/keepass2android-app/Resources/xml/autofillservice.xml
similarity index 100%
rename from src/keepass2android/Resources/xml/autofillservice.xml
rename to src/keepass2android-app/Resources/xml/autofillservice.xml
diff --git a/src/keepass2android/Resources/xml/method.xml b/src/keepass2android-app/Resources/xml/method.xml
similarity index 100%
rename from src/keepass2android/Resources/xml/method.xml
rename to src/keepass2android-app/Resources/xml/method.xml
diff --git a/src/keepass2android/Resources/xml/network_security_config.xml b/src/keepass2android-app/Resources/xml/network_security_config.xml
similarity index 100%
rename from src/keepass2android/Resources/xml/network_security_config.xml
rename to src/keepass2android-app/Resources/xml/network_security_config.xml
diff --git a/src/keepass2android/Resources/xml/pref_app.xml b/src/keepass2android-app/Resources/xml/pref_app.xml
similarity index 100%
rename from src/keepass2android/Resources/xml/pref_app.xml
rename to src/keepass2android-app/Resources/xml/pref_app.xml
diff --git a/src/keepass2android/Resources/xml/pref_app_debug.xml b/src/keepass2android-app/Resources/xml/pref_app_debug.xml
similarity index 100%
rename from src/keepass2android/Resources/xml/pref_app_debug.xml
rename to src/keepass2android-app/Resources/xml/pref_app_debug.xml
diff --git a/src/keepass2android/Resources/xml/pref_app_display.xml b/src/keepass2android-app/Resources/xml/pref_app_display.xml
similarity index 100%
rename from src/keepass2android/Resources/xml/pref_app_display.xml
rename to src/keepass2android-app/Resources/xml/pref_app_display.xml
diff --git a/src/keepass2android/Resources/xml/pref_app_file_handling.xml b/src/keepass2android-app/Resources/xml/pref_app_file_handling.xml
similarity index 100%
rename from src/keepass2android/Resources/xml/pref_app_file_handling.xml
rename to src/keepass2android-app/Resources/xml/pref_app_file_handling.xml
diff --git a/src/keepass2android/Resources/xml/pref_app_password_access.xml b/src/keepass2android-app/Resources/xml/pref_app_password_access.xml
similarity index 100%
rename from src/keepass2android/Resources/xml/pref_app_password_access.xml
rename to src/keepass2android-app/Resources/xml/pref_app_password_access.xml
diff --git a/src/keepass2android/Resources/xml/pref_app_password_access_autofill.xml b/src/keepass2android-app/Resources/xml/pref_app_password_access_autofill.xml
similarity index 100%
rename from src/keepass2android/Resources/xml/pref_app_password_access_autofill.xml
rename to src/keepass2android-app/Resources/xml/pref_app_password_access_autofill.xml
diff --git a/src/keepass2android/Resources/xml/pref_app_password_access_autofill_totp.xml b/src/keepass2android-app/Resources/xml/pref_app_password_access_autofill_totp.xml
similarity index 100%
rename from src/keepass2android/Resources/xml/pref_app_password_access_autofill_totp.xml
rename to src/keepass2android-app/Resources/xml/pref_app_password_access_autofill_totp.xml
diff --git a/src/keepass2android/Resources/xml/pref_app_password_access_keyboard_switch.xml b/src/keepass2android-app/Resources/xml/pref_app_password_access_keyboard_switch.xml
similarity index 100%
rename from src/keepass2android/Resources/xml/pref_app_password_access_keyboard_switch.xml
rename to src/keepass2android-app/Resources/xml/pref_app_password_access_keyboard_switch.xml
diff --git a/src/keepass2android/Resources/xml/pref_app_quick_unlock.xml b/src/keepass2android-app/Resources/xml/pref_app_quick_unlock.xml
similarity index 100%
rename from src/keepass2android/Resources/xml/pref_app_quick_unlock.xml
rename to src/keepass2android-app/Resources/xml/pref_app_quick_unlock.xml
diff --git a/src/keepass2android/Resources/xml/pref_app_security.xml b/src/keepass2android-app/Resources/xml/pref_app_security.xml
similarity index 100%
rename from src/keepass2android/Resources/xml/pref_app_security.xml
rename to src/keepass2android-app/Resources/xml/pref_app_security.xml
diff --git a/src/keepass2android/Resources/xml/pref_app_traytotp.xml b/src/keepass2android-app/Resources/xml/pref_app_traytotp.xml
similarity index 100%
rename from src/keepass2android/Resources/xml/pref_app_traytotp.xml
rename to src/keepass2android-app/Resources/xml/pref_app_traytotp.xml
diff --git a/src/keepass2android/Resources/xml/pref_database.xml b/src/keepass2android-app/Resources/xml/pref_database.xml
similarity index 100%
rename from src/keepass2android/Resources/xml/pref_database.xml
rename to src/keepass2android-app/Resources/xml/pref_database.xml
diff --git a/src/keepass2android/Resources/xml/pref_database_key_deriv_func.xml b/src/keepass2android-app/Resources/xml/pref_database_key_deriv_func.xml
similarity index 100%
rename from src/keepass2android/Resources/xml/pref_database_key_deriv_func.xml
rename to src/keepass2android-app/Resources/xml/pref_database_key_deriv_func.xml
diff --git a/src/keepass2android/Resources/xml/preferences.xml b/src/keepass2android-app/Resources/xml/preferences.xml
similarity index 100%
rename from src/keepass2android/Resources/xml/preferences.xml
rename to src/keepass2android-app/Resources/xml/preferences.xml
diff --git a/src/keepass2android/Resources/xml/searchable.xml b/src/keepass2android-app/Resources/xml/searchable.xml
similarity index 100%
rename from src/keepass2android/Resources/xml/searchable.xml
rename to src/keepass2android-app/Resources/xml/searchable.xml
diff --git a/src/keepass2android/Resources/xml/searchable_debug.xml b/src/keepass2android-app/Resources/xml/searchable_debug.xml
similarity index 100%
rename from src/keepass2android/Resources/xml/searchable_debug.xml
rename to src/keepass2android-app/Resources/xml/searchable_debug.xml
diff --git a/src/keepass2android/Resources/xml/searchable_mattest.xml b/src/keepass2android-app/Resources/xml/searchable_mattest.xml
similarity index 100%
rename from src/keepass2android/Resources/xml/searchable_mattest.xml
rename to src/keepass2android-app/Resources/xml/searchable_mattest.xml
diff --git a/src/keepass2android/Resources/xml/searchable_offline.xml b/src/keepass2android-app/Resources/xml/searchable_offline.xml
similarity index 100%
rename from src/keepass2android/Resources/xml/searchable_offline.xml
rename to src/keepass2android-app/Resources/xml/searchable_offline.xml
diff --git a/src/keepass2android/SelectCurrentDbActivity.cs b/src/keepass2android-app/SelectCurrentDbActivity.cs
similarity index 100%
rename from src/keepass2android/SelectCurrentDbActivity.cs
rename to src/keepass2android-app/SelectCurrentDbActivity.cs
diff --git a/src/keepass2android/SelectStorageLocationActivity.cs b/src/keepass2android-app/SelectStorageLocationActivity.cs
similarity index 100%
rename from src/keepass2android/SelectStorageLocationActivity.cs
rename to src/keepass2android-app/SelectStorageLocationActivity.cs
diff --git a/src/keepass2android/SetPasswordDialog.cs b/src/keepass2android-app/SetPasswordDialog.cs
similarity index 100%
rename from src/keepass2android/SetPasswordDialog.cs
rename to src/keepass2android-app/SetPasswordDialog.cs
diff --git a/src/keepass2android/ShareUrlResults.cs b/src/keepass2android-app/ShareUrlResults.cs
similarity index 100%
rename from src/keepass2android/ShareUrlResults.cs
rename to src/keepass2android-app/ShareUrlResults.cs
diff --git a/src/keepass2android/SwitchImeActivity.cs b/src/keepass2android-app/SwitchImeActivity.cs
similarity index 100%
rename from src/keepass2android/SwitchImeActivity.cs
rename to src/keepass2android-app/SwitchImeActivity.cs
diff --git a/src/keepass2android/SyncUtil.cs b/src/keepass2android-app/SyncUtil.cs
similarity index 100%
rename from src/keepass2android/SyncUtil.cs
rename to src/keepass2android-app/SyncUtil.cs
diff --git a/src/keepass2android/Totp/Base32.cs b/src/keepass2android-app/Totp/Base32.cs
similarity index 100%
rename from src/keepass2android/Totp/Base32.cs
rename to src/keepass2android-app/Totp/Base32.cs
diff --git a/src/keepass2android/Totp/ITotpPluginAdapter.cs b/src/keepass2android-app/Totp/ITotpPluginAdapter.cs
similarity index 100%
rename from src/keepass2android/Totp/ITotpPluginAdapter.cs
rename to src/keepass2android-app/Totp/ITotpPluginAdapter.cs
diff --git a/src/keepass2android/Totp/KeeOtpPluginAdapter.cs b/src/keepass2android-app/Totp/KeeOtpPluginAdapter.cs
similarity index 100%
rename from src/keepass2android/Totp/KeeOtpPluginAdapter.cs
rename to src/keepass2android-app/Totp/KeeOtpPluginAdapter.cs
diff --git a/src/keepass2android/Totp/KeeWebOtpPluginAdapter.cs b/src/keepass2android-app/Totp/KeeWebOtpPluginAdapter.cs
similarity index 100%
rename from src/keepass2android/Totp/KeeWebOtpPluginAdapter.cs
rename to src/keepass2android-app/Totp/KeeWebOtpPluginAdapter.cs
diff --git a/src/keepass2android/Totp/Keepass2TotpPluginAdapter.cs b/src/keepass2android-app/Totp/Keepass2TotpPluginAdapter.cs
similarity index 100%
rename from src/keepass2android/Totp/Keepass2TotpPluginAdapter.cs
rename to src/keepass2android-app/Totp/Keepass2TotpPluginAdapter.cs
diff --git a/src/keepass2android/Totp/Kp2aTotp.cs b/src/keepass2android-app/Totp/Kp2aTotp.cs
similarity index 100%
rename from src/keepass2android/Totp/Kp2aTotp.cs
rename to src/keepass2android-app/Totp/Kp2aTotp.cs
diff --git a/src/keepass2android/Totp/TOTPEncoder.cs b/src/keepass2android-app/Totp/TOTPEncoder.cs
similarity index 100%
rename from src/keepass2android/Totp/TOTPEncoder.cs
rename to src/keepass2android-app/Totp/TOTPEncoder.cs
diff --git a/src/keepass2android/Totp/TOTPProvider.cs b/src/keepass2android-app/Totp/TOTPProvider.cs
similarity index 100%
rename from src/keepass2android/Totp/TOTPProvider.cs
rename to src/keepass2android-app/Totp/TOTPProvider.cs
diff --git a/src/keepass2android/Totp/TimeCorrectionProvider.cs b/src/keepass2android-app/Totp/TimeCorrectionProvider.cs
similarity index 100%
rename from src/keepass2android/Totp/TimeCorrectionProvider.cs
rename to src/keepass2android-app/Totp/TimeCorrectionProvider.cs
diff --git a/src/keepass2android/Totp/TotpData.cs b/src/keepass2android-app/Totp/TotpData.cs
similarity index 100%
rename from src/keepass2android/Totp/TotpData.cs
rename to src/keepass2android-app/Totp/TotpData.cs
diff --git a/src/keepass2android/Totp/TrayTotpPluginAdapter.cs b/src/keepass2android-app/Totp/TrayTotpPluginAdapter.cs
similarity index 100%
rename from src/keepass2android/Totp/TrayTotpPluginAdapter.cs
rename to src/keepass2android-app/Totp/TrayTotpPluginAdapter.cs
diff --git a/src/keepass2android/Totp/UpdateTotpTimerTask.cs b/src/keepass2android-app/Totp/UpdateTotpTimerTask.cs
similarity index 100%
rename from src/keepass2android/Totp/UpdateTotpTimerTask.cs
rename to src/keepass2android-app/Totp/UpdateTotpTimerTask.cs
diff --git a/src/keepass2android/Utils/ActivityDesign.cs b/src/keepass2android-app/Utils/ActivityDesign.cs
similarity index 100%
rename from src/keepass2android/Utils/ActivityDesign.cs
rename to src/keepass2android-app/Utils/ActivityDesign.cs
diff --git a/src/keepass2android/Utils/LoadingDialog.cs b/src/keepass2android-app/Utils/LoadingDialog.cs
similarity index 100%
rename from src/keepass2android/Utils/LoadingDialog.cs
rename to src/keepass2android-app/Utils/LoadingDialog.cs
diff --git a/src/keepass2android/Utils/Util.cs b/src/keepass2android-app/Utils/Util.cs
similarity index 100%
rename from src/keepass2android/Utils/Util.cs
rename to src/keepass2android-app/Utils/Util.cs
diff --git a/src/keepass2android/Wordlist.cs b/src/keepass2android-app/Wordlist.cs
similarity index 100%
rename from src/keepass2android/Wordlist.cs
rename to src/keepass2android-app/Wordlist.cs
diff --git a/src/keepass2android/addons/CsvStreamReaderEx.cs b/src/keepass2android-app/addons/CsvStreamReaderEx.cs
similarity index 100%
rename from src/keepass2android/addons/CsvStreamReaderEx.cs
rename to src/keepass2android-app/addons/CsvStreamReaderEx.cs
diff --git a/src/keepass2android/addons/OtpKeyProv/EncodingUtil.cs b/src/keepass2android-app/addons/OtpKeyProv/EncodingUtil.cs
similarity index 100%
rename from src/keepass2android/addons/OtpKeyProv/EncodingUtil.cs
rename to src/keepass2android-app/addons/OtpKeyProv/EncodingUtil.cs
diff --git a/src/keepass2android/addons/OtpKeyProv/OathHotpKeyProv.cs b/src/keepass2android-app/addons/OtpKeyProv/OathHotpKeyProv.cs
similarity index 100%
rename from src/keepass2android/addons/OtpKeyProv/OathHotpKeyProv.cs
rename to src/keepass2android-app/addons/OtpKeyProv/OathHotpKeyProv.cs
diff --git a/src/keepass2android/addons/OtpKeyProv/OtpAuxCachingFileStorage.cs b/src/keepass2android-app/addons/OtpKeyProv/OtpAuxCachingFileStorage.cs
similarity index 100%
rename from src/keepass2android/addons/OtpKeyProv/OtpAuxCachingFileStorage.cs
rename to src/keepass2android-app/addons/OtpKeyProv/OtpAuxCachingFileStorage.cs
diff --git a/src/keepass2android/addons/OtpKeyProv/OtpInfo.cs b/src/keepass2android-app/addons/OtpKeyProv/OtpInfo.cs
similarity index 100%
rename from src/keepass2android/addons/OtpKeyProv/OtpInfo.cs
rename to src/keepass2android-app/addons/OtpKeyProv/OtpInfo.cs
diff --git a/src/keepass2android/addons/OtpKeyProv/OtpUtil.cs b/src/keepass2android-app/addons/OtpKeyProv/OtpUtil.cs
similarity index 100%
rename from src/keepass2android/addons/OtpKeyProv/OtpUtil.cs
rename to src/keepass2android-app/addons/OtpKeyProv/OtpUtil.cs
diff --git a/src/keepass2android/app.config b/src/keepass2android-app/app.config
similarity index 100%
rename from src/keepass2android/app.config
rename to src/keepass2android-app/app.config
diff --git a/src/keepass2android/app/App.cs b/src/keepass2android-app/app/App.cs
similarity index 100%
rename from src/keepass2android/app/App.cs
rename to src/keepass2android-app/app/App.cs
diff --git a/src/keepass2android/app/AppTask.cs b/src/keepass2android-app/app/AppTask.cs
similarity index 100%
rename from src/keepass2android/app/AppTask.cs
rename to src/keepass2android-app/app/AppTask.cs
diff --git a/src/keepass2android/app/ApplicationBroadcastReceiver.cs b/src/keepass2android-app/app/ApplicationBroadcastReceiver.cs
similarity index 100%
rename from src/keepass2android/app/ApplicationBroadcastReceiver.cs
rename to src/keepass2android-app/app/ApplicationBroadcastReceiver.cs
diff --git a/src/keepass2android/app/NoFileStorageFoundException.cs b/src/keepass2android-app/app/NoFileStorageFoundException.cs
similarity index 100%
rename from src/keepass2android/app/NoFileStorageFoundException.cs
rename to src/keepass2android-app/app/NoFileStorageFoundException.cs
diff --git a/src/keepass2android/app/OtpAuxCacheSupervisor.cs b/src/keepass2android-app/app/OtpAuxCacheSupervisor.cs
similarity index 100%
rename from src/keepass2android/app/OtpAuxCacheSupervisor.cs
rename to src/keepass2android-app/app/OtpAuxCacheSupervisor.cs
diff --git a/src/keepass2android/compat/ActivityCompat.cs b/src/keepass2android-app/compat/ActivityCompat.cs
similarity index 100%
rename from src/keepass2android/compat/ActivityCompat.cs
rename to src/keepass2android-app/compat/ActivityCompat.cs
diff --git a/src/keepass2android/compat/EditorCompat.cs b/src/keepass2android-app/compat/EditorCompat.cs
similarity index 100%
rename from src/keepass2android/compat/EditorCompat.cs
rename to src/keepass2android-app/compat/EditorCompat.cs
diff --git a/src/keepass2android/fileselect/FileChooserFileProvider.cs b/src/keepass2android-app/fileselect/FileChooserFileProvider.cs
similarity index 100%
rename from src/keepass2android/fileselect/FileChooserFileProvider.cs
rename to src/keepass2android-app/fileselect/FileChooserFileProvider.cs
diff --git a/src/keepass2android/fileselect/FileDbHelper.cs b/src/keepass2android-app/fileselect/FileDbHelper.cs
similarity index 100%
rename from src/keepass2android/fileselect/FileDbHelper.cs
rename to src/keepass2android-app/fileselect/FileDbHelper.cs
diff --git a/src/keepass2android/fileselect/FileSelectActivity.cs b/src/keepass2android-app/fileselect/FileSelectActivity.cs
similarity index 100%
rename from src/keepass2android/fileselect/FileSelectActivity.cs
rename to src/keepass2android-app/fileselect/FileSelectActivity.cs
diff --git a/src/keepass2android/fileselect/FileStorageSetupActivity.cs b/src/keepass2android-app/fileselect/FileStorageSetupActivity.cs
similarity index 100%
rename from src/keepass2android/fileselect/FileStorageSetupActivity.cs
rename to src/keepass2android-app/fileselect/FileStorageSetupActivity.cs
diff --git a/src/keepass2android/fileselect/FileStorageSetupInitiatorActivity.cs b/src/keepass2android-app/fileselect/FileStorageSetupInitiatorActivity.cs
similarity index 100%
rename from src/keepass2android/fileselect/FileStorageSetupInitiatorActivity.cs
rename to src/keepass2android-app/fileselect/FileStorageSetupInitiatorActivity.cs
diff --git a/src/keepass2android/fileselect/FilteredCursor.cs b/src/keepass2android-app/fileselect/FilteredCursor.cs
similarity index 100%
rename from src/keepass2android/fileselect/FilteredCursor.cs
rename to src/keepass2android-app/fileselect/FilteredCursor.cs
diff --git a/src/keepass2android/icons/DrawableFactory.cs b/src/keepass2android-app/icons/DrawableFactory.cs
similarity index 100%
rename from src/keepass2android/icons/DrawableFactory.cs
rename to src/keepass2android-app/icons/DrawableFactory.cs
diff --git a/src/keepass2android/intents/Intents.cs b/src/keepass2android-app/intents/Intents.cs
similarity index 100%
rename from src/keepass2android/intents/Intents.cs
rename to src/keepass2android-app/intents/Intents.cs
diff --git a/src/keepass2android/keepass2android-app.csproj b/src/keepass2android-app/keepass2android-app.csproj
similarity index 100%
rename from src/keepass2android/keepass2android-app.csproj
rename to src/keepass2android-app/keepass2android-app.csproj
diff --git a/src/keepass2android/password/PasswordGenerator.cs b/src/keepass2android-app/password/PasswordGenerator.cs
similarity index 100%
rename from src/keepass2android/password/PasswordGenerator.cs
rename to src/keepass2android-app/password/PasswordGenerator.cs
diff --git a/src/keepass2android/pluginhost/PluginArrayAdapter.cs b/src/keepass2android-app/pluginhost/PluginArrayAdapter.cs
similarity index 100%
rename from src/keepass2android/pluginhost/PluginArrayAdapter.cs
rename to src/keepass2android-app/pluginhost/PluginArrayAdapter.cs
diff --git a/src/keepass2android/pluginhost/PluginDatabase.cs b/src/keepass2android-app/pluginhost/PluginDatabase.cs
similarity index 100%
rename from src/keepass2android/pluginhost/PluginDatabase.cs
rename to src/keepass2android-app/pluginhost/PluginDatabase.cs
diff --git a/src/keepass2android/pluginhost/PluginDetailsActivity.cs b/src/keepass2android-app/pluginhost/PluginDetailsActivity.cs
similarity index 100%
rename from src/keepass2android/pluginhost/PluginDetailsActivity.cs
rename to src/keepass2android-app/pluginhost/PluginDetailsActivity.cs
diff --git a/src/keepass2android/pluginhost/PluginHost.cs b/src/keepass2android-app/pluginhost/PluginHost.cs
similarity index 100%
rename from src/keepass2android/pluginhost/PluginHost.cs
rename to src/keepass2android-app/pluginhost/PluginHost.cs
diff --git a/src/keepass2android/pluginhost/PluginListActivity.cs b/src/keepass2android-app/pluginhost/PluginListActivity.cs
similarity index 100%
rename from src/keepass2android/pluginhost/PluginListActivity.cs
rename to src/keepass2android-app/pluginhost/PluginListActivity.cs
diff --git a/src/keepass2android/proguard.cfg b/src/keepass2android-app/proguard.cfg
similarity index 100%
rename from src/keepass2android/proguard.cfg
rename to src/keepass2android-app/proguard.cfg
diff --git a/src/keepass2android/search/SearchActivity.cs b/src/keepass2android-app/search/SearchActivity.cs
similarity index 100%
rename from src/keepass2android/search/SearchActivity.cs
rename to src/keepass2android-app/search/SearchActivity.cs
diff --git a/src/keepass2android/search/SearchProvider.cs b/src/keepass2android-app/search/SearchProvider.cs
similarity index 100%
rename from src/keepass2android/search/SearchProvider.cs
rename to src/keepass2android-app/search/SearchProvider.cs
diff --git a/src/keepass2android/search/SearchResults.cs b/src/keepass2android-app/search/SearchResults.cs
similarity index 100%
rename from src/keepass2android/search/SearchResults.cs
rename to src/keepass2android-app/search/SearchResults.cs
diff --git a/src/keepass2android/search/SearchTotpResults.cs b/src/keepass2android-app/search/SearchTotpResults.cs
similarity index 100%
rename from src/keepass2android/search/SearchTotpResults.cs
rename to src/keepass2android-app/search/SearchTotpResults.cs
diff --git a/src/keepass2android/services/AutofillBase/AutofillFieldMetadata.cs b/src/keepass2android-app/services/AutofillBase/AutofillFieldMetadata.cs
similarity index 100%
rename from src/keepass2android/services/AutofillBase/AutofillFieldMetadata.cs
rename to src/keepass2android-app/services/AutofillBase/AutofillFieldMetadata.cs
diff --git a/src/keepass2android/services/AutofillBase/AutofillFieldMetadataCollection.cs b/src/keepass2android-app/services/AutofillBase/AutofillFieldMetadataCollection.cs
similarity index 100%
rename from src/keepass2android/services/AutofillBase/AutofillFieldMetadataCollection.cs
rename to src/keepass2android-app/services/AutofillBase/AutofillFieldMetadataCollection.cs
diff --git a/src/keepass2android/services/AutofillBase/AutofillHelper.cs b/src/keepass2android-app/services/AutofillBase/AutofillHelper.cs
similarity index 100%
rename from src/keepass2android/services/AutofillBase/AutofillHelper.cs
rename to src/keepass2android-app/services/AutofillBase/AutofillHelper.cs
diff --git a/src/keepass2android/services/AutofillBase/AutofillHintsHelper.cs b/src/keepass2android-app/services/AutofillBase/AutofillHintsHelper.cs
similarity index 100%
rename from src/keepass2android/services/AutofillBase/AutofillHintsHelper.cs
rename to src/keepass2android-app/services/AutofillBase/AutofillHintsHelper.cs
diff --git a/src/keepass2android/services/AutofillBase/AutofillServiceBase.cs b/src/keepass2android-app/services/AutofillBase/AutofillServiceBase.cs
similarity index 100%
rename from src/keepass2android/services/AutofillBase/AutofillServiceBase.cs
rename to src/keepass2android-app/services/AutofillBase/AutofillServiceBase.cs
diff --git a/src/keepass2android/services/AutofillBase/ChooseForAutofillActivityBase.cs b/src/keepass2android-app/services/AutofillBase/ChooseForAutofillActivityBase.cs
similarity index 100%
rename from src/keepass2android/services/AutofillBase/ChooseForAutofillActivityBase.cs
rename to src/keepass2android-app/services/AutofillBase/ChooseForAutofillActivityBase.cs
diff --git a/src/keepass2android/services/AutofillBase/CommonUtil.cs b/src/keepass2android-app/services/AutofillBase/CommonUtil.cs
similarity index 100%
rename from src/keepass2android/services/AutofillBase/CommonUtil.cs
rename to src/keepass2android-app/services/AutofillBase/CommonUtil.cs
diff --git a/src/keepass2android/services/AutofillBase/DomainParser.cs b/src/keepass2android-app/services/AutofillBase/DomainParser.cs
similarity index 100%
rename from src/keepass2android/services/AutofillBase/DomainParser.cs
rename to src/keepass2android-app/services/AutofillBase/DomainParser.cs
diff --git a/src/keepass2android/services/AutofillBase/Kp2aDigitalAssetLinksDataSource.cs b/src/keepass2android-app/services/AutofillBase/Kp2aDigitalAssetLinksDataSource.cs
similarity index 100%
rename from src/keepass2android/services/AutofillBase/Kp2aDigitalAssetLinksDataSource.cs
rename to src/keepass2android-app/services/AutofillBase/Kp2aDigitalAssetLinksDataSource.cs
diff --git a/src/keepass2android/services/AutofillBase/StructureParser.cs b/src/keepass2android-app/services/AutofillBase/StructureParser.cs
similarity index 100%
rename from src/keepass2android/services/AutofillBase/StructureParser.cs
rename to src/keepass2android-app/services/AutofillBase/StructureParser.cs
diff --git a/src/keepass2android/services/AutofillBase/model/FilledAutofillField.cs b/src/keepass2android-app/services/AutofillBase/model/FilledAutofillField.cs
similarity index 100%
rename from src/keepass2android/services/AutofillBase/model/FilledAutofillField.cs
rename to src/keepass2android-app/services/AutofillBase/model/FilledAutofillField.cs
diff --git a/src/keepass2android/services/AutofillBase/model/FilledAutofillFieldCollection.cs b/src/keepass2android-app/services/AutofillBase/model/FilledAutofillFieldCollection.cs
similarity index 100%
rename from src/keepass2android/services/AutofillBase/model/FilledAutofillFieldCollection.cs
rename to src/keepass2android-app/services/AutofillBase/model/FilledAutofillFieldCollection.cs
diff --git a/src/keepass2android/services/AutofillBase/model/W3cHints.cs b/src/keepass2android-app/services/AutofillBase/model/W3cHints.cs
similarity index 100%
rename from src/keepass2android/services/AutofillBase/model/W3cHints.cs
rename to src/keepass2android-app/services/AutofillBase/model/W3cHints.cs
diff --git a/src/keepass2android/services/CopyToClipboardService.cs b/src/keepass2android-app/services/CopyToClipboardService.cs
similarity index 100%
rename from src/keepass2android/services/CopyToClipboardService.cs
rename to src/keepass2android-app/services/CopyToClipboardService.cs
diff --git a/src/keepass2android/services/Kp2aAutofill/ChooseForAutofillActivity.cs b/src/keepass2android-app/services/Kp2aAutofill/ChooseForAutofillActivity.cs
similarity index 100%
rename from src/keepass2android/services/Kp2aAutofill/ChooseForAutofillActivity.cs
rename to src/keepass2android-app/services/Kp2aAutofill/ChooseForAutofillActivity.cs
diff --git a/src/keepass2android/services/Kp2aAutofill/Kp2aAutofillService.cs b/src/keepass2android-app/services/Kp2aAutofill/Kp2aAutofillService.cs
similarity index 100%
rename from src/keepass2android/services/Kp2aAutofill/Kp2aAutofillService.cs
rename to src/keepass2android-app/services/Kp2aAutofill/Kp2aAutofillService.cs
diff --git a/src/keepass2android/services/Kp2aAutofillIntentBuilder.cs b/src/keepass2android-app/services/Kp2aAutofillIntentBuilder.cs
similarity index 100%
rename from src/keepass2android/services/Kp2aAutofillIntentBuilder.cs
rename to src/keepass2android-app/services/Kp2aAutofillIntentBuilder.cs
diff --git a/src/keepass2android/services/OngoingNotificationsService.cs b/src/keepass2android-app/services/OngoingNotificationsService.cs
similarity index 100%
rename from src/keepass2android/services/OngoingNotificationsService.cs
rename to src/keepass2android-app/services/OngoingNotificationsService.cs
diff --git a/src/keepass2android/settings/AppSettingsActivity.cs b/src/keepass2android-app/settings/AppSettingsActivity.cs
similarity index 100%
rename from src/keepass2android/settings/AppSettingsActivity.cs
rename to src/keepass2android-app/settings/AppSettingsActivity.cs
diff --git a/src/keepass2android/settings/Argon2Preference.cs b/src/keepass2android-app/settings/Argon2Preference.cs
similarity index 100%
rename from src/keepass2android/settings/Argon2Preference.cs
rename to src/keepass2android-app/settings/Argon2Preference.cs
diff --git a/src/keepass2android/settings/AutofillDisabledQueriesPreference.cs b/src/keepass2android-app/settings/AutofillDisabledQueriesPreference.cs
similarity index 100%
rename from src/keepass2android/settings/AutofillDisabledQueriesPreference.cs
rename to src/keepass2android-app/settings/AutofillDisabledQueriesPreference.cs
diff --git a/src/keepass2android/settings/DatabaseSettingsActivity.cs b/src/keepass2android-app/settings/DatabaseSettingsActivity.cs
similarity index 100%
rename from src/keepass2android/settings/DatabaseSettingsActivity.cs
rename to src/keepass2android-app/settings/DatabaseSettingsActivity.cs
diff --git a/src/keepass2android/settings/ExportKeyfileActivity.cs b/src/keepass2android-app/settings/ExportKeyfileActivity.cs
similarity index 100%
rename from src/keepass2android/settings/ExportKeyfileActivity.cs
rename to src/keepass2android-app/settings/ExportKeyfileActivity.cs
diff --git a/src/keepass2android/settings/IconSetPreference.cs b/src/keepass2android-app/settings/IconSetPreference.cs
similarity index 100%
rename from src/keepass2android/settings/IconSetPreference.cs
rename to src/keepass2android-app/settings/IconSetPreference.cs
diff --git a/src/keepass2android/settings/PrefsUtil.cs b/src/keepass2android-app/settings/PrefsUtil.cs
similarity index 100%
rename from src/keepass2android/settings/PrefsUtil.cs
rename to src/keepass2android-app/settings/PrefsUtil.cs
diff --git a/src/keepass2android/settings/RoundsPreference.cs b/src/keepass2android-app/settings/RoundsPreference.cs
similarity index 100%
rename from src/keepass2android/settings/RoundsPreference.cs
rename to src/keepass2android-app/settings/RoundsPreference.cs
diff --git a/src/keepass2android/timeout/TimeoutHelper.cs b/src/keepass2android-app/timeout/TimeoutHelper.cs
similarity index 100%
rename from src/keepass2android/timeout/TimeoutHelper.cs
rename to src/keepass2android-app/timeout/TimeoutHelper.cs
diff --git a/src/keepass2android/views/ClickView.cs b/src/keepass2android-app/views/ClickView.cs
similarity index 100%
rename from src/keepass2android/views/ClickView.cs
rename to src/keepass2android-app/views/ClickView.cs
diff --git a/src/keepass2android/views/EntryContentsView.cs b/src/keepass2android-app/views/EntryContentsView.cs
similarity index 100%
rename from src/keepass2android/views/EntryContentsView.cs
rename to src/keepass2android-app/views/EntryContentsView.cs
diff --git a/src/keepass2android/views/EntrySection.cs b/src/keepass2android-app/views/EntrySection.cs
similarity index 100%
rename from src/keepass2android/views/EntrySection.cs
rename to src/keepass2android-app/views/EntrySection.cs
diff --git a/src/keepass2android/views/GroupListItemView.cs b/src/keepass2android-app/views/GroupListItemView.cs
similarity index 100%
rename from src/keepass2android/views/GroupListItemView.cs
rename to src/keepass2android-app/views/GroupListItemView.cs
diff --git a/src/keepass2android/views/Kp2aShortHelpView.cs b/src/keepass2android-app/views/Kp2aShortHelpView.cs
similarity index 100%
rename from src/keepass2android/views/Kp2aShortHelpView.cs
rename to src/keepass2android-app/views/Kp2aShortHelpView.cs
diff --git a/src/keepass2android/views/PwEntryView.cs b/src/keepass2android-app/views/PwEntryView.cs
similarity index 100%
rename from src/keepass2android/views/PwEntryView.cs
rename to src/keepass2android-app/views/PwEntryView.cs
diff --git a/src/keepass2android/views/PwGroupView.cs b/src/keepass2android-app/views/PwGroupView.cs
similarity index 100%
rename from src/keepass2android/views/PwGroupView.cs
rename to src/keepass2android-app/views/PwGroupView.cs
diff --git a/src/keepass2android/views/TextViewSelect.cs b/src/keepass2android-app/views/TextViewSelect.cs
similarity index 100%
rename from src/keepass2android/views/TextViewSelect.cs
rename to src/keepass2android-app/views/TextViewSelect.cs
diff --git a/src/keepass2android/views/TextWithHelp.cs b/src/keepass2android-app/views/TextWithHelp.cs
similarity index 100%
rename from src/keepass2android/views/TextWithHelp.cs
rename to src/keepass2android-app/views/TextWithHelp.cs