diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e5c7d47..e061ed5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,26 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="net.micode.notes"
-    android:versionCode="1"
-    android:versionName="0.1" >
-
-    <uses-sdk android:minSdkVersion="14" />
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
@@ -33,8 +13,16 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
     <application
-        android:icon="@drawable/icon_app"
-        android:label="@string/app_name" >
+        android:allowBackup="true"
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:fullBackupContent="@xml/backup_rules"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.Notesmaster"
+        tools:targetApi="31">
+
         <activity
             android:name=".ui.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -42,7 +30,8 @@
             android:launchMode="singleTop"
             android:theme="@style/NoteTheme"
             android:uiOptions="splitActionBarWhenNarrow"
-            android:windowSoftInputMode="adjustPan" >
+            android:windowSoftInputMode="adjustPan"
+            android:exported="true">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -54,7 +43,8 @@
             android:name=".ui.NoteEditActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="singleTop"
-            android:theme="@style/NoteTheme" >
+            android:theme="@style/NoteTheme"
+            android:exported="true">
 
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -80,6 +70,7 @@
                 android:resource="@xml/searchable" />
         </activity>
 
+
         <provider
             android:name="net.micode.notes.data.NotesProvider"
             android:authorities="micode_notes"
@@ -87,7 +78,8 @@
 
         <receiver
             android:name=".widget.NoteWidgetProvider_2x"
-            android:label="@string/app_widget2x2" >
+            android:label="@string/app_widget2x2"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
                 <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
@@ -100,7 +92,8 @@
         </receiver>
         <receiver
             android:name=".widget.NoteWidgetProvider_4x"
-            android:label="@string/app_widget4x4" >
+            android:label="@string/app_widget4x4"
+            android:exported="true">
 
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -113,7 +106,8 @@
                 android:resource="@xml/widget_4x_info" />
         </receiver>
 
-        <receiver android:name=".ui.AlarmInitReceiver" >
+        <receiver android:name=".ui.AlarmInitReceiver"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
@@ -146,5 +140,17 @@
         <meta-data
             android:name="android.app.default_searchable"
             android:value=".ui.NoteEditActivity" />
+
+        <!--        <activity-->
+        <!--            android:name=".MainActivity"-->
+        <!--            android:exported="true">-->
+        <!--            <intent-filter>-->
+        <!--                <action android:name="android.intent.action.MAIN" />-->
+
+        <!--                <category android:name="android.intent.category.LAUNCHER" />-->
+        <!--            </intent-filter>-->
+        <!--        </activity>-->
+
     </application>
