diff --git a/.gitignore b/.gitignore
index 85e7c1d..04fe8e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
+/.gradle/
 /.idea/
+/app/build/
+/gradle/wrapper/gradle-wrapper.jar
diff --git a/Notes-master/.gitignore b/Notes-master/.gitignore
deleted file mode 100644
index 7df8dff..0000000
--- a/Notes-master/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-# generated files
-bin/
-gen/
-
-# Local configuration file (sdk path, etc)
-project.properties
-.settings/
-.classpath
-.project
diff --git a/Notes-master/NOTICE b/Notes-master/NOTICE
deleted file mode 100644
index 9a54521..0000000
--- a/Notes-master/NOTICE
+++ /dev/null
@@ -1,190 +0,0 @@
-
-   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.
-
-   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.
-
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
diff --git a/Notes-master/README b/Notes-master/README
deleted file mode 100644
index fc0d824..0000000
--- a/Notes-master/README
+++ /dev/null
@@ -1,23 +0,0 @@
-[中文]
-
-1. MiCode便签是小米便签的社区开源版，由MIUI团队(www.miui.com) 发起并贡献第一批代码，遵循NOTICE文件所描述的开源协议，
-   今后为MiCode社区(www.micode.net) 拥有，并由社区发布和维护。
-
-2. Bug反馈和跟踪，请访问Github,
-   https://github.com/MiCode/Notes/issues?sort=created&direction=desc&state=open
-
-3. 功能建议和综合讨论，请访问MiCode,
-   http://micode.net/forum.php?mod=forumdisplay&fid=38
-
-
-[English]
-
-1. MiCode Notes is open source edition of XM notepad, it's first initiated and sponsored by MIUI team (www.miui.com).
-   It's opened under license described by NOTICE file. It's owned by the MiCode community (www.micode.net). In future,
-   the MiCode community will release and maintain this project.
-
-2. Regarding issue tracking, please visit Github,
-   https://github.com/MiCode/Notes/issues?sort=created&direction=desc&state=open
-
-3. Regarding feature request and general discussion, please visit Micode forum,
-   http://micode.net/forum.php?mod=forumdisplay&fid=38
diff --git a/app/build.gradle b/app/build.gradle
new file mode 100644
index 0000000..eb11a3d
--- /dev/null
+++ b/app/build.gradle
@@ -0,0 +1,20 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 33
+    buildToolsVersion "33.0.2"
+    useLibrary 'org.apache.http.legacy'
+
+    defaultConfig {
+        applicationId "net.micode.notes"
+        minSdkVersion 14
+        targetSdkVersion 30
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+    }
+}
diff --git a/Notes-master/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
similarity index 100%
rename from Notes-master/AndroidManifest.xml
rename to app/src/main/AndroidManifest.xml
diff --git a/Notes-master/src/net/micode/notes/data/Contact.java b/app/src/main/java/net/micode/notes/data/Contact.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/data/Contact.java
rename to app/src/main/java/net/micode/notes/data/Contact.java
diff --git a/Notes-master/src/net/micode/notes/data/Notes.java b/app/src/main/java/net/micode/notes/data/Notes.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/data/Notes.java
rename to app/src/main/java/net/micode/notes/data/Notes.java
diff --git a/Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java b/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java
rename to app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
diff --git a/Notes-master/src/net/micode/notes/data/NotesProvider.java b/app/src/main/java/net/micode/notes/data/NotesProvider.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/data/NotesProvider.java
rename to app/src/main/java/net/micode/notes/data/NotesProvider.java
diff --git a/Notes-master/src/net/micode/notes/gtask/data/MetaData.java b/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/gtask/data/MetaData.java
rename to app/src/main/java/net/micode/notes/gtask/data/MetaData.java
diff --git a/Notes-master/src/net/micode/notes/gtask/data/Node.java b/app/src/main/java/net/micode/notes/gtask/data/Node.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/gtask/data/Node.java
rename to app/src/main/java/net/micode/notes/gtask/data/Node.java
diff --git a/Notes-master/src/net/micode/notes/gtask/data/SqlData.java b/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/gtask/data/SqlData.java
rename to app/src/main/java/net/micode/notes/gtask/data/SqlData.java
diff --git a/Notes-master/src/net/micode/notes/gtask/data/SqlNote.java b/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/gtask/data/SqlNote.java
rename to app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
diff --git a/Notes-master/src/net/micode/notes/gtask/data/Task.java b/app/src/main/java/net/micode/notes/gtask/data/Task.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/gtask/data/Task.java
rename to app/src/main/java/net/micode/notes/gtask/data/Task.java
diff --git a/Notes-master/src/net/micode/notes/gtask/data/TaskList.java b/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/gtask/data/TaskList.java
rename to app/src/main/java/net/micode/notes/gtask/data/TaskList.java
diff --git a/Notes-master/src/net/micode/notes/gtask/exception/ActionFailureException.java b/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/gtask/exception/ActionFailureException.java
rename to app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
diff --git a/Notes-master/src/net/micode/notes/gtask/exception/NetworkFailureException.java b/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/gtask/exception/NetworkFailureException.java
rename to app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
diff --git a/Notes-master/src/net/micode/notes/gtask/remote/GTaskASyncTask.java b/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
similarity index 90%
rename from Notes-master/src/net/micode/notes/gtask/remote/GTaskASyncTask.java
rename to app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
index b3b61e7..440a871 100644
--- a/Notes-master/src/net/micode/notes/gtask/remote/GTaskASyncTask.java
+++ b/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
@@ -64,10 +64,6 @@ public class GTaskASyncTask extends AsyncTask<Void, String, Integer> {
     }
 
     private void showNotification(int tickerId, String content) {
-        Notification notification = new Notification(R.drawable.notification, mContext
-                .getString(tickerId), System.currentTimeMillis());
-        notification.defaults = Notification.DEFAULT_LIGHTS;
-        notification.flags = Notification.FLAG_AUTO_CANCEL;
         PendingIntent pendingIntent;
         if (tickerId != R.string.ticker_success) {
             pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
@@ -77,11 +73,20 @@ public class GTaskASyncTask extends AsyncTask<Void, String, Integer> {
             pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
                     NotesListActivity.class), 0);
         }
