diff --git a/ui/AlarmAlertActivity.java b/AlarmAlertActivity.java
similarity index 100%
rename from ui/AlarmAlertActivity.java
rename to AlarmAlertActivity.java
diff --git a/ui/AlarmInitReceiver.java b/AlarmInitReceiver.java
similarity index 100%
rename from ui/AlarmInitReceiver.java
rename to AlarmInitReceiver.java
diff --git a/ui/AlarmReceiver.java b/AlarmReceiver.java
similarity index 100%
rename from ui/AlarmReceiver.java
rename to AlarmReceiver.java
diff --git a/tool/BackupUtils.java b/BackupUtils.java
similarity index 100%
rename from tool/BackupUtils.java
rename to BackupUtils.java
diff --git a/data/Contact.java b/Contact.java
similarity index 100%
rename from data/Contact.java
rename to Contact.java
diff --git a/tool/DataUtils.java b/DataUtils.java
similarity index 100%
rename from tool/DataUtils.java
rename to DataUtils.java
diff --git a/ui/DateTimePicker.java b/DateTimePicker.java
similarity index 100%
rename from ui/DateTimePicker.java
rename to DateTimePicker.java
diff --git a/ui/DateTimePickerDialog.java b/DateTimePickerDialog.java
similarity index 100%
rename from ui/DateTimePickerDialog.java
rename to DateTimePickerDialog.java
diff --git a/ui/DropdownMenu.java b/DropdownMenu.java
similarity index 100%
rename from ui/DropdownMenu.java
rename to DropdownMenu.java
diff --git a/ui/FoldersListAdapter.java b/FoldersListAdapter.java
similarity index 100%
rename from ui/FoldersListAdapter.java
rename to FoldersListAdapter.java
diff --git a/tool/GTaskStringUtils.java b/GTaskStringUtils.java
similarity index 100%
rename from tool/GTaskStringUtils.java
rename to GTaskStringUtils.java
diff --git a/ui/NoteEditActivity.java b/NoteEditActivity.java
similarity index 100%
rename from ui/NoteEditActivity.java
rename to NoteEditActivity.java
diff --git a/widget/NoteWidgetProvider.java b/NoteWidgetProvider.java
similarity index 100%
rename from widget/NoteWidgetProvider.java
rename to NoteWidgetProvider.java
diff --git a/widget/NoteWidgetProvider_2x.java b/NoteWidgetProvider_2x.java
similarity index 100%
rename from widget/NoteWidgetProvider_2x.java
rename to NoteWidgetProvider_2x.java
diff --git a/widget/NoteWidgetProvider_4x.java b/NoteWidgetProvider_4x.java
similarity index 100%
rename from widget/NoteWidgetProvider_4x.java
rename to NoteWidgetProvider_4x.java
diff --git a/data/Notes.java b/Notes.java
similarity index 100%
rename from data/Notes.java
rename to Notes.java
diff --git a/data/NotesDatabaseHelper.java b/NotesDatabaseHelper.java
similarity index 100%
rename from data/NotesDatabaseHelper.java
rename to NotesDatabaseHelper.java
diff --git a/data/NotesProvider.java b/NotesProvider.java
similarity index 100%
rename from data/NotesProvider.java
rename to NotesProvider.java
diff --git a/tool/ResourceParser.java b/ResourceParser.java
similarity index 100%
rename from tool/ResourceParser.java
rename to ResourceParser.java