diff --git a/src/Notes-master2/.gitignore b/src/Notes-master/.gitignore
similarity index 100%
rename from src/Notes-master2/.gitignore
rename to src/Notes-master/.gitignore
diff --git a/src/Notes-master2/.idea/.gitignore b/src/Notes-master/.idea/.gitignore
similarity index 100%
rename from src/Notes-master2/.idea/.gitignore
rename to src/Notes-master/.idea/.gitignore
diff --git a/src/Notes-master2/.idea/.name b/src/Notes-master/.idea/.name
similarity index 100%
rename from src/Notes-master2/.idea/.name
rename to src/Notes-master/.idea/.name
diff --git a/src/Notes-master2/.idea/checkstyle-idea.xml b/src/Notes-master/.idea/checkstyle-idea.xml
similarity index 100%
rename from src/Notes-master2/.idea/checkstyle-idea.xml
rename to src/Notes-master/.idea/checkstyle-idea.xml
diff --git a/src/Notes-master2/.idea/compiler.xml b/src/Notes-master/.idea/compiler.xml
similarity index 100%
rename from src/Notes-master2/.idea/compiler.xml
rename to src/Notes-master/.idea/compiler.xml
diff --git a/src/Notes-master2/.idea/deploymentTargetDropDown.xml b/src/Notes-master/.idea/deploymentTargetDropDown.xml
similarity index 100%
rename from src/Notes-master2/.idea/deploymentTargetDropDown.xml
rename to src/Notes-master/.idea/deploymentTargetDropDown.xml
diff --git a/src/Notes-master2/.idea/gradle.xml b/src/Notes-master/.idea/gradle.xml
similarity index 100%
rename from src/Notes-master2/.idea/gradle.xml
rename to src/Notes-master/.idea/gradle.xml
diff --git a/src/Notes-master2/.idea/jarRepositories.xml b/src/Notes-master/.idea/jarRepositories.xml
similarity index 100%
rename from src/Notes-master2/.idea/jarRepositories.xml
rename to src/Notes-master/.idea/jarRepositories.xml
diff --git a/src/Notes-master2/.idea/misc.xml b/src/Notes-master/.idea/misc.xml
similarity index 100%
rename from src/Notes-master2/.idea/misc.xml
rename to src/Notes-master/.idea/misc.xml
diff --git a/src/Notes-master2/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c b/src/Notes-master/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c
similarity index 100%
rename from src/Notes-master2/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c
rename to src/Notes-master/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c
diff --git a/src/Notes-master2/.idea/sonarlint/issuestore/8/e/8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d b/src/Notes-master/.idea/sonarlint/issuestore/8/e/8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d
similarity index 100%
rename from src/Notes-master2/.idea/sonarlint/issuestore/8/e/8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d
rename to src/Notes-master/.idea/sonarlint/issuestore/8/e/8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d
diff --git a/src/Notes-master2/.idea/sonarlint/issuestore/f/4/f4a01d6a4fcb971362ec00a83903fd3902f52164 b/src/Notes-master/.idea/sonarlint/issuestore/f/4/f4a01d6a4fcb971362ec00a83903fd3902f52164
similarity index 100%
rename from src/Notes-master2/.idea/sonarlint/issuestore/f/4/f4a01d6a4fcb971362ec00a83903fd3902f52164
rename to src/Notes-master/.idea/sonarlint/issuestore/f/4/f4a01d6a4fcb971362ec00a83903fd3902f52164
diff --git a/src/Notes-master2/.idea/sonarlint/issuestore/index.pb b/src/Notes-master/.idea/sonarlint/issuestore/index.pb
similarity index 100%
rename from src/Notes-master2/.idea/sonarlint/issuestore/index.pb
rename to src/Notes-master/.idea/sonarlint/issuestore/index.pb
diff --git a/src/Notes-master2/.idea/sonarlint/securityhotspotstore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c b/src/Notes-master/.idea/sonarlint/securityhotspotstore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c
similarity index 100%
rename from src/Notes-master2/.idea/sonarlint/securityhotspotstore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c
rename to src/Notes-master/.idea/sonarlint/securityhotspotstore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c
diff --git a/src/Notes-master2/.idea/sonarlint/securityhotspotstore/8/e/8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d b/src/Notes-master/.idea/sonarlint/securityhotspotstore/8/e/8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d
similarity index 100%
rename from src/Notes-master2/.idea/sonarlint/securityhotspotstore/8/e/8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d
rename to src/Notes-master/.idea/sonarlint/securityhotspotstore/8/e/8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d
diff --git a/src/Notes-master2/.idea/sonarlint/securityhotspotstore/f/4/f4a01d6a4fcb971362ec00a83903fd3902f52164 b/src/Notes-master/.idea/sonarlint/securityhotspotstore/f/4/f4a01d6a4fcb971362ec00a83903fd3902f52164
similarity index 100%
rename from src/Notes-master2/.idea/sonarlint/securityhotspotstore/f/4/f4a01d6a4fcb971362ec00a83903fd3902f52164
rename to src/Notes-master/.idea/sonarlint/securityhotspotstore/f/4/f4a01d6a4fcb971362ec00a83903fd3902f52164
diff --git a/src/Notes-master2/.idea/sonarlint/securityhotspotstore/index.pb b/src/Notes-master/.idea/sonarlint/securityhotspotstore/index.pb
similarity index 100%
rename from src/Notes-master2/.idea/sonarlint/securityhotspotstore/index.pb
rename to src/Notes-master/.idea/sonarlint/securityhotspotstore/index.pb
diff --git a/src/Notes-master2/.idea/vcs.xml b/src/Notes-master/.idea/vcs.xml
similarity index 100%
rename from src/Notes-master2/.idea/vcs.xml
rename to src/Notes-master/.idea/vcs.xml
diff --git a/src/Notes-master2/README.md b/src/Notes-master/README.md
similarity index 100%
rename from src/Notes-master2/README.md
rename to src/Notes-master/README.md
diff --git a/src/Notes-master2/app/.gitignore b/src/Notes-master/app/.gitignore
similarity index 100%
rename from src/Notes-master2/app/.gitignore
rename to src/Notes-master/app/.gitignore
diff --git a/src/Notes-master2/app/build.gradle b/src/Notes-master/app/build.gradle
similarity index 100%
rename from src/Notes-master2/app/build.gradle
rename to src/Notes-master/app/build.gradle
diff --git a/src/Notes-master2/app/proguard-rules.pro b/src/Notes-master/app/proguard-rules.pro
similarity index 100%
rename from src/Notes-master2/app/proguard-rules.pro
rename to src/Notes-master/app/proguard-rules.pro
diff --git a/src/Notes-master2/app/src/androidTest/java/net/micode/notes/ExampleInstrumentedTest.java b/src/Notes-master/app/src/androidTest/java/net/micode/notes/ExampleInstrumentedTest.java
similarity index 100%
rename from src/Notes-master2/app/src/androidTest/java/net/micode/notes/ExampleInstrumentedTest.java
rename to src/Notes-master/app/src/androidTest/java/net/micode/notes/ExampleInstrumentedTest.java
diff --git a/src/Notes-master2/app/src/main/AndroidManifest.xml b/src/Notes-master/app/src/main/AndroidManifest.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/AndroidManifest.xml
rename to src/Notes-master/app/src/main/AndroidManifest.xml
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/data/Contact.java b/src/Notes-master/app/src/main/java/net/micode/notes/data/Contact.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/data/Contact.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/data/Contact.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/data/Notes.java b/src/Notes-master/app/src/main/java/net/micode/notes/data/Notes.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/data/Notes.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/data/Notes.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/data/NotesProvider.java b/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/data/NotesProvider.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/gtask/data/MetaData.java b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/gtask/data/Node.java b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Node.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/gtask/data/Node.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Node.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/gtask/data/SqlData.java b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/gtask/data/Task.java b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Task.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/gtask/data/Task.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Task.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/gtask/data/TaskList.java b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/model/Note.java b/src/Notes-master/app/src/main/java/net/micode/notes/model/Note.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/model/Note.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/model/Note.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/model/WorkingNote.java b/src/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/model/WorkingNote.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/tool/BackupUtils.java b/src/Notes-master/app/src/main/java/net/micode/notes/tool/BackupUtils.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/tool/BackupUtils.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/tool/BackupUtils.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/tool/DataUtils.java b/src/Notes-master/app/src/main/java/net/micode/notes/tool/DataUtils.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/tool/DataUtils.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/tool/DataUtils.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/tool/FingerprintDialogFragment.java b/src/Notes-master/app/src/main/java/net/micode/notes/tool/FingerprintDialogFragment.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/tool/FingerprintDialogFragment.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/tool/FingerprintDialogFragment.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java b/src/Notes-master/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/tool/ResourceParser.java b/src/Notes-master/app/src/main/java/net/micode/notes/tool/ResourceParser.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/tool/ResourceParser.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/tool/ResourceParser.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/ui/DateTimePicker.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/ui/DropdownMenu.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/ui/NoteEditText.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditText.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/ui/NoteEditText.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditText.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteItemData.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/ui/NoteItemData.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteItemData.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListItem.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/ui/NotesListItem.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListItem.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/ui/SplashActivity.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/SplashActivity.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/ui/SplashActivity.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/ui/SplashActivity.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java b/src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java b/src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java b/src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
similarity index 100%
rename from src/Notes-master2/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
rename to src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
diff --git a/src/Notes-master2/app/src/main/res/color/primary_text_dark.xml b/src/Notes-master/app/src/main/res/color/primary_text_dark.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/color/primary_text_dark.xml
rename to src/Notes-master/app/src/main/res/color/primary_text_dark.xml
diff --git a/src/Notes-master2/app/src/main/res/color/secondary_text_dark.xml b/src/Notes-master/app/src/main/res/color/secondary_text_dark.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/color/secondary_text_dark.xml
rename to src/Notes-master/app/src/main/res/color/secondary_text_dark.xml
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/add_node.png b/src/Notes-master/app/src/main/res/drawable-hdpi/add_node.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/add_node.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/add_node.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/bg_btn_set_color.png b/src/Notes-master/app/src/main/res/drawable-hdpi/bg_btn_set_color.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/bg_btn_set_color.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/bg_btn_set_color.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png b/src/Notes-master/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/call_record.png b/src/Notes-master/app/src/main/res/drawable-hdpi/call_record.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/call_record.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/call_record.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/clock.png b/src/Notes-master/app/src/main/res/drawable-hdpi/clock.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/clock.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/clock.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/delete.png b/src/Notes-master/app/src/main/res/drawable-hdpi/delete.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/delete.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/delete.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/dropdown_icon.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/dropdown_icon.9.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/dropdown_icon.9.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/dropdown_icon.9.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/edit_blue.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/edit_blue.9.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/edit_blue.9.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/edit_blue.9.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/edit_green.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/edit_green.9.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/edit_green.9.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/edit_green.9.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/edit_red.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/edit_red.9.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/edit_red.9.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/edit_red.9.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/edit_title_blue.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_blue.9.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/edit_title_blue.9.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_blue.9.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/edit_title_green.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_green.9.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/edit_title_green.9.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_green.9.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/edit_title_red.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_red.9.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/edit_title_red.9.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_red.9.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/edit_title_white.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_white.9.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/edit_title_white.9.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_white.9.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/edit_white.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/edit_white.9.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/edit_white.9.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/edit_white.9.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/edit_yellow.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/edit_yellow.9.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/edit_yellow.9.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/edit_yellow.9.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/font_large.png b/src/Notes-master/app/src/main/res/drawable-hdpi/font_large.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/font_large.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/font_large.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/font_normal.png b/src/Notes-master/app/src/main/res/drawable-hdpi/font_normal.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/font_normal.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/font_normal.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/font_small.png b/src/Notes-master/app/src/main/res/drawable-hdpi/font_small.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/font_small.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/font_small.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/font_super.png b/src/Notes-master/app/src/main/res/drawable-hdpi/font_super.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/font_super.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/font_super.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/icon_app.png b/src/Notes-master/app/src/main/res/drawable-hdpi/icon_app.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/icon_app.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/icon_app.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/list_background.png b/src/Notes-master/app/src/main/res/drawable-hdpi/list_background.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/list_background.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/list_background.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/list_blue_down.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/list_blue_down.9.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/list_blue_down.9.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/list_blue_down.9.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/list_blue_middle.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/list_blue_middle.9.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/list_blue_middle.9.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/list_blue_middle.9.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/list_blue_single.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/list_blue_single.9.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/list_blue_single.9.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/list_blue_single.9.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/list_blue_up.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/list_blue_up.9.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/list_blue_up.9.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/list_blue_up.9.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/list_folder.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/list_folder.9.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/list_folder.9.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/list_folder.9.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/list_footer_bg.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/list_footer_bg.9.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/list_footer_bg.9.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/list_footer_bg.9.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/list_green_down.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/list_green_down.9.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/list_green_down.9.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/list_green_down.9.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/list_green_middle.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/list_green_middle.9.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/list_green_middle.9.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/list_green_middle.9.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/list_green_single.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/list_green_single.9.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/list_green_single.9.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/list_green_single.9.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/list_green_up.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/list_green_up.9.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/list_green_up.9.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/list_green_up.9.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/list_red_down.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/list_red_down.9.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/list_red_down.9.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/list_red_down.9.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/list_red_middle.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/list_red_middle.9.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/list_red_middle.9.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/list_red_middle.9.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/list_red_single.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/list_red_single.9.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/list_red_single.9.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/list_red_single.9.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/list_red_up.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/list_red_up.9.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/list_red_up.9.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/list_red_up.9.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/list_white_down.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/list_white_down.9.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/list_white_down.9.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/list_white_down.9.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/list_white_middle.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/list_white_middle.9.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/list_white_middle.9.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/list_white_middle.9.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/list_white_single.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/list_white_single.9.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/list_white_single.9.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/list_white_single.9.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/list_white_up.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/list_white_up.9.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/list_white_up.9.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/list_white_up.9.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/list_yellow_down.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_down.9.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/list_yellow_down.9.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_down.9.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/list_yellow_single.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_single.9.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/list_yellow_single.9.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_single.9.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/list_yellow_up.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_up.9.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/list_yellow_up.9.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_up.9.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/listtest.png b/src/Notes-master/app/src/main/res/drawable-hdpi/listtest.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/listtest.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/listtest.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/lock.png b/src/Notes-master/app/src/main/res/drawable-hdpi/lock.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/lock.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/lock.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/menu_delete.png b/src/Notes-master/app/src/main/res/drawable-hdpi/menu_delete.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/menu_delete.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/menu_delete.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/menu_move.png b/src/Notes-master/app/src/main/res/drawable-hdpi/menu_move.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/menu_move.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/menu_move.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/new_note_normal.png b/src/Notes-master/app/src/main/res/drawable-hdpi/new_note_normal.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/new_note_normal.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/new_note_normal.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/new_note_pressed.png b/src/Notes-master/app/src/main/res/drawable-hdpi/new_note_pressed.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/new_note_pressed.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/new_note_pressed.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/note_bk.png b/src/Notes-master/app/src/main/res/drawable-hdpi/note_bk.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/note_bk.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/note_bk.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png b/src/Notes-master/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/notification.png b/src/Notes-master/app/src/main/res/drawable-hdpi/notification.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/notification.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/notification.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/search_result.png b/src/Notes-master/app/src/main/res/drawable-hdpi/search_result.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/search_result.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/search_result.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/selected.png b/src/Notes-master/app/src/main/res/drawable-hdpi/selected.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/selected.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/selected.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/splash.png b/src/Notes-master/app/src/main/res/drawable-hdpi/splash.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/splash.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/splash.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/title_alert.png b/src/Notes-master/app/src/main/res/drawable-hdpi/title_alert.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/title_alert.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/title_alert.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/title_bar_bg.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/title_bar_bg.9.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/title_bar_bg.9.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/title_bar_bg.9.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/unlock.png b/src/Notes-master/app/src/main/res/drawable-hdpi/unlock.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/unlock.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/unlock.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/wallpaper1.png b/src/Notes-master/app/src/main/res/drawable-hdpi/wallpaper1.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/wallpaper1.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/wallpaper1.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/wallpaper2.png b/src/Notes-master/app/src/main/res/drawable-hdpi/wallpaper2.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/wallpaper2.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/wallpaper2.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/widget_2x_blue.png b/src/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_blue.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/widget_2x_blue.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_blue.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/widget_2x_green.png b/src/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_green.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/widget_2x_green.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_green.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/widget_2x_red.png b/src/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_red.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/widget_2x_red.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_red.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/widget_2x_white.png b/src/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_white.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/widget_2x_white.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_white.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/widget_2x_yellow.png b/src/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_yellow.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/widget_2x_yellow.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_yellow.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/widget_4x_blue.png b/src/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_blue.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/widget_4x_blue.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_blue.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/widget_4x_green.png b/src/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_green.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/widget_4x_green.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_green.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/widget_4x_red.png b/src/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_red.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/widget_4x_red.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_red.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/widget_4x_white.png b/src/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_white.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/widget_4x_white.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_white.png
diff --git a/src/Notes-master2/app/src/main/res/drawable-hdpi/widget_4x_yellow.png b/src/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_yellow.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable-hdpi/widget_4x_yellow.png
rename to src/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_yellow.png
diff --git a/src/Notes-master2/app/src/main/res/drawable/ic_fp_40px.png b/src/Notes-master/app/src/main/res/drawable/ic_fp_40px.png
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable/ic_fp_40px.png
rename to src/Notes-master/app/src/main/res/drawable/ic_fp_40px.png
diff --git a/src/Notes-master2/app/src/main/res/drawable/new_note.xml b/src/Notes-master/app/src/main/res/drawable/new_note.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/drawable/new_note.xml
rename to src/Notes-master/app/src/main/res/drawable/new_note.xml
diff --git a/src/Notes-master2/app/src/main/res/layout/account_dialog_title.xml b/src/Notes-master/app/src/main/res/layout/account_dialog_title.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/layout/account_dialog_title.xml
rename to src/Notes-master/app/src/main/res/layout/account_dialog_title.xml
diff --git a/src/Notes-master2/app/src/main/res/layout/activity_main.xml b/src/Notes-master/app/src/main/res/layout/activity_main.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/layout/activity_main.xml
rename to src/Notes-master/app/src/main/res/layout/activity_main.xml
diff --git a/src/Notes-master2/app/src/main/res/layout/activity_splash.xml b/src/Notes-master/app/src/main/res/layout/activity_splash.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/layout/activity_splash.xml
rename to src/Notes-master/app/src/main/res/layout/activity_splash.xml
diff --git a/src/Notes-master2/app/src/main/res/layout/add_account_text.xml b/src/Notes-master/app/src/main/res/layout/add_account_text.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/layout/add_account_text.xml
rename to src/Notes-master/app/src/main/res/layout/add_account_text.xml
diff --git a/src/Notes-master2/app/src/main/res/layout/datetime_picker.xml b/src/Notes-master/app/src/main/res/layout/datetime_picker.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/layout/datetime_picker.xml
rename to src/Notes-master/app/src/main/res/layout/datetime_picker.xml
diff --git a/src/Notes-master2/app/src/main/res/layout/dialog_edit_text.xml b/src/Notes-master/app/src/main/res/layout/dialog_edit_text.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/layout/dialog_edit_text.xml
rename to src/Notes-master/app/src/main/res/layout/dialog_edit_text.xml
diff --git a/src/Notes-master2/app/src/main/res/layout/fingerprint_dialog.xml b/src/Notes-master/app/src/main/res/layout/fingerprint_dialog.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/layout/fingerprint_dialog.xml
rename to src/Notes-master/app/src/main/res/layout/fingerprint_dialog.xml
diff --git a/src/Notes-master2/app/src/main/res/layout/folder_list_item.xml b/src/Notes-master/app/src/main/res/layout/folder_list_item.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/layout/folder_list_item.xml
rename to src/Notes-master/app/src/main/res/layout/folder_list_item.xml
diff --git a/src/Notes-master2/app/src/main/res/layout/note_edit.xml b/src/Notes-master/app/src/main/res/layout/note_edit.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/layout/note_edit.xml
rename to src/Notes-master/app/src/main/res/layout/note_edit.xml
diff --git a/src/Notes-master2/app/src/main/res/layout/note_edit_list_item.xml b/src/Notes-master/app/src/main/res/layout/note_edit_list_item.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/layout/note_edit_list_item.xml
rename to src/Notes-master/app/src/main/res/layout/note_edit_list_item.xml
diff --git a/src/Notes-master2/app/src/main/res/layout/note_item.xml b/src/Notes-master/app/src/main/res/layout/note_item.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/layout/note_item.xml
rename to src/Notes-master/app/src/main/res/layout/note_item.xml
diff --git a/src/Notes-master2/app/src/main/res/layout/note_list.xml b/src/Notes-master/app/src/main/res/layout/note_list.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/layout/note_list.xml
rename to src/Notes-master/app/src/main/res/layout/note_list.xml
diff --git a/src/Notes-master2/app/src/main/res/layout/note_list_dropdown_menu.xml b/src/Notes-master/app/src/main/res/layout/note_list_dropdown_menu.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/layout/note_list_dropdown_menu.xml
rename to src/Notes-master/app/src/main/res/layout/note_list_dropdown_menu.xml
diff --git a/src/Notes-master2/app/src/main/res/layout/note_list_footer.xml b/src/Notes-master/app/src/main/res/layout/note_list_footer.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/layout/note_list_footer.xml
rename to src/Notes-master/app/src/main/res/layout/note_list_footer.xml
diff --git a/src/Notes-master2/app/src/main/res/layout/settings_header.xml b/src/Notes-master/app/src/main/res/layout/settings_header.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/layout/settings_header.xml
rename to src/Notes-master/app/src/main/res/layout/settings_header.xml
diff --git a/src/Notes-master2/app/src/main/res/layout/widget_2x.xml b/src/Notes-master/app/src/main/res/layout/widget_2x.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/layout/widget_2x.xml
rename to src/Notes-master/app/src/main/res/layout/widget_2x.xml
diff --git a/src/Notes-master2/app/src/main/res/layout/widget_4x.xml b/src/Notes-master/app/src/main/res/layout/widget_4x.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/layout/widget_4x.xml
rename to src/Notes-master/app/src/main/res/layout/widget_4x.xml
diff --git a/src/Notes-master2/app/src/main/res/menu/call_note_edit.xml b/src/Notes-master/app/src/main/res/menu/call_note_edit.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/menu/call_note_edit.xml
rename to src/Notes-master/app/src/main/res/menu/call_note_edit.xml
diff --git a/src/Notes-master2/app/src/main/res/menu/call_record_folder.xml b/src/Notes-master/app/src/main/res/menu/call_record_folder.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/menu/call_record_folder.xml
rename to src/Notes-master/app/src/main/res/menu/call_record_folder.xml
diff --git a/src/Notes-master2/app/src/main/res/menu/note_edit.xml b/src/Notes-master/app/src/main/res/menu/note_edit.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/menu/note_edit.xml
rename to src/Notes-master/app/src/main/res/menu/note_edit.xml
diff --git a/src/Notes-master2/app/src/main/res/menu/note_list.xml b/src/Notes-master/app/src/main/res/menu/note_list.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/menu/note_list.xml
rename to src/Notes-master/app/src/main/res/menu/note_list.xml
diff --git a/src/Notes-master2/app/src/main/res/menu/note_list_dropdown.xml b/src/Notes-master/app/src/main/res/menu/note_list_dropdown.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/menu/note_list_dropdown.xml
rename to src/Notes-master/app/src/main/res/menu/note_list_dropdown.xml
diff --git a/src/Notes-master2/app/src/main/res/menu/note_list_options.xml b/src/Notes-master/app/src/main/res/menu/note_list_options.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/menu/note_list_options.xml
rename to src/Notes-master/app/src/main/res/menu/note_list_options.xml
diff --git a/src/Notes-master2/app/src/main/res/menu/sub_folder.xml b/src/Notes-master/app/src/main/res/menu/sub_folder.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/menu/sub_folder.xml
rename to src/Notes-master/app/src/main/res/menu/sub_folder.xml
diff --git a/src/Notes-master2/app/src/main/res/raw-zh-rCN/introduction b/src/Notes-master/app/src/main/res/raw-zh-rCN/introduction
similarity index 100%
rename from src/Notes-master2/app/src/main/res/raw-zh-rCN/introduction
rename to src/Notes-master/app/src/main/res/raw-zh-rCN/introduction
diff --git a/src/Notes-master2/app/src/main/res/raw/introduction b/src/Notes-master/app/src/main/res/raw/introduction
similarity index 100%
rename from src/Notes-master2/app/src/main/res/raw/introduction
rename to src/Notes-master/app/src/main/res/raw/introduction
diff --git a/src/Notes-master2/app/src/main/res/values-night/themes.xml b/src/Notes-master/app/src/main/res/values-night/themes.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/values-night/themes.xml
rename to src/Notes-master/app/src/main/res/values-night/themes.xml
diff --git a/src/Notes-master2/app/src/main/res/values-zh-rCN/arrays.xml b/src/Notes-master/app/src/main/res/values-zh-rCN/arrays.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/values-zh-rCN/arrays.xml
rename to src/Notes-master/app/src/main/res/values-zh-rCN/arrays.xml
diff --git a/src/Notes-master2/app/src/main/res/values-zh-rCN/strings.xml b/src/Notes-master/app/src/main/res/values-zh-rCN/strings.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/values-zh-rCN/strings.xml
rename to src/Notes-master/app/src/main/res/values-zh-rCN/strings.xml
diff --git a/src/Notes-master2/app/src/main/res/values-zh-rTW/arrays.xml b/src/Notes-master/app/src/main/res/values-zh-rTW/arrays.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/values-zh-rTW/arrays.xml
rename to src/Notes-master/app/src/main/res/values-zh-rTW/arrays.xml
diff --git a/src/Notes-master2/app/src/main/res/values-zh-rTW/strings.xml b/src/Notes-master/app/src/main/res/values-zh-rTW/strings.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/values-zh-rTW/strings.xml
rename to src/Notes-master/app/src/main/res/values-zh-rTW/strings.xml
diff --git a/src/Notes-master2/app/src/main/res/values/NoteTheme.xml b/src/Notes-master/app/src/main/res/values/NoteTheme.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/values/NoteTheme.xml
rename to src/Notes-master/app/src/main/res/values/NoteTheme.xml
diff --git a/src/Notes-master2/app/src/main/res/values/arrays.xml b/src/Notes-master/app/src/main/res/values/arrays.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/values/arrays.xml
rename to src/Notes-master/app/src/main/res/values/arrays.xml
diff --git a/src/Notes-master2/app/src/main/res/values/attrs.xml b/src/Notes-master/app/src/main/res/values/attrs.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/values/attrs.xml
rename to src/Notes-master/app/src/main/res/values/attrs.xml
diff --git a/src/Notes-master2/app/src/main/res/values/colors.xml b/src/Notes-master/app/src/main/res/values/colors.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/values/colors.xml
rename to src/Notes-master/app/src/main/res/values/colors.xml
diff --git a/src/Notes-master2/app/src/main/res/values/dimens.xml b/src/Notes-master/app/src/main/res/values/dimens.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/values/dimens.xml
rename to src/Notes-master/app/src/main/res/values/dimens.xml
diff --git a/src/Notes-master2/app/src/main/res/values/strings.xml b/src/Notes-master/app/src/main/res/values/strings.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/values/strings.xml
rename to src/Notes-master/app/src/main/res/values/strings.xml
diff --git a/src/Notes-master2/app/src/main/res/values/styles.xml b/src/Notes-master/app/src/main/res/values/styles.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/values/styles.xml
rename to src/Notes-master/app/src/main/res/values/styles.xml
diff --git a/src/Notes-master2/app/src/main/res/values/themes.xml b/src/Notes-master/app/src/main/res/values/themes.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/values/themes.xml
rename to src/Notes-master/app/src/main/res/values/themes.xml
diff --git a/src/Notes-master2/app/src/main/res/xml/preferences.xml b/src/Notes-master/app/src/main/res/xml/preferences.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/xml/preferences.xml
rename to src/Notes-master/app/src/main/res/xml/preferences.xml
diff --git a/src/Notes-master2/app/src/main/res/xml/searchable.xml b/src/Notes-master/app/src/main/res/xml/searchable.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/xml/searchable.xml
rename to src/Notes-master/app/src/main/res/xml/searchable.xml
diff --git a/src/Notes-master2/app/src/main/res/xml/widget_2x_info.xml b/src/Notes-master/app/src/main/res/xml/widget_2x_info.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/xml/widget_2x_info.xml
rename to src/Notes-master/app/src/main/res/xml/widget_2x_info.xml
diff --git a/src/Notes-master2/app/src/main/res/xml/widget_4x_info.xml b/src/Notes-master/app/src/main/res/xml/widget_4x_info.xml
similarity index 100%
rename from src/Notes-master2/app/src/main/res/xml/widget_4x_info.xml
rename to src/Notes-master/app/src/main/res/xml/widget_4x_info.xml
diff --git a/src/Notes-master2/app/src/test/java/net/micode/notes/ExampleUnitTest.java b/src/Notes-master/app/src/test/java/net/micode/notes/ExampleUnitTest.java
similarity index 100%
rename from src/Notes-master2/app/src/test/java/net/micode/notes/ExampleUnitTest.java
rename to src/Notes-master/app/src/test/java/net/micode/notes/ExampleUnitTest.java
diff --git a/src/Notes-master2/build.gradle b/src/Notes-master/build.gradle
similarity index 100%
rename from src/Notes-master2/build.gradle
rename to src/Notes-master/build.gradle
diff --git a/src/Notes-master2/gradle.properties b/src/Notes-master/gradle.properties
similarity index 100%
rename from src/Notes-master2/gradle.properties
rename to src/Notes-master/gradle.properties
diff --git a/src/Notes-master2/gradle/wrapper/gradle-wrapper.jar b/src/Notes-master/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from src/Notes-master2/gradle/wrapper/gradle-wrapper.jar
rename to src/Notes-master/gradle/wrapper/gradle-wrapper.jar
diff --git a/src/Notes-master2/gradle/wrapper/gradle-wrapper.properties b/src/Notes-master/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from src/Notes-master2/gradle/wrapper/gradle-wrapper.properties
rename to src/Notes-master/gradle/wrapper/gradle-wrapper.properties
diff --git a/src/Notes-master2/gradlew b/src/Notes-master/gradlew
similarity index 100%
rename from src/Notes-master2/gradlew
rename to src/Notes-master/gradlew
diff --git a/src/Notes-master2/gradlew.bat b/src/Notes-master/gradlew.bat
similarity index 100%
rename from src/Notes-master2/gradlew.bat
rename to src/Notes-master/gradlew.bat
diff --git a/src/Notes-master2/import-summary.txt b/src/Notes-master/import-summary.txt
similarity index 100%
rename from src/Notes-master2/import-summary.txt
rename to src/Notes-master/import-summary.txt
diff --git a/src/Notes-master2/settings.gradle b/src/Notes-master/settings.gradle
similarity index 100%
rename from src/Notes-master2/settings.gradle
rename to src/Notes-master/settings.gradle