diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a265204..75d76cf 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -39,7 +39,7 @@
         android:label="@string/app_name" >
         <!-- 活动声明 -->
         <activity
-            android:name=".ui.NotesListActivity"
+            android:name=".ui.activities.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/app_name"
             android:launchMode="singleTop"
@@ -54,7 +54,7 @@
         </activity>
 
         <activity
-            android:name=".ui.NoteEditActivity"
+            android:name=".ui.activities.NoteEditActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="singleTop"
             android:theme="@style/NoteTheme" >
@@ -129,14 +129,14 @@
         </receiver>
 
         <activity
-            android:name=".ui.AlarmAlertActivity"
+            android:name=".ui.activities.AlarmAlertActivity"
             android:label="@string/app_name"
             android:launchMode="singleInstance"
             android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
         </activity>
 
         <activity
-            android:name="net.micode.notes.ui.NotesPreferenceActivity"
+            android:name="net.micode.notes.ui.activities.NotesPreferenceActivity"
             android:label="@string/preferences_title"
             android:launchMode="singleTop"
             android:theme="@android:style/Theme.Holo.Light" >
diff --git a/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java b/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
index b8fe517..6469736 100644
--- a/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
+++ b/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
@@ -25,8 +25,8 @@ import android.content.Intent;
 import android.os.AsyncTask;
 
 import net.micode.notes.R;