-</manifest>
+
+</manifest>
\ No newline at end of file
diff --git a/src/net/micode/notes/data/Contact.java b/java/src/net/micode/notes/data/Contact.java
similarity index 100%
rename from src/net/micode/notes/data/Contact.java
rename to java/src/net/micode/notes/data/Contact.java
diff --git a/src/net/micode/notes/data/Notes.java b/java/src/net/micode/notes/data/Notes.java
similarity index 100%
rename from src/net/micode/notes/data/Notes.java
rename to java/src/net/micode/notes/data/Notes.java
diff --git a/src/net/micode/notes/data/NotesDatabaseHelper.java b/java/src/net/micode/notes/data/NotesDatabaseHelper.java
similarity index 100%
rename from src/net/micode/notes/data/NotesDatabaseHelper.java
rename to java/src/net/micode/notes/data/NotesDatabaseHelper.java
diff --git a/src/net/micode/notes/data/NotesProvider.java b/java/src/net/micode/notes/data/NotesProvider.java
similarity index 100%
rename from src/net/micode/notes/data/NotesProvider.java
rename to java/src/net/micode/notes/data/NotesProvider.java
diff --git a/src/net/micode/notes/gtask/data/MetaData.java b/java/src/net/micode/notes/gtask/data/MetaData.java
similarity index 100%
rename from src/net/micode/notes/gtask/data/MetaData.java
rename to java/src/net/micode/notes/gtask/data/MetaData.java
diff --git a/src/net/micode/notes/gtask/data/Node.java b/java/src/net/micode/notes/gtask/data/Node.java
similarity index 100%
rename from src/net/micode/notes/gtask/data/Node.java
rename to java/src/net/micode/notes/gtask/data/Node.java
diff --git a/src/net/micode/notes/gtask/data/SqlData.java b/java/src/net/micode/notes/gtask/data/SqlData.java
similarity index 100%
rename from src/net/micode/notes/gtask/data/SqlData.java
rename to java/src/net/micode/notes/gtask/data/SqlData.java
diff --git a/src/net/micode/notes/gtask/data/SqlNote.java b/java/src/net/micode/notes/gtask/data/SqlNote.java
similarity index 100%
rename from src/net/micode/notes/gtask/data/SqlNote.java
rename to java/src/net/micode/notes/gtask/data/SqlNote.java
diff --git a/src/net/micode/notes/gtask/data/Task.java b/java/src/net/micode/notes/gtask/data/Task.java
similarity index 100%
rename from src/net/micode/notes/gtask/data/Task.java
rename to java/src/net/micode/notes/gtask/data/Task.java
diff --git a/src/net/micode/notes/gtask/data/TaskList.java b/java/src/net/micode/notes/gtask/data/TaskList.java
similarity index 100%
rename from src/net/micode/notes/gtask/data/TaskList.java
rename to java/src/net/micode/notes/gtask/data/TaskList.java
diff --git a/src/net/micode/notes/gtask/exception/ActionFailureException.java b/java/src/net/micode/notes/gtask/exception/ActionFailureException.java
similarity index 100%
rename from src/net/micode/notes/gtask/exception/ActionFailureException.java
rename to java/src/net/micode/notes/gtask/exception/ActionFailureException.java
diff --git a/src/net/micode/notes/gtask/exception/NetworkFailureException.java b/java/src/net/micode/notes/gtask/exception/NetworkFailureException.java
similarity index 100%
rename from src/net/micode/notes/gtask/exception/NetworkFailureException.java
rename to java/src/net/micode/notes/gtask/exception/NetworkFailureException.java
diff --git a/src/net/micode/notes/gtask/remote/GTaskASyncTask.java b/java/src/net/micode/notes/gtask/remote/GTaskASyncTask.java
similarity index 100%
rename from src/net/micode/notes/gtask/remote/GTaskASyncTask.java
rename to java/src/net/micode/notes/gtask/remote/GTaskASyncTask.java
diff --git a/src/net/micode/notes/gtask/remote/GTaskClient.java b/java/src/net/micode/notes/gtask/remote/GTaskClient.java
similarity index 100%
rename from src/net/micode/notes/gtask/remote/GTaskClient.java
rename to java/src/net/micode/notes/gtask/remote/GTaskClient.java
diff --git a/src/net/micode/notes/gtask/remote/GTaskManager.java b/java/src/net/micode/notes/gtask/remote/GTaskManager.java
similarity index 100%
rename from src/net/micode/notes/gtask/remote/GTaskManager.java
rename to java/src/net/micode/notes/gtask/remote/GTaskManager.java
diff --git a/src/net/micode/notes/gtask/remote/GTaskSyncService.java b/java/src/net/micode/notes/gtask/remote/GTaskSyncService.java
similarity index 100%
rename from src/net/micode/notes/gtask/remote/GTaskSyncService.java
rename to java/src/net/micode/notes/gtask/remote/GTaskSyncService.java
diff --git a/src/net/micode/notes/model/Note.java b/java/src/net/micode/notes/model/Note.java
similarity index 100%
rename from src/net/micode/notes/model/Note.java
rename to java/src/net/micode/notes/model/Note.java
diff --git a/src/net/micode/notes/model/WorkingNote.java b/java/src/net/micode/notes/model/WorkingNote.java
similarity index 100%
rename from src/net/micode/notes/model/WorkingNote.java
rename to java/src/net/micode/notes/model/WorkingNote.java
diff --git a/src/net/micode/notes/tool/BackupUtils.java b/java/src/net/micode/notes/tool/BackupUtils.java
similarity index 100%
rename from src/net/micode/notes/tool/BackupUtils.java
rename to java/src/net/micode/notes/tool/BackupUtils.java
diff --git a/src/net/micode/notes/tool/DataUtils.java b/java/src/net/micode/notes/tool/DataUtils.java
similarity index 100%
rename from src/net/micode/notes/tool/DataUtils.java
rename to java/src/net/micode/notes/tool/DataUtils.java
diff --git a/src/net/micode/notes/tool/GTaskStringUtils.java b/java/src/net/micode/notes/tool/GTaskStringUtils.java
similarity index 100%
rename from src/net/micode/notes/tool/GTaskStringUtils.java
rename to java/src/net/micode/notes/tool/GTaskStringUtils.java
diff --git a/src/net/micode/notes/tool/ResourceParser.java b/java/src/net/micode/notes/tool/ResourceParser.java
similarity index 100%
rename from src/net/micode/notes/tool/ResourceParser.java
rename to java/src/net/micode/notes/tool/ResourceParser.java
diff --git a/src/net/micode/notes/ui/AlarmAlertActivity.java b/java/src/net/micode/notes/ui/AlarmAlertActivity.java
similarity index 100%
rename from src/net/micode/notes/ui/AlarmAlertActivity.java
rename to java/src/net/micode/notes/ui/AlarmAlertActivity.java
diff --git a/src/net/micode/notes/ui/AlarmInitReceiver.java b/java/src/net/micode/notes/ui/AlarmInitReceiver.java
similarity index 100%
rename from src/net/micode/notes/ui/AlarmInitReceiver.java
rename to java/src/net/micode/notes/ui/AlarmInitReceiver.java
diff --git a/src/net/micode/notes/ui/AlarmReceiver.java b/java/src/net/micode/notes/ui/AlarmReceiver.java
similarity index 100%
rename from src/net/micode/notes/ui/AlarmReceiver.java
rename to java/src/net/micode/notes/ui/AlarmReceiver.java
diff --git a/src/net/micode/notes/ui/DateTimePicker.java b/java/src/net/micode/notes/ui/DateTimePicker.java
similarity index 100%
rename from src/net/micode/notes/ui/DateTimePicker.java
rename to java/src/net/micode/notes/ui/DateTimePicker.java
diff --git a/src/net/micode/notes/ui/DateTimePickerDialog.java b/java/src/net/micode/notes/ui/DateTimePickerDialog.java
similarity index 100%
rename from src/net/micode/notes/ui/DateTimePickerDialog.java
rename to java/src/net/micode/notes/ui/DateTimePickerDialog.java
diff --git a/src/net/micode/notes/ui/DropdownMenu.java b/java/src/net/micode/notes/ui/DropdownMenu.java
similarity index 100%
rename from src/net/micode/notes/ui/DropdownMenu.java
rename to java/src/net/micode/notes/ui/DropdownMenu.java
diff --git a/src/net/micode/notes/ui/FoldersListAdapter.java b/java/src/net/micode/notes/ui/FoldersListAdapter.java
similarity index 100%
rename from src/net/micode/notes/ui/FoldersListAdapter.java
rename to java/src/net/micode/notes/ui/FoldersListAdapter.java
diff --git a/src/net/micode/notes/ui/NoteEditActivity.java b/java/src/net/micode/notes/ui/NoteEditActivity.java
similarity index 100%
rename from src/net/micode/notes/ui/NoteEditActivity.java
rename to java/src/net/micode/notes/ui/NoteEditActivity.java
diff --git a/src/net/micode/notes/ui/NoteEditText.java b/java/src/net/micode/notes/ui/NoteEditText.java
similarity index 100%
rename from src/net/micode/notes/ui/NoteEditText.java
rename to java/src/net/micode/notes/ui/NoteEditText.java
diff --git a/src/net/micode/notes/ui/NoteItemData.java b/java/src/net/micode/notes/ui/NoteItemData.java
similarity index 100%
rename from src/net/micode/notes/ui/NoteItemData.java
rename to java/src/net/micode/notes/ui/NoteItemData.java
diff --git a/src/net/micode/notes/ui/NotesListActivity.java b/java/src/net/micode/notes/ui/NotesListActivity.java
similarity index 100%
rename from src/net/micode/notes/ui/NotesListActivity.java
rename to java/src/net/micode/notes/ui/NotesListActivity.java
diff --git a/src/net/micode/notes/ui/NotesListAdapter.java b/java/src/net/micode/notes/ui/NotesListAdapter.java
similarity index 100%
rename from src/net/micode/notes/ui/NotesListAdapter.java
rename to java/src/net/micode/notes/ui/NotesListAdapter.java
diff --git a/src/net/micode/notes/ui/NotesListItem.java b/java/src/net/micode/notes/ui/NotesListItem.java
similarity index 100%
rename from src/net/micode/notes/ui/NotesListItem.java
rename to java/src/net/micode/notes/ui/NotesListItem.java
diff --git a/src/net/micode/notes/ui/NotesPreferenceActivity.java b/java/src/net/micode/notes/ui/NotesPreferenceActivity.java
similarity index 100%
rename from src/net/micode/notes/ui/NotesPreferenceActivity.java
rename to java/src/net/micode/notes/ui/NotesPreferenceActivity.java
diff --git a/src/net/micode/notes/widget/NoteWidgetProvider.java b/java/src/net/micode/notes/widget/NoteWidgetProvider.java
similarity index 100%
rename from src/net/micode/notes/widget/NoteWidgetProvider.java
rename to java/src/net/micode/notes/widget/NoteWidgetProvider.java
diff --git a/src/net/micode/notes/widget/NoteWidgetProvider_2x.java b/java/src/net/micode/notes/widget/NoteWidgetProvider_2x.java
similarity index 100%
rename from src/net/micode/notes/widget/NoteWidgetProvider_2x.java
rename to java/src/net/micode/notes/widget/NoteWidgetProvider_2x.java
diff --git a/src/net/micode/notes/widget/NoteWidgetProvider_4x.java b/java/src/net/micode/notes/widget/NoteWidgetProvider_4x.java
similarity index 100%
rename from src/net/micode/notes/widget/NoteWidgetProvider_4x.java
rename to java/src/net/micode/notes/widget/NoteWidgetProvider_4x.java