-        notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content,
-                pendingIntent);
+
+
+        Notification.Builder builder = new Notification.Builder(mContext)
+                .setAutoCancel(true)
+                .setContentTitle(mContext.getString(R.string.app_name))
+                .setContentText(content)
+                .setContentIntent(pendingIntent)
+                .setWhen(System.currentTimeMillis())
+                .setOngoing(true);
+        Notification notification=builder.getNotification();
         mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);
     }
 
+
     @Override
     protected Integer doInBackground(Void... unused) {
         publishProgess(mContext.getString(R.string.sync_progress_login, NotesPreferenceActivity
diff --git a/Notes-master/src/net/micode/notes/gtask/remote/GTaskClient.java b/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/gtask/remote/GTaskClient.java
rename to app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
diff --git a/Notes-master/src/net/micode/notes/gtask/remote/GTaskManager.java b/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/gtask/remote/GTaskManager.java
rename to app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
diff --git a/Notes-master/src/net/micode/notes/gtask/remote/GTaskSyncService.java b/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/gtask/remote/GTaskSyncService.java
rename to app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
diff --git a/Notes-master/src/net/micode/notes/model/Note.java b/app/src/main/java/net/micode/notes/model/Note.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/model/Note.java
rename to app/src/main/java/net/micode/notes/model/Note.java
diff --git a/Notes-master/src/net/micode/notes/model/WorkingNote.java b/app/src/main/java/net/micode/notes/model/WorkingNote.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/model/WorkingNote.java
rename to app/src/main/java/net/micode/notes/model/WorkingNote.java
diff --git a/Notes-master/src/net/micode/notes/tool/BackupUtils.java b/app/src/main/java/net/micode/notes/tool/BackupUtils.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/tool/BackupUtils.java
rename to app/src/main/java/net/micode/notes/tool/BackupUtils.java
diff --git a/Notes-master/src/net/micode/notes/tool/DataUtils.java b/app/src/main/java/net/micode/notes/tool/DataUtils.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/tool/DataUtils.java
rename to app/src/main/java/net/micode/notes/tool/DataUtils.java
diff --git a/Notes-master/src/net/micode/notes/tool/GTaskStringUtils.java b/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/tool/GTaskStringUtils.java
rename to app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
diff --git a/Notes-master/src/net/micode/notes/tool/ResourceParser.java b/app/src/main/java/net/micode/notes/tool/ResourceParser.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/tool/ResourceParser.java
rename to app/src/main/java/net/micode/notes/tool/ResourceParser.java
diff --git a/Notes-master/src/net/micode/notes/ui/AlarmAlertActivity.java b/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/ui/AlarmAlertActivity.java
rename to app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
diff --git a/Notes-master/src/net/micode/notes/ui/AlarmInitReceiver.java b/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/ui/AlarmInitReceiver.java
rename to app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
diff --git a/Notes-master/src/net/micode/notes/ui/AlarmReceiver.java b/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/ui/AlarmReceiver.java
rename to app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
diff --git a/Notes-master/src/net/micode/notes/ui/DateTimePicker.java b/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/ui/DateTimePicker.java
rename to app/src/main/java/net/micode/notes/ui/DateTimePicker.java
diff --git a/Notes-master/src/net/micode/notes/ui/DateTimePickerDialog.java b/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/ui/DateTimePickerDialog.java
rename to app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
diff --git a/Notes-master/src/net/micode/notes/ui/DropdownMenu.java b/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/ui/DropdownMenu.java
rename to app/src/main/java/net/micode/notes/ui/DropdownMenu.java
diff --git a/Notes-master/src/net/micode/notes/ui/FoldersListAdapter.java b/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/ui/FoldersListAdapter.java
rename to app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
diff --git a/Notes-master/src/net/micode/notes/ui/NoteEditActivity.java b/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/ui/NoteEditActivity.java
rename to app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
diff --git a/Notes-master/src/net/micode/notes/ui/NoteEditText.java b/app/src/main/java/net/micode/notes/ui/NoteEditText.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/ui/NoteEditText.java
rename to app/src/main/java/net/micode/notes/ui/NoteEditText.java
diff --git a/Notes-master/src/net/micode/notes/ui/NoteItemData.java b/app/src/main/java/net/micode/notes/ui/NoteItemData.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/ui/NoteItemData.java
rename to app/src/main/java/net/micode/notes/ui/NoteItemData.java
diff --git a/Notes-master/src/net/micode/notes/ui/NotesListActivity.java b/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/ui/NotesListActivity.java
rename to app/src/main/java/net/micode/notes/ui/NotesListActivity.java
diff --git a/Notes-master/src/net/micode/notes/ui/NotesListAdapter.java b/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/ui/NotesListAdapter.java
rename to app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
diff --git a/Notes-master/src/net/micode/notes/ui/NotesListItem.java b/app/src/main/java/net/micode/notes/ui/NotesListItem.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/ui/NotesListItem.java
rename to app/src/main/java/net/micode/notes/ui/NotesListItem.java
diff --git a/Notes-master/src/net/micode/notes/ui/NotesPreferenceActivity.java b/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/ui/NotesPreferenceActivity.java
rename to app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
diff --git a/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider.java b/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/widget/NoteWidgetProvider.java
rename to app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
diff --git a/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_2x.java b/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_2x.java
rename to app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
diff --git a/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_4x.java b/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
similarity index 100%
rename from Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_4x.java
rename to app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
diff --git a/Notes-master/res/color/primary_text_dark.xml b/app/src/main/res/color/primary_text_dark.xml
similarity index 94%
rename from Notes-master/res/color/primary_text_dark.xml
rename to app/src/main/res/color/primary_text_dark.xml
index 7c85459..8ad98e3 100644
--- a/Notes-master/res/color/primary_text_dark.xml
+++ b/app/src/main/res/color/primary_text_dark.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 
 <!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
 
diff --git a/Notes-master/res/color/secondary_text_dark.xml b/app/src/main/res/color/secondary_text_dark.xml
similarity index 93%
rename from Notes-master/res/color/secondary_text_dark.xml
rename to app/src/main/res/color/secondary_text_dark.xml
index c1c2384..9cf8a1a 100644
--- a/Notes-master/res/color/secondary_text_dark.xml
+++ b/app/src/main/res/color/secondary_text_dark.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 
 <!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
 
diff --git a/Notes-master/res/drawable-hdpi/bg_btn_set_color.png b/app/src/main/res/drawable-hdpi/bg_btn_set_color.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/bg_btn_set_color.png
rename to app/src/main/res/drawable-hdpi/bg_btn_set_color.png
diff --git a/Notes-master/res/drawable-hdpi/bg_color_btn_mask.png b/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/bg_color_btn_mask.png
rename to app/src/main/res/drawable-hdpi/bg_color_btn_mask.png
diff --git a/Notes-master/res/drawable-hdpi/call_record.png b/app/src/main/res/drawable-hdpi/call_record.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/call_record.png
rename to app/src/main/res/drawable-hdpi/call_record.png
diff --git a/Notes-master/res/drawable-hdpi/clock.png b/app/src/main/res/drawable-hdpi/clock.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/clock.png
rename to app/src/main/res/drawable-hdpi/clock.png
diff --git a/Notes-master/res/drawable-hdpi/delete.png b/app/src/main/res/drawable-hdpi/delete.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/delete.png
rename to app/src/main/res/drawable-hdpi/delete.png
diff --git a/Notes-master/res/drawable-hdpi/dropdown_icon.9.png b/app/src/main/res/drawable-hdpi/dropdown_icon.9.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/dropdown_icon.9.png
rename to app/src/main/res/drawable-hdpi/dropdown_icon.9.png
diff --git a/Notes-master/res/drawable-hdpi/edit_blue.9.png b/app/src/main/res/drawable-hdpi/edit_blue.9.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/edit_blue.9.png
rename to app/src/main/res/drawable-hdpi/edit_blue.9.png
diff --git a/Notes-master/res/drawable-hdpi/edit_green.9.png b/app/src/main/res/drawable-hdpi/edit_green.9.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/edit_green.9.png
rename to app/src/main/res/drawable-hdpi/edit_green.9.png
diff --git a/Notes-master/res/drawable-hdpi/edit_red.9.png b/app/src/main/res/drawable-hdpi/edit_red.9.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/edit_red.9.png
rename to app/src/main/res/drawable-hdpi/edit_red.9.png
diff --git a/Notes-master/res/drawable-hdpi/edit_title_blue.9.png b/app/src/main/res/drawable-hdpi/edit_title_blue.9.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/edit_title_blue.9.png
rename to app/src/main/res/drawable-hdpi/edit_title_blue.9.png
diff --git a/Notes-master/res/drawable-hdpi/edit_title_green.9.png b/app/src/main/res/drawable-hdpi/edit_title_green.9.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/edit_title_green.9.png
rename to app/src/main/res/drawable-hdpi/edit_title_green.9.png
diff --git a/Notes-master/res/drawable-hdpi/edit_title_red.9.png b/app/src/main/res/drawable-hdpi/edit_title_red.9.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/edit_title_red.9.png
rename to app/src/main/res/drawable-hdpi/edit_title_red.9.png
diff --git a/Notes-master/res/drawable-hdpi/edit_title_white.9.png b/app/src/main/res/drawable-hdpi/edit_title_white.9.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/edit_title_white.9.png
rename to app/src/main/res/drawable-hdpi/edit_title_white.9.png
diff --git a/Notes-master/res/drawable-hdpi/edit_title_yellow.9.png b/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/edit_title_yellow.9.png
rename to app/src/main/res/drawable-hdpi/edit_title_yellow.9.png
diff --git a/Notes-master/res/drawable-hdpi/edit_white.9.png b/app/src/main/res/drawable-hdpi/edit_white.9.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/edit_white.9.png
rename to app/src/main/res/drawable-hdpi/edit_white.9.png
diff --git a/Notes-master/res/drawable-hdpi/edit_yellow.9.png b/app/src/main/res/drawable-hdpi/edit_yellow.9.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/edit_yellow.9.png
rename to app/src/main/res/drawable-hdpi/edit_yellow.9.png
diff --git a/Notes-master/res/drawable-hdpi/font_large.png b/app/src/main/res/drawable-hdpi/font_large.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/font_large.png
rename to app/src/main/res/drawable-hdpi/font_large.png
diff --git a/Notes-master/res/drawable-hdpi/font_normal.png b/app/src/main/res/drawable-hdpi/font_normal.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/font_normal.png
rename to app/src/main/res/drawable-hdpi/font_normal.png
diff --git a/Notes-master/res/drawable-hdpi/font_size_selector_bg.9.png b/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/font_size_selector_bg.9.png
rename to app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png
diff --git a/Notes-master/res/drawable-hdpi/font_small.png b/app/src/main/res/drawable-hdpi/font_small.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/font_small.png
rename to app/src/main/res/drawable-hdpi/font_small.png
diff --git a/Notes-master/res/drawable-hdpi/font_super.png b/app/src/main/res/drawable-hdpi/font_super.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/font_super.png
rename to app/src/main/res/drawable-hdpi/font_super.png
diff --git a/Notes-master/res/drawable-hdpi/icon_app.png b/app/src/main/res/drawable-hdpi/icon_app.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/icon_app.png
rename to app/src/main/res/drawable-hdpi/icon_app.png
diff --git a/Notes-master/res/drawable-hdpi/list_background.png b/app/src/main/res/drawable-hdpi/list_background.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/list_background.png
rename to app/src/main/res/drawable-hdpi/list_background.png
diff --git a/Notes-master/res/drawable-hdpi/list_blue_down.9.png b/app/src/main/res/drawable-hdpi/list_blue_down.9.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/list_blue_down.9.png
rename to app/src/main/res/drawable-hdpi/list_blue_down.9.png
diff --git a/Notes-master/res/drawable-hdpi/list_blue_middle.9.png b/app/src/main/res/drawable-hdpi/list_blue_middle.9.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/list_blue_middle.9.png
rename to app/src/main/res/drawable-hdpi/list_blue_middle.9.png
diff --git a/Notes-master/res/drawable-hdpi/list_blue_single.9.png b/app/src/main/res/drawable-hdpi/list_blue_single.9.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/list_blue_single.9.png
rename to app/src/main/res/drawable-hdpi/list_blue_single.9.png
diff --git a/Notes-master/res/drawable-hdpi/list_blue_up.9.png b/app/src/main/res/drawable-hdpi/list_blue_up.9.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/list_blue_up.9.png
rename to app/src/main/res/drawable-hdpi/list_blue_up.9.png
diff --git a/Notes-master/res/drawable-hdpi/list_folder.9.png b/app/src/main/res/drawable-hdpi/list_folder.9.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/list_folder.9.png
rename to app/src/main/res/drawable-hdpi/list_folder.9.png
diff --git a/Notes-master/res/drawable-hdpi/list_footer_bg.9.png b/app/src/main/res/drawable-hdpi/list_footer_bg.9.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/list_footer_bg.9.png
rename to app/src/main/res/drawable-hdpi/list_footer_bg.9.png
diff --git a/Notes-master/res/drawable-hdpi/list_green_down.9.png b/app/src/main/res/drawable-hdpi/list_green_down.9.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/list_green_down.9.png
rename to app/src/main/res/drawable-hdpi/list_green_down.9.png
diff --git a/Notes-master/res/drawable-hdpi/list_green_middle.9.png b/app/src/main/res/drawable-hdpi/list_green_middle.9.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/list_green_middle.9.png
rename to app/src/main/res/drawable-hdpi/list_green_middle.9.png
diff --git a/Notes-master/res/drawable-hdpi/list_green_single.9.png b/app/src/main/res/drawable-hdpi/list_green_single.9.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/list_green_single.9.png
rename to app/src/main/res/drawable-hdpi/list_green_single.9.png
diff --git a/Notes-master/res/drawable-hdpi/list_green_up.9.png b/app/src/main/res/drawable-hdpi/list_green_up.9.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/list_green_up.9.png
rename to app/src/main/res/drawable-hdpi/list_green_up.9.png
diff --git a/Notes-master/res/drawable-hdpi/list_red_down.9.png b/app/src/main/res/drawable-hdpi/list_red_down.9.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/list_red_down.9.png
rename to app/src/main/res/drawable-hdpi/list_red_down.9.png
diff --git a/Notes-master/res/drawable-hdpi/list_red_middle.9.png b/app/src/main/res/drawable-hdpi/list_red_middle.9.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/list_red_middle.9.png
rename to app/src/main/res/drawable-hdpi/list_red_middle.9.png
diff --git a/Notes-master/res/drawable-hdpi/list_red_single.9.png b/app/src/main/res/drawable-hdpi/list_red_single.9.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/list_red_single.9.png
rename to app/src/main/res/drawable-hdpi/list_red_single.9.png
diff --git a/Notes-master/res/drawable-hdpi/list_red_up.9.png b/app/src/main/res/drawable-hdpi/list_red_up.9.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/list_red_up.9.png
rename to app/src/main/res/drawable-hdpi/list_red_up.9.png
diff --git a/Notes-master/res/drawable-hdpi/list_white_down.9.png b/app/src/main/res/drawable-hdpi/list_white_down.9.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/list_white_down.9.png
rename to app/src/main/res/drawable-hdpi/list_white_down.9.png
diff --git a/Notes-master/res/drawable-hdpi/list_white_middle.9.png b/app/src/main/res/drawable-hdpi/list_white_middle.9.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/list_white_middle.9.png
rename to app/src/main/res/drawable-hdpi/list_white_middle.9.png
diff --git a/Notes-master/res/drawable-hdpi/list_white_single.9.png b/app/src/main/res/drawable-hdpi/list_white_single.9.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/list_white_single.9.png
rename to app/src/main/res/drawable-hdpi/list_white_single.9.png
diff --git a/Notes-master/res/drawable-hdpi/list_white_up.9.png b/app/src/main/res/drawable-hdpi/list_white_up.9.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/list_white_up.9.png
rename to app/src/main/res/drawable-hdpi/list_white_up.9.png
diff --git a/Notes-master/res/drawable-hdpi/list_yellow_down.9.png b/app/src/main/res/drawable-hdpi/list_yellow_down.9.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/list_yellow_down.9.png
rename to app/src/main/res/drawable-hdpi/list_yellow_down.9.png
diff --git a/Notes-master/res/drawable-hdpi/list_yellow_middle.9.png b/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/list_yellow_middle.9.png
rename to app/src/main/res/drawable-hdpi/list_yellow_middle.9.png
diff --git a/Notes-master/res/drawable-hdpi/list_yellow_single.9.png b/app/src/main/res/drawable-hdpi/list_yellow_single.9.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/list_yellow_single.9.png
rename to app/src/main/res/drawable-hdpi/list_yellow_single.9.png
diff --git a/Notes-master/res/drawable-hdpi/list_yellow_up.9.png b/app/src/main/res/drawable-hdpi/list_yellow_up.9.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/list_yellow_up.9.png
rename to app/src/main/res/drawable-hdpi/list_yellow_up.9.png
diff --git a/Notes-master/res/drawable-hdpi/menu_delete.png b/app/src/main/res/drawable-hdpi/menu_delete.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/menu_delete.png
rename to app/src/main/res/drawable-hdpi/menu_delete.png
diff --git a/Notes-master/res/drawable-hdpi/menu_move.png b/app/src/main/res/drawable-hdpi/menu_move.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/menu_move.png
rename to app/src/main/res/drawable-hdpi/menu_move.png
diff --git a/Notes-master/res/drawable-hdpi/new_note_normal.png b/app/src/main/res/drawable-hdpi/new_note_normal.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/new_note_normal.png
rename to app/src/main/res/drawable-hdpi/new_note_normal.png
diff --git a/Notes-master/res/drawable-hdpi/new_note_pressed.png b/app/src/main/res/drawable-hdpi/new_note_pressed.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/new_note_pressed.png
rename to app/src/main/res/drawable-hdpi/new_note_pressed.png
diff --git a/Notes-master/res/drawable-hdpi/note_edit_color_selector_panel.png b/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/note_edit_color_selector_panel.png
rename to app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png
diff --git a/Notes-master/res/drawable-hdpi/notification.png b/app/src/main/res/drawable-hdpi/notification.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/notification.png
rename to app/src/main/res/drawable-hdpi/notification.png
diff --git a/Notes-master/res/drawable-hdpi/search_result.png b/app/src/main/res/drawable-hdpi/search_result.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/search_result.png
rename to app/src/main/res/drawable-hdpi/search_result.png
diff --git a/Notes-master/res/drawable-hdpi/selected.png b/app/src/main/res/drawable-hdpi/selected.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/selected.png
rename to app/src/main/res/drawable-hdpi/selected.png
diff --git a/Notes-master/res/drawable-hdpi/title_alert.png b/app/src/main/res/drawable-hdpi/title_alert.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/title_alert.png
rename to app/src/main/res/drawable-hdpi/title_alert.png
diff --git a/Notes-master/res/drawable-hdpi/title_bar_bg.9.png b/app/src/main/res/drawable-hdpi/title_bar_bg.9.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/title_bar_bg.9.png
rename to app/src/main/res/drawable-hdpi/title_bar_bg.9.png
diff --git a/Notes-master/res/drawable-hdpi/widget_2x_blue.png b/app/src/main/res/drawable-hdpi/widget_2x_blue.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/widget_2x_blue.png
rename to app/src/main/res/drawable-hdpi/widget_2x_blue.png
diff --git a/Notes-master/res/drawable-hdpi/widget_2x_green.png b/app/src/main/res/drawable-hdpi/widget_2x_green.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/widget_2x_green.png
rename to app/src/main/res/drawable-hdpi/widget_2x_green.png
diff --git a/Notes-master/res/drawable-hdpi/widget_2x_red.png b/app/src/main/res/drawable-hdpi/widget_2x_red.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/widget_2x_red.png
rename to app/src/main/res/drawable-hdpi/widget_2x_red.png
diff --git a/Notes-master/res/drawable-hdpi/widget_2x_white.png b/app/src/main/res/drawable-hdpi/widget_2x_white.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/widget_2x_white.png
rename to app/src/main/res/drawable-hdpi/widget_2x_white.png
diff --git a/Notes-master/res/drawable-hdpi/widget_2x_yellow.png b/app/src/main/res/drawable-hdpi/widget_2x_yellow.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/widget_2x_yellow.png
rename to app/src/main/res/drawable-hdpi/widget_2x_yellow.png
diff --git a/Notes-master/res/drawable-hdpi/widget_4x_blue.png b/app/src/main/res/drawable-hdpi/widget_4x_blue.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/widget_4x_blue.png
rename to app/src/main/res/drawable-hdpi/widget_4x_blue.png
diff --git a/Notes-master/res/drawable-hdpi/widget_4x_green.png b/app/src/main/res/drawable-hdpi/widget_4x_green.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/widget_4x_green.png
rename to app/src/main/res/drawable-hdpi/widget_4x_green.png
diff --git a/Notes-master/res/drawable-hdpi/widget_4x_red.png b/app/src/main/res/drawable-hdpi/widget_4x_red.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/widget_4x_red.png
rename to app/src/main/res/drawable-hdpi/widget_4x_red.png
diff --git a/Notes-master/res/drawable-hdpi/widget_4x_white.png b/app/src/main/res/drawable-hdpi/widget_4x_white.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/widget_4x_white.png
rename to app/src/main/res/drawable-hdpi/widget_4x_white.png
diff --git a/Notes-master/res/drawable-hdpi/widget_4x_yellow.png b/app/src/main/res/drawable-hdpi/widget_4x_yellow.png
similarity index 100%
rename from Notes-master/res/drawable-hdpi/widget_4x_yellow.png
rename to app/src/main/res/drawable-hdpi/widget_4x_yellow.png
diff --git a/Notes-master/res/drawable/new_note.xml b/app/src/main/res/drawable/new_note.xml
similarity index 100%
rename from Notes-master/res/drawable/new_note.xml
rename to app/src/main/res/drawable/new_note.xml
diff --git a/Notes-master/res/layout/account_dialog_title.xml b/app/src/main/res/layout/account_dialog_title.xml
similarity index 100%
rename from Notes-master/res/layout/account_dialog_title.xml
rename to app/src/main/res/layout/account_dialog_title.xml
diff --git a/Notes-master/res/layout/add_account_text.xml b/app/src/main/res/layout/add_account_text.xml
similarity index 100%
rename from Notes-master/res/layout/add_account_text.xml
rename to app/src/main/res/layout/add_account_text.xml
diff --git a/Notes-master/res/layout/datetime_picker.xml b/app/src/main/res/layout/datetime_picker.xml
similarity index 100%
rename from Notes-master/res/layout/datetime_picker.xml
rename to app/src/main/res/layout/datetime_picker.xml
diff --git a/Notes-master/res/layout/dialog_edit_text.xml b/app/src/main/res/layout/dialog_edit_text.xml
similarity index 100%
rename from Notes-master/res/layout/dialog_edit_text.xml
rename to app/src/main/res/layout/dialog_edit_text.xml
diff --git a/Notes-master/res/layout/folder_list_item.xml b/app/src/main/res/layout/folder_list_item.xml
similarity index 100%
rename from Notes-master/res/layout/folder_list_item.xml
rename to app/src/main/res/layout/folder_list_item.xml
diff --git a/Notes-master/res/layout/note_edit.xml b/app/src/main/res/layout/note_edit.xml
similarity index 100%
rename from Notes-master/res/layout/note_edit.xml
rename to app/src/main/res/layout/note_edit.xml
diff --git a/Notes-master/res/layout/note_edit_list_item.xml b/app/src/main/res/layout/note_edit_list_item.xml
similarity index 100%
rename from Notes-master/res/layout/note_edit_list_item.xml
rename to app/src/main/res/layout/note_edit_list_item.xml
diff --git a/Notes-master/res/layout/note_item.xml b/app/src/main/res/layout/note_item.xml
similarity index 100%
rename from Notes-master/res/layout/note_item.xml
rename to app/src/main/res/layout/note_item.xml
diff --git a/Notes-master/res/layout/note_list.xml b/app/src/main/res/layout/note_list.xml
similarity index 100%
rename from Notes-master/res/layout/note_list.xml
rename to app/src/main/res/layout/note_list.xml
diff --git a/Notes-master/res/layout/note_list_dropdown_menu.xml b/app/src/main/res/layout/note_list_dropdown_menu.xml
similarity index 100%
rename from Notes-master/res/layout/note_list_dropdown_menu.xml
rename to app/src/main/res/layout/note_list_dropdown_menu.xml
diff --git a/Notes-master/res/layout/note_list_footer.xml b/app/src/main/res/layout/note_list_footer.xml
similarity index 100%
rename from Notes-master/res/layout/note_list_footer.xml
rename to app/src/main/res/layout/note_list_footer.xml
diff --git a/Notes-master/res/layout/settings_header.xml b/app/src/main/res/layout/settings_header.xml
similarity index 100%
rename from Notes-master/res/layout/settings_header.xml
rename to app/src/main/res/layout/settings_header.xml
diff --git a/Notes-master/res/layout/widget_2x.xml b/app/src/main/res/layout/widget_2x.xml
similarity index 100%
rename from Notes-master/res/layout/widget_2x.xml
rename to app/src/main/res/layout/widget_2x.xml
diff --git a/Notes-master/res/layout/widget_4x.xml b/app/src/main/res/layout/widget_4x.xml
similarity index 100%
rename from Notes-master/res/layout/widget_4x.xml
rename to app/src/main/res/layout/widget_4x.xml
diff --git a/Notes-master/res/menu/call_note_edit.xml b/app/src/main/res/menu/call_note_edit.xml
similarity index 100%
rename from Notes-master/res/menu/call_note_edit.xml
rename to app/src/main/res/menu/call_note_edit.xml
diff --git a/Notes-master/res/menu/call_record_folder.xml b/app/src/main/res/menu/call_record_folder.xml
similarity index 100%
rename from Notes-master/res/menu/call_record_folder.xml
rename to app/src/main/res/menu/call_record_folder.xml
diff --git a/Notes-master/res/menu/note_edit.xml b/app/src/main/res/menu/note_edit.xml
similarity index 100%
rename from Notes-master/res/menu/note_edit.xml
rename to app/src/main/res/menu/note_edit.xml
diff --git a/Notes-master/res/menu/note_list.xml b/app/src/main/res/menu/note_list.xml
similarity index 100%
rename from Notes-master/res/menu/note_list.xml
rename to app/src/main/res/menu/note_list.xml
diff --git a/Notes-master/res/menu/note_list_dropdown.xml b/app/src/main/res/menu/note_list_dropdown.xml
similarity index 100%
rename from Notes-master/res/menu/note_list_dropdown.xml
rename to app/src/main/res/menu/note_list_dropdown.xml
diff --git a/Notes-master/res/menu/note_list_options.xml b/app/src/main/res/menu/note_list_options.xml
similarity index 100%
rename from Notes-master/res/menu/note_list_options.xml
rename to app/src/main/res/menu/note_list_options.xml
diff --git a/Notes-master/res/menu/sub_folder.xml b/app/src/main/res/menu/sub_folder.xml
similarity index 100%
rename from Notes-master/res/menu/sub_folder.xml
rename to app/src/main/res/menu/sub_folder.xml
diff --git a/Notes-master/res/raw-zh-rCN/introduction b/app/src/main/res/raw-zh-rCN/introduction
similarity index 100%
rename from Notes-master/res/raw-zh-rCN/introduction
rename to app/src/main/res/raw-zh-rCN/introduction
diff --git a/Notes-master/res/raw/introduction b/app/src/main/res/raw/introduction
similarity index 100%
rename from Notes-master/res/raw/introduction
rename to app/src/main/res/raw/introduction
diff --git a/Notes-master/res/values-zh-rCN/arrays.xml b/app/src/main/res/values-zh-rCN/arrays.xml
similarity index 100%
rename from Notes-master/res/values-zh-rCN/arrays.xml
rename to app/src/main/res/values-zh-rCN/arrays.xml
diff --git a/Notes-master/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
similarity index 100%
rename from Notes-master/res/values-zh-rCN/strings.xml
rename to app/src/main/res/values-zh-rCN/strings.xml
diff --git a/Notes-master/res/values-zh-rTW/arrays.xml b/app/src/main/res/values-zh-rTW/arrays.xml
similarity index 100%
rename from Notes-master/res/values-zh-rTW/arrays.xml
rename to app/src/main/res/values-zh-rTW/arrays.xml
diff --git a/Notes-master/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
similarity index 99%
rename from Notes-master/res/values-zh-rTW/strings.xml
rename to app/src/main/res/values-zh-rTW/strings.xml
index 3c41894..e29b79b 100644
--- a/Notes-master/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 
 <!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
 
diff --git a/Notes-master/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
similarity index 100%
rename from Notes-master/res/values/arrays.xml
rename to app/src/main/res/values/arrays.xml
diff --git a/Notes-master/res/values/colors.xml b/app/src/main/res/values/colors.xml
similarity index 100%
rename from Notes-master/res/values/colors.xml
rename to app/src/main/res/values/colors.xml
diff --git a/Notes-master/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
similarity index 100%
rename from Notes-master/res/values/dimens.xml
rename to app/src/main/res/values/dimens.xml
diff --git a/Notes-master/res/values/strings.xml b/app/src/main/res/values/strings.xml
similarity index 100%
rename from Notes-master/res/values/strings.xml
rename to app/src/main/res/values/strings.xml
diff --git a/Notes-master/res/values/styles.xml b/app/src/main/res/values/styles.xml
similarity index 100%
rename from Notes-master/res/values/styles.xml
rename to app/src/main/res/values/styles.xml
diff --git a/Notes-master/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
similarity index 100%
rename from Notes-master/res/xml/preferences.xml
rename to app/src/main/res/xml/preferences.xml
diff --git a/Notes-master/res/xml/searchable.xml b/app/src/main/res/xml/searchable.xml
similarity index 100%
rename from Notes-master/res/xml/searchable.xml
rename to app/src/main/res/xml/searchable.xml
diff --git a/Notes-master/res/xml/widget_2x_info.xml b/app/src/main/res/xml/widget_2x_info.xml
similarity index 100%
rename from Notes-master/res/xml/widget_2x_info.xml
rename to app/src/main/res/xml/widget_2x_info.xml
diff --git a/Notes-master/res/xml/widget_4x_info.xml b/app/src/main/res/xml/widget_4x_info.xml
similarity index 100%
rename from Notes-master/res/xml/widget_4x_info.xml
rename to app/src/main/res/xml/widget_4x_info.xml
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..201f8ad
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,17 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+        google()
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:7.4.1'
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+    }
+}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..941c8f7
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Fri Feb 24 19:59:47 CST 2023
+distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionPath=wrapper/dists
+zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
new file mode 100644
index 0000000..4f906e0
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# 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
+#
+#      https://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.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..107acd3
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/import-summary.txt b/import-summary.txt
new file mode 100644
index 0000000..f2e6428
--- /dev/null
+++ b/import-summary.txt
@@ -0,0 +1,36 @@
+ECLIPSE ANDROID PROJECT IMPORT SUMMARY
+======================================
+
+Ignored Files:
+--------------
+The following files were *not* copied into the new Gradle project; you
+should evaluate whether these are still needed in your project and if
+so manually move them:
+
+* .gitignore
+* NOTICE
+* README
+
+Moved Files:
+------------
+Android Gradle projects use a different directory structure than ADT
+Eclipse projects. Here's how the projects were restructured:
+
+* AndroidManifest.xml => app\src\main\AndroidManifest.xml
+* res\ => app\src\main\res\
+* src\ => app\src\main\java\
+
+Next Steps:
+-----------
+You can now build the project. The Gradle project needs network
+connectivity to download dependencies.
+
+Bugs:
+-----
+If for some reason your project does not build, and you determine that
+it is due to a bug or limitation of the Eclipse to Gradle importer,
+please file a bug at http://b.android.com with category
+Component-Tools.
+
+(This import summary is for your information only, and can be deleted
+after import once you are satisfied with the results.)
diff --git a/local.properties b/local.properties
new file mode 100644
index 0000000..502d540
--- /dev/null
+++ b/local.properties
@@ -0,0 +1,7 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+#
+#Fri Feb 24 19:59:47 CST 2023
+sdk.dir=D\:\\Environment\\Android\\Sdk
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..e7b4def
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+include ':app'