-import net.micode.notes.ui.NotesListActivity;
-import net.micode.notes.ui.NotesPreferenceActivity;
+import net.micode.notes.ui.activities.NotesListActivity;
+import net.micode.notes.ui.activities.NotesPreferenceActivity;
 
 
 public class GTaskASyncTask extends AsyncTask<Void, String, Integer> {
diff --git a/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java b/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
index 7b94ce4..95ae010 100644
--- a/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
+++ b/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
@@ -30,7 +30,7 @@ import net.micode.notes.gtask.data.TaskList;
 import net.micode.notes.gtask.exception.ActionFailureException;
 import net.micode.notes.gtask.exception.NetworkFailureException;
 import net.micode.notes.tool.GTaskStringUtils;
-import net.micode.notes.ui.NotesPreferenceActivity;
+import net.micode.notes.ui.activities.NotesPreferenceActivity;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
diff --git a/app/src/main/java/net/micode/notes/tool/ResourceParser.java b/app/src/main/java/net/micode/notes/tool/ResourceParser.java
index a165b59..ea5fc30 100644
--- a/app/src/main/java/net/micode/notes/tool/ResourceParser.java
+++ b/app/src/main/java/net/micode/notes/tool/ResourceParser.java
@@ -20,7 +20,7 @@ import android.content.Context;
 import android.preference.PreferenceManager;
 
 import net.micode.notes.R;
-import net.micode.notes.ui.NotesPreferenceActivity;
+import net.micode.notes.ui.activities.NotesPreferenceActivity;
 
 public class ResourceParser {
 
diff --git a/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java b/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
index 54e503b..709b3fe 100644
--- a/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
+++ b/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
@@ -20,6 +20,8 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
+import net.micode.notes.ui.activities.AlarmAlertActivity;
+
 public class AlarmReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
diff --git a/app/src/main/java/net/micode/notes/ui/NoteEditText.java b/app/src/main/java/net/micode/notes/ui/NoteEditText.java
index 2c8b646..348005f 100644
--- a/app/src/main/java/net/micode/notes/ui/NoteEditText.java
+++ b/app/src/main/java/net/micode/notes/ui/NoteEditText.java
@@ -33,6 +33,7 @@ import android.view.MotionEvent;
 import android.widget.EditText;
 
 import net.micode.notes.R;
+import net.micode.notes.ui.activities.NoteEditActivity;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/app/src/main/java/net/micode/notes/ui/NoteItemData.java
index b3b4096..1e7955f 100644
--- a/app/src/main/java/net/micode/notes/ui/NoteItemData.java
+++ b/app/src/main/java/net/micode/notes/ui/NoteItemData.java
@@ -24,6 +24,7 @@ import net.micode.notes.data.Contact;
 import net.micode.notes.data.Notes;
 import net.micode.notes.data.Notes.NoteColumns;
 import net.micode.notes.tool.DataUtils;
+import net.micode.notes.ui.activities.NoteEditActivity;
 
 
 public class NoteItemData {
diff --git a/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java b/app/src/main/java/net/micode/notes/ui/activities/AlarmAlertActivity.java
similarity index 99%
rename from app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
rename to app/src/main/java/net/micode/notes/ui/activities/AlarmAlertActivity.java
index 85723be..fb8d889 100644
--- a/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
+++ b/app/src/main/java/net/micode/notes/ui/activities/AlarmAlertActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.micode.notes.ui;
+package net.micode.notes.ui.activities;
 
 import android.app.Activity;
 import android.app.AlertDialog;
diff --git a/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/app/src/main/java/net/micode/notes/ui/activities/NoteEditActivity.java
similarity index 99%
rename from app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
rename to app/src/main/java/net/micode/notes/ui/activities/NoteEditActivity.java
index f76942a..45e6435 100644
--- a/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
+++ b/app/src/main/java/net/micode/notes/ui/activities/NoteEditActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.micode.notes.ui;
+package net.micode.notes.ui.activities;
 
 import android.app.Activity;
 import android.app.AlarmManager;
@@ -60,7 +60,10 @@ import net.micode.notes.model.WorkingNote.NoteSettingChangedListener;
 import net.micode.notes.tool.DataUtils;
 import net.micode.notes.tool.ResourceParser;
 import net.micode.notes.tool.ResourceParser.TextAppearanceResources;
+import net.micode.notes.ui.AlarmReceiver;
+import net.micode.notes.ui.DateTimePickerDialog;
 import net.micode.notes.ui.DateTimePickerDialog.OnDateTimeSetListener;
+import net.micode.notes.ui.NoteEditText;
 import net.micode.notes.ui.NoteEditText.OnTextViewChangeListener;
 import net.micode.notes.widget.NoteWidgetProvider_2x;
 import net.micode.notes.widget.NoteWidgetProvider_4x;
diff --git a/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/app/src/main/java/net/micode/notes/ui/activities/NotesListActivity.java
similarity index 99%
rename from app/src/main/java/net/micode/notes/ui/NotesListActivity.java
rename to app/src/main/java/net/micode/notes/ui/activities/NotesListActivity.java
index 53b9017..9d4d15a 100644
--- a/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
+++ b/app/src/main/java/net/micode/notes/ui/activities/NotesListActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.micode.notes.ui;
+package net.micode.notes.ui.activities;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -68,7 +68,12 @@ import net.micode.notes.model.WorkingNote;
 import net.micode.notes.tool.BackupUtils;
 import net.micode.notes.tool.DataUtils;
 import net.micode.notes.tool.ResourceParser;
+import net.micode.notes.ui.DropdownMenu;
+import net.micode.notes.ui.FoldersListAdapter;
+import net.micode.notes.ui.NoteItemData;
+import net.micode.notes.ui.NotesListAdapter;
 import net.micode.notes.ui.NotesListAdapter.AppWidgetAttribute;
+import net.micode.notes.ui.NotesListItem;
 import net.micode.notes.widget.NoteWidgetProvider_2x;
 import net.micode.notes.widget.NoteWidgetProvider_4x;
 
diff --git a/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java b/app/src/main/java/net/micode/notes/ui/activities/NotesPreferenceActivity.java
similarity index 99%
rename from app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
rename to app/src/main/java/net/micode/notes/ui/activities/NotesPreferenceActivity.java
index e92e3c8..a705a89 100644
--- a/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
+++ b/app/src/main/java/net/micode/notes/ui/activities/NotesPreferenceActivity.java
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package net.micode.notes.ui;
+package net.micode.notes.ui.activities;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
-import android.app.ActionBar;
 import android.app.AlertDialog;
 import android.content.BroadcastReceiver;
 import android.content.ContentValues;
@@ -35,7 +34,6 @@ import android.preference.PreferenceCategory;
 import android.text.TextUtils;
 import android.text.format.DateFormat;
 import android.view.LayoutInflater;
-import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
diff --git a/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java b/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
index d912362..99575d1 100644
--- a/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
+++ b/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
@@ -30,8 +30,8 @@ import net.micode.notes.R;
 import net.micode.notes.data.Notes;
 import net.micode.notes.data.Notes.NoteColumns;
 import net.micode.notes.tool.ResourceParser;
-import net.micode.notes.ui.NoteEditActivity;
-import net.micode.notes.ui.NotesListActivity;
+import net.micode.notes.ui.activities.NoteEditActivity;
+import net.micode.notes.ui.activities.NotesListActivity;
 
 public abstract class NoteWidgetProvider extends AppWidgetProvider {
     public static final String[] PROJECTION = new String[]{