diff --git a/.classpath b/astrid/.classpath similarity index 100% rename from .classpath rename to astrid/.classpath diff --git a/.project b/astrid/.project similarity index 93% rename from .project rename to astrid/.project index 768ee9bd2..836231044 100644 --- a/.project +++ b/astrid/.project @@ -1,6 +1,6 @@ - astrid-3.x + astrid diff --git a/.settings/org.eclipse.jdt.core.prefs b/astrid/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from .settings/org.eclipse.jdt.core.prefs rename to astrid/.settings/org.eclipse.jdt.core.prefs diff --git a/.settings/org.eclipse.jdt.ui.prefs b/astrid/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from .settings/org.eclipse.jdt.ui.prefs rename to astrid/.settings/org.eclipse.jdt.ui.prefs diff --git a/AndroidManifest.xml b/astrid/AndroidManifest.xml similarity index 100% rename from AndroidManifest.xml rename to astrid/AndroidManifest.xml diff --git a/api-src/com/todoroo/astrid/api/AstridApiConstants.java b/astrid/api-src/com/todoroo/astrid/api/AstridApiConstants.java similarity index 100% rename from api-src/com/todoroo/astrid/api/AstridApiConstants.java rename to astrid/api-src/com/todoroo/astrid/api/AstridApiConstants.java diff --git a/api-src/com/todoroo/astrid/api/AstridContentProvider.java b/astrid/api-src/com/todoroo/astrid/api/AstridContentProvider.java similarity index 100% rename from api-src/com/todoroo/astrid/api/AstridContentProvider.java rename to astrid/api-src/com/todoroo/astrid/api/AstridContentProvider.java diff --git a/api-src/com/todoroo/astrid/api/EditOperation.java b/astrid/api-src/com/todoroo/astrid/api/EditOperation.java similarity index 100% rename from api-src/com/todoroo/astrid/api/EditOperation.java rename to astrid/api-src/com/todoroo/astrid/api/EditOperation.java diff --git a/api-src/com/todoroo/astrid/api/Filter.java b/astrid/api-src/com/todoroo/astrid/api/Filter.java similarity index 100% rename from api-src/com/todoroo/astrid/api/Filter.java rename to astrid/api-src/com/todoroo/astrid/api/Filter.java diff --git a/api-src/com/todoroo/astrid/api/FilterCategory.java b/astrid/api-src/com/todoroo/astrid/api/FilterCategory.java similarity index 100% rename from api-src/com/todoroo/astrid/api/FilterCategory.java rename to astrid/api-src/com/todoroo/astrid/api/FilterCategory.java diff --git a/api-src/com/todoroo/astrid/api/FilterListHeader.java b/astrid/api-src/com/todoroo/astrid/api/FilterListHeader.java similarity index 100% rename from api-src/com/todoroo/astrid/api/FilterListHeader.java rename to astrid/api-src/com/todoroo/astrid/api/FilterListHeader.java diff --git a/api-src/com/todoroo/astrid/api/FilterListItem.java b/astrid/api-src/com/todoroo/astrid/api/FilterListItem.java similarity index 100% rename from api-src/com/todoroo/astrid/api/FilterListItem.java rename to astrid/api-src/com/todoroo/astrid/api/FilterListItem.java diff --git a/api-src/com/todoroo/astrid/api/TaskDetail.java b/astrid/api-src/com/todoroo/astrid/api/TaskDetail.java similarity index 100% rename from api-src/com/todoroo/astrid/api/TaskDetail.java rename to astrid/api-src/com/todoroo/astrid/api/TaskDetail.java diff --git a/common-src/com/todoroo/andlib/data/AbstractDatabase.java b/astrid/common-src/com/todoroo/andlib/data/AbstractDatabase.java similarity index 100% rename from common-src/com/todoroo/andlib/data/AbstractDatabase.java rename to astrid/common-src/com/todoroo/andlib/data/AbstractDatabase.java diff --git a/common-src/com/todoroo/andlib/data/AbstractModel.java b/astrid/common-src/com/todoroo/andlib/data/AbstractModel.java similarity index 100% rename from common-src/com/todoroo/andlib/data/AbstractModel.java rename to astrid/common-src/com/todoroo/andlib/data/AbstractModel.java diff --git a/common-src/com/todoroo/andlib/data/GenericDao.java b/astrid/common-src/com/todoroo/andlib/data/GenericDao.java similarity index 100% rename from common-src/com/todoroo/andlib/data/GenericDao.java rename to astrid/common-src/com/todoroo/andlib/data/GenericDao.java diff --git a/common-src/com/todoroo/andlib/data/Property.java b/astrid/common-src/com/todoroo/andlib/data/Property.java similarity index 100% rename from common-src/com/todoroo/andlib/data/Property.java rename to astrid/common-src/com/todoroo/andlib/data/Property.java diff --git a/common-src/com/todoroo/andlib/data/Table.java b/astrid/common-src/com/todoroo/andlib/data/Table.java similarity index 100% rename from common-src/com/todoroo/andlib/data/Table.java rename to astrid/common-src/com/todoroo/andlib/data/Table.java diff --git a/common-src/com/todoroo/andlib/data/TodorooCursor.java b/astrid/common-src/com/todoroo/andlib/data/TodorooCursor.java similarity index 100% rename from common-src/com/todoroo/andlib/data/TodorooCursor.java rename to astrid/common-src/com/todoroo/andlib/data/TodorooCursor.java diff --git a/common-src/com/todoroo/andlib/data/sql/Constants.java b/astrid/common-src/com/todoroo/andlib/data/sql/Constants.java similarity index 100% rename from common-src/com/todoroo/andlib/data/sql/Constants.java rename to astrid/common-src/com/todoroo/andlib/data/sql/Constants.java diff --git a/common-src/com/todoroo/andlib/data/sql/Criterion.java b/astrid/common-src/com/todoroo/andlib/data/sql/Criterion.java similarity index 100% rename from common-src/com/todoroo/andlib/data/sql/Criterion.java rename to astrid/common-src/com/todoroo/andlib/data/sql/Criterion.java diff --git a/common-src/com/todoroo/andlib/data/sql/DBObject.java b/astrid/common-src/com/todoroo/andlib/data/sql/DBObject.java similarity index 100% rename from common-src/com/todoroo/andlib/data/sql/DBObject.java rename to astrid/common-src/com/todoroo/andlib/data/sql/DBObject.java diff --git a/common-src/com/todoroo/andlib/data/sql/EqCriterion.java b/astrid/common-src/com/todoroo/andlib/data/sql/EqCriterion.java similarity index 100% rename from common-src/com/todoroo/andlib/data/sql/EqCriterion.java rename to astrid/common-src/com/todoroo/andlib/data/sql/EqCriterion.java diff --git a/common-src/com/todoroo/andlib/data/sql/Field.java b/astrid/common-src/com/todoroo/andlib/data/sql/Field.java similarity index 100% rename from common-src/com/todoroo/andlib/data/sql/Field.java rename to astrid/common-src/com/todoroo/andlib/data/sql/Field.java diff --git a/common-src/com/todoroo/andlib/data/sql/GroupBy.java b/astrid/common-src/com/todoroo/andlib/data/sql/GroupBy.java similarity index 100% rename from common-src/com/todoroo/andlib/data/sql/GroupBy.java rename to astrid/common-src/com/todoroo/andlib/data/sql/GroupBy.java diff --git a/common-src/com/todoroo/andlib/data/sql/Join.java b/astrid/common-src/com/todoroo/andlib/data/sql/Join.java similarity index 100% rename from common-src/com/todoroo/andlib/data/sql/Join.java rename to astrid/common-src/com/todoroo/andlib/data/sql/Join.java diff --git a/common-src/com/todoroo/andlib/data/sql/JoinType.java b/astrid/common-src/com/todoroo/andlib/data/sql/JoinType.java similarity index 100% rename from common-src/com/todoroo/andlib/data/sql/JoinType.java rename to astrid/common-src/com/todoroo/andlib/data/sql/JoinType.java diff --git a/common-src/com/todoroo/andlib/data/sql/Operator.java b/astrid/common-src/com/todoroo/andlib/data/sql/Operator.java similarity index 100% rename from common-src/com/todoroo/andlib/data/sql/Operator.java rename to astrid/common-src/com/todoroo/andlib/data/sql/Operator.java diff --git a/common-src/com/todoroo/andlib/data/sql/Order.java b/astrid/common-src/com/todoroo/andlib/data/sql/Order.java similarity index 100% rename from common-src/com/todoroo/andlib/data/sql/Order.java rename to astrid/common-src/com/todoroo/andlib/data/sql/Order.java diff --git a/common-src/com/todoroo/andlib/data/sql/OrderType.java b/astrid/common-src/com/todoroo/andlib/data/sql/OrderType.java similarity index 100% rename from common-src/com/todoroo/andlib/data/sql/OrderType.java rename to astrid/common-src/com/todoroo/andlib/data/sql/OrderType.java diff --git a/common-src/com/todoroo/andlib/data/sql/Query.java b/astrid/common-src/com/todoroo/andlib/data/sql/Query.java similarity index 100% rename from common-src/com/todoroo/andlib/data/sql/Query.java rename to astrid/common-src/com/todoroo/andlib/data/sql/Query.java diff --git a/common-src/com/todoroo/andlib/data/sql/Table.java b/astrid/common-src/com/todoroo/andlib/data/sql/Table.java similarity index 100% rename from common-src/com/todoroo/andlib/data/sql/Table.java rename to astrid/common-src/com/todoroo/andlib/data/sql/Table.java diff --git a/common-src/com/todoroo/andlib/data/sql/UnaryCriterion.java b/astrid/common-src/com/todoroo/andlib/data/sql/UnaryCriterion.java similarity index 100% rename from common-src/com/todoroo/andlib/data/sql/UnaryCriterion.java rename to astrid/common-src/com/todoroo/andlib/data/sql/UnaryCriterion.java diff --git a/common-src/com/todoroo/andlib/service/AbstractDependencyInjector.java b/astrid/common-src/com/todoroo/andlib/service/AbstractDependencyInjector.java similarity index 100% rename from common-src/com/todoroo/andlib/service/AbstractDependencyInjector.java rename to astrid/common-src/com/todoroo/andlib/service/AbstractDependencyInjector.java diff --git a/common-src/com/todoroo/andlib/service/Autowired.java b/astrid/common-src/com/todoroo/andlib/service/Autowired.java similarity index 100% rename from common-src/com/todoroo/andlib/service/Autowired.java rename to astrid/common-src/com/todoroo/andlib/service/Autowired.java diff --git a/common-src/com/todoroo/andlib/service/ContextManager.java b/astrid/common-src/com/todoroo/andlib/service/ContextManager.java similarity index 100% rename from common-src/com/todoroo/andlib/service/ContextManager.java rename to astrid/common-src/com/todoroo/andlib/service/ContextManager.java diff --git a/common-src/com/todoroo/andlib/service/DependencyInjectionService.java b/astrid/common-src/com/todoroo/andlib/service/DependencyInjectionService.java similarity index 100% rename from common-src/com/todoroo/andlib/service/DependencyInjectionService.java rename to astrid/common-src/com/todoroo/andlib/service/DependencyInjectionService.java diff --git a/common-src/com/todoroo/andlib/service/ExceptionService.java b/astrid/common-src/com/todoroo/andlib/service/ExceptionService.java similarity index 100% rename from common-src/com/todoroo/andlib/service/ExceptionService.java rename to astrid/common-src/com/todoroo/andlib/service/ExceptionService.java diff --git a/common-src/com/todoroo/andlib/service/HttpErrorException.java b/astrid/common-src/com/todoroo/andlib/service/HttpErrorException.java similarity index 100% rename from common-src/com/todoroo/andlib/service/HttpErrorException.java rename to astrid/common-src/com/todoroo/andlib/service/HttpErrorException.java diff --git a/common-src/com/todoroo/andlib/service/HttpRestClient.java b/astrid/common-src/com/todoroo/andlib/service/HttpRestClient.java similarity index 100% rename from common-src/com/todoroo/andlib/service/HttpRestClient.java rename to astrid/common-src/com/todoroo/andlib/service/HttpRestClient.java diff --git a/common-src/com/todoroo/andlib/service/HttpUnavailableException.java b/astrid/common-src/com/todoroo/andlib/service/HttpUnavailableException.java similarity index 100% rename from common-src/com/todoroo/andlib/service/HttpUnavailableException.java rename to astrid/common-src/com/todoroo/andlib/service/HttpUnavailableException.java diff --git a/common-src/com/todoroo/andlib/service/NotificationManager.java b/astrid/common-src/com/todoroo/andlib/service/NotificationManager.java similarity index 100% rename from common-src/com/todoroo/andlib/service/NotificationManager.java rename to astrid/common-src/com/todoroo/andlib/service/NotificationManager.java diff --git a/common-src/com/todoroo/andlib/service/RestClient.java b/astrid/common-src/com/todoroo/andlib/service/RestClient.java similarity index 100% rename from common-src/com/todoroo/andlib/service/RestClient.java rename to astrid/common-src/com/todoroo/andlib/service/RestClient.java diff --git a/common-src/com/todoroo/andlib/utility/AndroidUtilities.java b/astrid/common-src/com/todoroo/andlib/utility/AndroidUtilities.java similarity index 100% rename from common-src/com/todoroo/andlib/utility/AndroidUtilities.java rename to astrid/common-src/com/todoroo/andlib/utility/AndroidUtilities.java diff --git a/common-src/com/todoroo/andlib/utility/Base64.java b/astrid/common-src/com/todoroo/andlib/utility/Base64.java similarity index 100% rename from common-src/com/todoroo/andlib/utility/Base64.java rename to astrid/common-src/com/todoroo/andlib/utility/Base64.java diff --git a/common-src/com/todoroo/andlib/utility/DateUtilities.java b/astrid/common-src/com/todoroo/andlib/utility/DateUtilities.java similarity index 100% rename from common-src/com/todoroo/andlib/utility/DateUtilities.java rename to astrid/common-src/com/todoroo/andlib/utility/DateUtilities.java diff --git a/common-src/com/todoroo/andlib/utility/DialogUtilities.java b/astrid/common-src/com/todoroo/andlib/utility/DialogUtilities.java similarity index 100% rename from common-src/com/todoroo/andlib/utility/DialogUtilities.java rename to astrid/common-src/com/todoroo/andlib/utility/DialogUtilities.java diff --git a/common-src/com/todoroo/andlib/utility/EmailValidator.java b/astrid/common-src/com/todoroo/andlib/utility/EmailValidator.java similarity index 100% rename from common-src/com/todoroo/andlib/utility/EmailValidator.java rename to astrid/common-src/com/todoroo/andlib/utility/EmailValidator.java diff --git a/common-src/com/todoroo/andlib/utility/Pair.java b/astrid/common-src/com/todoroo/andlib/utility/Pair.java similarity index 100% rename from common-src/com/todoroo/andlib/utility/Pair.java rename to astrid/common-src/com/todoroo/andlib/utility/Pair.java diff --git a/common-src/com/todoroo/andlib/utility/SoftHashMap.java b/astrid/common-src/com/todoroo/andlib/utility/SoftHashMap.java similarity index 100% rename from common-src/com/todoroo/andlib/utility/SoftHashMap.java rename to astrid/common-src/com/todoroo/andlib/utility/SoftHashMap.java diff --git a/common-src/com/todoroo/andlib/utility/UserTask.java b/astrid/common-src/com/todoroo/andlib/utility/UserTask.java similarity index 100% rename from common-src/com/todoroo/andlib/utility/UserTask.java rename to astrid/common-src/com/todoroo/andlib/utility/UserTask.java diff --git a/common-src/com/todoroo/andlib/widget/DateControlSet.java b/astrid/common-src/com/todoroo/andlib/widget/DateControlSet.java similarity index 100% rename from common-src/com/todoroo/andlib/widget/DateControlSet.java rename to astrid/common-src/com/todoroo/andlib/widget/DateControlSet.java diff --git a/common-src/com/todoroo/andlib/widget/DateWithNullControlSet.java b/astrid/common-src/com/todoroo/andlib/widget/DateWithNullControlSet.java similarity index 100% rename from common-src/com/todoroo/andlib/widget/DateWithNullControlSet.java rename to astrid/common-src/com/todoroo/andlib/widget/DateWithNullControlSet.java diff --git a/common-src/com/todoroo/andlib/widget/NNumberPickerDialog.java b/astrid/common-src/com/todoroo/andlib/widget/NNumberPickerDialog.java similarity index 100% rename from common-src/com/todoroo/andlib/widget/NNumberPickerDialog.java rename to astrid/common-src/com/todoroo/andlib/widget/NNumberPickerDialog.java diff --git a/common-src/com/todoroo/andlib/widget/NumberPickerDialog.java b/astrid/common-src/com/todoroo/andlib/widget/NumberPickerDialog.java similarity index 100% rename from common-src/com/todoroo/andlib/widget/NumberPickerDialog.java rename to astrid/common-src/com/todoroo/andlib/widget/NumberPickerDialog.java diff --git a/common-src/com/todoroo/andlib/widget/NumberPickerWidget.java b/astrid/common-src/com/todoroo/andlib/widget/NumberPickerWidget.java similarity index 100% rename from common-src/com/todoroo/andlib/widget/NumberPickerWidget.java rename to astrid/common-src/com/todoroo/andlib/widget/NumberPickerWidget.java diff --git a/common-src/com/todoroo/andlib/widget/NumberPickerWidgetButton.java b/astrid/common-src/com/todoroo/andlib/widget/NumberPickerWidgetButton.java similarity index 100% rename from common-src/com/todoroo/andlib/widget/NumberPickerWidgetButton.java rename to astrid/common-src/com/todoroo/andlib/widget/NumberPickerWidgetButton.java diff --git a/default.properties b/astrid/default.properties similarity index 100% rename from default.properties rename to astrid/default.properties diff --git a/astrid/gen/.gitignore b/astrid/gen/.gitignore new file mode 100644 index 000000000..e69de29bb diff --git a/lib/FlurryAgent.jar b/astrid/lib/FlurryAgent.jar similarity index 100% rename from lib/FlurryAgent.jar rename to astrid/lib/FlurryAgent.jar diff --git a/lib/commons-codec-1.3.jar b/astrid/lib/commons-codec-1.3.jar similarity index 100% rename from lib/commons-codec-1.3.jar rename to astrid/lib/commons-codec-1.3.jar diff --git a/lib/locale_platform.jar b/astrid/lib/locale_platform.jar similarity index 100% rename from lib/locale_platform.jar rename to astrid/lib/locale_platform.jar diff --git a/plugin-src/com/todoroo/astrid/alarms/Alarm.java b/astrid/plugin-src/com/todoroo/astrid/alarms/Alarm.java similarity index 100% rename from plugin-src/com/todoroo/astrid/alarms/Alarm.java rename to astrid/plugin-src/com/todoroo/astrid/alarms/Alarm.java diff --git a/plugin-src/com/todoroo/astrid/alarms/AlarmService.java b/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmService.java similarity index 100% rename from plugin-src/com/todoroo/astrid/alarms/AlarmService.java rename to astrid/plugin-src/com/todoroo/astrid/alarms/AlarmService.java diff --git a/plugin-src/com/todoroo/astrid/alarms/AlarmsDatabase.java b/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmsDatabase.java similarity index 100% rename from plugin-src/com/todoroo/astrid/alarms/AlarmsDatabase.java rename to astrid/plugin-src/com/todoroo/astrid/alarms/AlarmsDatabase.java diff --git a/plugin-src/com/todoroo/astrid/tags/DataService.java b/astrid/plugin-src/com/todoroo/astrid/tags/DataService.java similarity index 100% rename from plugin-src/com/todoroo/astrid/tags/DataService.java rename to astrid/plugin-src/com/todoroo/astrid/tags/DataService.java diff --git a/res/anim/fade_in.xml b/astrid/res/anim/fade_in.xml similarity index 100% rename from res/anim/fade_in.xml rename to astrid/res/anim/fade_in.xml diff --git a/res/anim/fade_out.xml b/astrid/res/anim/fade_out.xml similarity index 100% rename from res/anim/fade_out.xml rename to astrid/res/anim/fade_out.xml diff --git a/res/anim/slide_left_in.xml b/astrid/res/anim/slide_left_in.xml similarity index 100% rename from res/anim/slide_left_in.xml rename to astrid/res/anim/slide_left_in.xml diff --git a/res/anim/slide_left_out.xml b/astrid/res/anim/slide_left_out.xml similarity index 100% rename from res/anim/slide_left_out.xml rename to astrid/res/anim/slide_left_out.xml diff --git a/res/anim/slide_right_in.xml b/astrid/res/anim/slide_right_in.xml similarity index 100% rename from res/anim/slide_right_in.xml rename to astrid/res/anim/slide_right_in.xml diff --git a/res/anim/slide_right_out.xml b/astrid/res/anim/slide_right_out.xml similarity index 100% rename from res/anim/slide_right_out.xml rename to astrid/res/anim/slide_right_out.xml diff --git a/res/drawable-hdpi/widget_frame.png b/astrid/res/drawable-hdpi/widget_frame.png similarity index 100% rename from res/drawable-hdpi/widget_frame.png rename to astrid/res/drawable-hdpi/widget_frame.png diff --git a/res/drawable-land-hdpi/widget_frame.png b/astrid/res/drawable-land-hdpi/widget_frame.png similarity index 100% rename from res/drawable-land-hdpi/widget_frame.png rename to astrid/res/drawable-land-hdpi/widget_frame.png diff --git a/res/drawable-land-mdpi/widget_frame.png b/astrid/res/drawable-land-mdpi/widget_frame.png similarity index 100% rename from res/drawable-land-mdpi/widget_frame.png rename to astrid/res/drawable-land-mdpi/widget_frame.png diff --git a/res/drawable-land/separator.png b/astrid/res/drawable-land/separator.png similarity index 100% rename from res/drawable-land/separator.png rename to astrid/res/drawable-land/separator.png diff --git a/res/drawable-mdpi/widget_frame.png b/astrid/res/drawable-mdpi/widget_frame.png similarity index 100% rename from res/drawable-mdpi/widget_frame.png rename to astrid/res/drawable-mdpi/widget_frame.png diff --git a/res/drawable/btn_check0.xml b/astrid/res/drawable/btn_check0.xml similarity index 100% rename from res/drawable/btn_check0.xml rename to astrid/res/drawable/btn_check0.xml diff --git a/res/drawable/btn_check25.xml b/astrid/res/drawable/btn_check25.xml similarity index 100% rename from res/drawable/btn_check25.xml rename to astrid/res/drawable/btn_check25.xml diff --git a/res/drawable/btn_check50.xml b/astrid/res/drawable/btn_check50.xml similarity index 100% rename from res/drawable/btn_check50.xml rename to astrid/res/drawable/btn_check50.xml diff --git a/res/drawable/btn_check75.xml b/astrid/res/drawable/btn_check75.xml similarity index 100% rename from res/drawable/btn_check75.xml rename to astrid/res/drawable/btn_check75.xml diff --git a/res/drawable/btn_check_0.png b/astrid/res/drawable/btn_check_0.png similarity index 100% rename from res/drawable/btn_check_0.png rename to astrid/res/drawable/btn_check_0.png diff --git a/res/drawable/btn_check_25.png b/astrid/res/drawable/btn_check_25.png similarity index 100% rename from res/drawable/btn_check_25.png rename to astrid/res/drawable/btn_check_25.png diff --git a/res/drawable/btn_check_50.png b/astrid/res/drawable/btn_check_50.png similarity index 100% rename from res/drawable/btn_check_50.png rename to astrid/res/drawable/btn_check_50.png diff --git a/res/drawable/btn_check_75.png b/astrid/res/drawable/btn_check_75.png similarity index 100% rename from res/drawable/btn_check_75.png rename to astrid/res/drawable/btn_check_75.png diff --git a/res/drawable/btn_check_off.png b/astrid/res/drawable/btn_check_off.png similarity index 100% rename from res/drawable/btn_check_off.png rename to astrid/res/drawable/btn_check_off.png diff --git a/res/drawable/btn_check_off_pressed.png b/astrid/res/drawable/btn_check_off_pressed.png similarity index 100% rename from res/drawable/btn_check_off_pressed.png rename to astrid/res/drawable/btn_check_off_pressed.png diff --git a/res/drawable/btn_check_on.png b/astrid/res/drawable/btn_check_on.png similarity index 100% rename from res/drawable/btn_check_on.png rename to astrid/res/drawable/btn_check_on.png diff --git a/res/drawable/btn_check_on_pressed.png b/astrid/res/drawable/btn_check_on_pressed.png similarity index 100% rename from res/drawable/btn_check_on_pressed.png rename to astrid/res/drawable/btn_check_on_pressed.png diff --git a/res/drawable/button_plus.png b/astrid/res/drawable/button_plus.png similarity index 100% rename from res/drawable/button_plus.png rename to astrid/res/drawable/button_plus.png diff --git a/res/drawable/ic_dialog_alert_c.png b/astrid/res/drawable/ic_dialog_alert_c.png similarity index 100% rename from res/drawable/ic_dialog_alert_c.png rename to astrid/res/drawable/ic_dialog_alert_c.png diff --git a/res/drawable/ic_dialog_info_c.png b/astrid/res/drawable/ic_dialog_info_c.png similarity index 100% rename from res/drawable/ic_dialog_info_c.png rename to astrid/res/drawable/ic_dialog_info_c.png diff --git a/res/drawable/ic_dialog_time.png b/astrid/res/drawable/ic_dialog_time.png similarity index 100% rename from res/drawable/ic_dialog_time.png rename to astrid/res/drawable/ic_dialog_time.png diff --git a/res/drawable/ic_dialog_time_c.png b/astrid/res/drawable/ic_dialog_time_c.png similarity index 100% rename from res/drawable/ic_dialog_time_c.png rename to astrid/res/drawable/ic_dialog_time_c.png diff --git a/res/drawable/icon.png b/astrid/res/drawable/icon.png similarity index 100% rename from res/drawable/icon.png rename to astrid/res/drawable/icon.png diff --git a/res/drawable/icon_32.png b/astrid/res/drawable/icon_32.png similarity index 100% rename from res/drawable/icon_32.png rename to astrid/res/drawable/icon_32.png diff --git a/res/drawable/icon_add.png b/astrid/res/drawable/icon_add.png similarity index 100% rename from res/drawable/icon_add.png rename to astrid/res/drawable/icon_add.png diff --git a/res/drawable/icon_dontsave_color_40.png b/astrid/res/drawable/icon_dontsave_color_40.png similarity index 100% rename from res/drawable/icon_dontsave_color_40.png rename to astrid/res/drawable/icon_dontsave_color_40.png diff --git a/res/drawable/icon_help_color_40.png b/astrid/res/drawable/icon_help_color_40.png similarity index 100% rename from res/drawable/icon_help_color_40.png rename to astrid/res/drawable/icon_help_color_40.png diff --git a/res/drawable/icon_save_color_40.png b/astrid/res/drawable/icon_save_color_40.png similarity index 100% rename from res/drawable/icon_save_color_40.png rename to astrid/res/drawable/icon_save_color_40.png diff --git a/res/drawable/icon_tag.png b/astrid/res/drawable/icon_tag.png similarity index 100% rename from res/drawable/icon_tag.png rename to astrid/res/drawable/icon_tag.png diff --git a/res/drawable/icon_timer.png b/astrid/res/drawable/icon_timer.png similarity index 100% rename from res/drawable/icon_timer.png rename to astrid/res/drawable/icon_timer.png diff --git a/res/drawable/locale_border.9.png b/astrid/res/drawable/locale_border.9.png similarity index 100% rename from res/drawable/locale_border.9.png rename to astrid/res/drawable/locale_border.9.png diff --git a/res/drawable/notif_astrid.png b/astrid/res/drawable/notif_astrid.png similarity index 100% rename from res/drawable/notif_astrid.png rename to astrid/res/drawable/notif_astrid.png diff --git a/res/drawable/notif_boring_alarm.png b/astrid/res/drawable/notif_boring_alarm.png similarity index 100% rename from res/drawable/notif_boring_alarm.png rename to astrid/res/drawable/notif_boring_alarm.png diff --git a/res/drawable/notif_boring_working.png b/astrid/res/drawable/notif_boring_working.png similarity index 100% rename from res/drawable/notif_boring_working.png rename to astrid/res/drawable/notif_boring_working.png diff --git a/res/drawable/notif_pink_alarm.png b/astrid/res/drawable/notif_pink_alarm.png similarity index 100% rename from res/drawable/notif_pink_alarm.png rename to astrid/res/drawable/notif_pink_alarm.png diff --git a/res/drawable/notif_pink_working.png b/astrid/res/drawable/notif_pink_working.png similarity index 100% rename from res/drawable/notif_pink_working.png rename to astrid/res/drawable/notif_pink_working.png diff --git a/res/drawable/notif_tag.png b/astrid/res/drawable/notif_tag.png similarity index 100% rename from res/drawable/notif_tag.png rename to astrid/res/drawable/notif_tag.png diff --git a/res/drawable/separator.png b/astrid/res/drawable/separator.png similarity index 100% rename from res/drawable/separator.png rename to astrid/res/drawable/separator.png diff --git a/res/drawable/timepicker_down_btn.xml b/astrid/res/drawable/timepicker_down_btn.xml similarity index 100% rename from res/drawable/timepicker_down_btn.xml rename to astrid/res/drawable/timepicker_down_btn.xml diff --git a/res/drawable/timepicker_down_disabled.9.png b/astrid/res/drawable/timepicker_down_disabled.9.png similarity index 100% rename from res/drawable/timepicker_down_disabled.9.png rename to astrid/res/drawable/timepicker_down_disabled.9.png diff --git a/res/drawable/timepicker_down_disabled_focused.9.png b/astrid/res/drawable/timepicker_down_disabled_focused.9.png similarity index 100% rename from res/drawable/timepicker_down_disabled_focused.9.png rename to astrid/res/drawable/timepicker_down_disabled_focused.9.png diff --git a/res/drawable/timepicker_down_normal.9.png b/astrid/res/drawable/timepicker_down_normal.9.png similarity index 100% rename from res/drawable/timepicker_down_normal.9.png rename to astrid/res/drawable/timepicker_down_normal.9.png diff --git a/res/drawable/timepicker_down_pressed.9.png b/astrid/res/drawable/timepicker_down_pressed.9.png similarity index 100% rename from res/drawable/timepicker_down_pressed.9.png rename to astrid/res/drawable/timepicker_down_pressed.9.png diff --git a/res/drawable/timepicker_down_selected.9.png b/astrid/res/drawable/timepicker_down_selected.9.png similarity index 100% rename from res/drawable/timepicker_down_selected.9.png rename to astrid/res/drawable/timepicker_down_selected.9.png diff --git a/res/drawable/timepicker_input.xml b/astrid/res/drawable/timepicker_input.xml similarity index 100% rename from res/drawable/timepicker_input.xml rename to astrid/res/drawable/timepicker_input.xml diff --git a/res/drawable/timepicker_input_disabled.9.png b/astrid/res/drawable/timepicker_input_disabled.9.png similarity index 100% rename from res/drawable/timepicker_input_disabled.9.png rename to astrid/res/drawable/timepicker_input_disabled.9.png diff --git a/res/drawable/timepicker_input_normal.9.png b/astrid/res/drawable/timepicker_input_normal.9.png similarity index 100% rename from res/drawable/timepicker_input_normal.9.png rename to astrid/res/drawable/timepicker_input_normal.9.png diff --git a/res/drawable/timepicker_input_pressed.9.png b/astrid/res/drawable/timepicker_input_pressed.9.png similarity index 100% rename from res/drawable/timepicker_input_pressed.9.png rename to astrid/res/drawable/timepicker_input_pressed.9.png diff --git a/res/drawable/timepicker_input_selected.9.png b/astrid/res/drawable/timepicker_input_selected.9.png similarity index 100% rename from res/drawable/timepicker_input_selected.9.png rename to astrid/res/drawable/timepicker_input_selected.9.png diff --git a/res/drawable/timepicker_up_btn.xml b/astrid/res/drawable/timepicker_up_btn.xml similarity index 100% rename from res/drawable/timepicker_up_btn.xml rename to astrid/res/drawable/timepicker_up_btn.xml diff --git a/res/drawable/timepicker_up_disabled.9.png b/astrid/res/drawable/timepicker_up_disabled.9.png similarity index 100% rename from res/drawable/timepicker_up_disabled.9.png rename to astrid/res/drawable/timepicker_up_disabled.9.png diff --git a/res/drawable/timepicker_up_disabled_focused.9.png b/astrid/res/drawable/timepicker_up_disabled_focused.9.png similarity index 100% rename from res/drawable/timepicker_up_disabled_focused.9.png rename to astrid/res/drawable/timepicker_up_disabled_focused.9.png diff --git a/res/drawable/timepicker_up_normal.9.png b/astrid/res/drawable/timepicker_up_normal.9.png similarity index 100% rename from res/drawable/timepicker_up_normal.9.png rename to astrid/res/drawable/timepicker_up_normal.9.png diff --git a/res/drawable/timepicker_up_pressed.9.png b/astrid/res/drawable/timepicker_up_pressed.9.png similarity index 100% rename from res/drawable/timepicker_up_pressed.9.png rename to astrid/res/drawable/timepicker_up_pressed.9.png diff --git a/res/drawable/timepicker_up_selected.9.png b/astrid/res/drawable/timepicker_up_selected.9.png similarity index 100% rename from res/drawable/timepicker_up_selected.9.png rename to astrid/res/drawable/timepicker_up_selected.9.png diff --git a/res/layout-land/widget_initialized.xml b/astrid/res/layout-land/widget_initialized.xml similarity index 100% rename from res/layout-land/widget_initialized.xml rename to astrid/res/layout-land/widget_initialized.xml diff --git a/res/layout/edit_alert_item.xml b/astrid/res/layout/edit_alert_item.xml similarity index 100% rename from res/layout/edit_alert_item.xml rename to astrid/res/layout/edit_alert_item.xml diff --git a/res/layout/edit_importance_item.xml b/astrid/res/layout/edit_importance_item.xml similarity index 100% rename from res/layout/edit_importance_item.xml rename to astrid/res/layout/edit_importance_item.xml diff --git a/res/layout/edit_tag_item.xml b/astrid/res/layout/edit_tag_item.xml similarity index 100% rename from res/layout/edit_tag_item.xml rename to astrid/res/layout/edit_tag_item.xml diff --git a/res/layout/importance_spinner_dropdown.xml b/astrid/res/layout/importance_spinner_dropdown.xml similarity index 100% rename from res/layout/importance_spinner_dropdown.xml rename to astrid/res/layout/importance_spinner_dropdown.xml diff --git a/res/layout/locale_edit_alerts.xml b/astrid/res/layout/locale_edit_alerts.xml similarity index 100% rename from res/layout/locale_edit_alerts.xml rename to astrid/res/layout/locale_edit_alerts.xml diff --git a/res/layout/locale_ellipsizing_title.xml b/astrid/res/layout/locale_ellipsizing_title.xml similarity index 100% rename from res/layout/locale_ellipsizing_title.xml rename to astrid/res/layout/locale_ellipsizing_title.xml diff --git a/res/layout/main.xml b/astrid/res/layout/main.xml similarity index 100% rename from res/layout/main.xml rename to astrid/res/layout/main.xml diff --git a/res/layout/n_number_picker_dialog.xml b/astrid/res/layout/n_number_picker_dialog.xml similarity index 100% rename from res/layout/n_number_picker_dialog.xml rename to astrid/res/layout/n_number_picker_dialog.xml diff --git a/res/layout/notification_dialog.xml b/astrid/res/layout/notification_dialog.xml similarity index 100% rename from res/layout/notification_dialog.xml rename to astrid/res/layout/notification_dialog.xml diff --git a/res/layout/number_picker.xml b/astrid/res/layout/number_picker.xml similarity index 100% rename from res/layout/number_picker.xml rename to astrid/res/layout/number_picker.xml diff --git a/res/layout/number_picker_dialog.xml b/astrid/res/layout/number_picker_dialog.xml similarity index 100% rename from res/layout/number_picker_dialog.xml rename to astrid/res/layout/number_picker_dialog.xml diff --git a/res/layout/sync_footer.xml b/astrid/res/layout/sync_footer.xml similarity index 100% rename from res/layout/sync_footer.xml rename to astrid/res/layout/sync_footer.xml diff --git a/res/layout/sync_login.xml b/astrid/res/layout/sync_login.xml similarity index 100% rename from res/layout/sync_login.xml rename to astrid/res/layout/sync_login.xml diff --git a/res/layout/task_edit.xml b/astrid/res/layout/task_edit.xml similarity index 100% rename from res/layout/task_edit.xml rename to astrid/res/layout/task_edit.xml diff --git a/res/layout/task_list_row.xml b/astrid/res/layout/task_list_row.xml similarity index 100% rename from res/layout/task_list_row.xml rename to astrid/res/layout/task_list_row.xml diff --git a/res/layout/task_notify.xml b/astrid/res/layout/task_notify.xml similarity index 100% rename from res/layout/task_notify.xml rename to astrid/res/layout/task_notify.xml diff --git a/res/layout/widget_initialized.xml b/astrid/res/layout/widget_initialized.xml similarity index 100% rename from res/layout/widget_initialized.xml rename to astrid/res/layout/widget_initialized.xml diff --git a/res/layout/widget_loading.xml b/astrid/res/layout/widget_loading.xml similarity index 100% rename from res/layout/widget_loading.xml rename to astrid/res/layout/widget_loading.xml diff --git a/res/menu/locale_edit_alerts.xml b/astrid/res/menu/locale_edit_alerts.xml similarity index 100% rename from res/menu/locale_edit_alerts.xml rename to astrid/res/menu/locale_edit_alerts.xml diff --git a/res/values-ca/arrays.xml b/astrid/res/values-ca/arrays.xml similarity index 100% rename from res/values-ca/arrays.xml rename to astrid/res/values-ca/arrays.xml diff --git a/res/values-ca/strings.xml b/astrid/res/values-ca/strings.xml similarity index 100% rename from res/values-ca/strings.xml rename to astrid/res/values-ca/strings.xml diff --git a/res/values-cs/arrays.xml b/astrid/res/values-cs/arrays.xml similarity index 100% rename from res/values-cs/arrays.xml rename to astrid/res/values-cs/arrays.xml diff --git a/res/values-cs/strings.xml b/astrid/res/values-cs/strings.xml similarity index 100% rename from res/values-cs/strings.xml rename to astrid/res/values-cs/strings.xml diff --git a/res/values-de/arrays.xml b/astrid/res/values-de/arrays.xml similarity index 100% rename from res/values-de/arrays.xml rename to astrid/res/values-de/arrays.xml diff --git a/res/values-de/strings.xml b/astrid/res/values-de/strings.xml similarity index 100% rename from res/values-de/strings.xml rename to astrid/res/values-de/strings.xml diff --git a/res/values-es/arrays.xml b/astrid/res/values-es/arrays.xml similarity index 100% rename from res/values-es/arrays.xml rename to astrid/res/values-es/arrays.xml diff --git a/res/values-es/strings.xml b/astrid/res/values-es/strings.xml similarity index 100% rename from res/values-es/strings.xml rename to astrid/res/values-es/strings.xml diff --git a/res/values-fr/arrays.xml b/astrid/res/values-fr/arrays.xml similarity index 100% rename from res/values-fr/arrays.xml rename to astrid/res/values-fr/arrays.xml diff --git a/res/values-fr/strings.xml b/astrid/res/values-fr/strings.xml similarity index 100% rename from res/values-fr/strings.xml rename to astrid/res/values-fr/strings.xml diff --git a/res/values-id/arrays.xml b/astrid/res/values-id/arrays.xml similarity index 100% rename from res/values-id/arrays.xml rename to astrid/res/values-id/arrays.xml diff --git a/res/values-id/strings.xml b/astrid/res/values-id/strings.xml similarity index 100% rename from res/values-id/strings.xml rename to astrid/res/values-id/strings.xml diff --git a/res/values-it/arrays.xml b/astrid/res/values-it/arrays.xml similarity index 100% rename from res/values-it/arrays.xml rename to astrid/res/values-it/arrays.xml diff --git a/res/values-it/strings.xml b/astrid/res/values-it/strings.xml similarity index 100% rename from res/values-it/strings.xml rename to astrid/res/values-it/strings.xml diff --git a/res/values-ja/arrays.xml b/astrid/res/values-ja/arrays.xml similarity index 100% rename from res/values-ja/arrays.xml rename to astrid/res/values-ja/arrays.xml diff --git a/res/values-ja/strings.xml b/astrid/res/values-ja/strings.xml similarity index 100% rename from res/values-ja/strings.xml rename to astrid/res/values-ja/strings.xml diff --git a/res/values-ko/arrays.xml b/astrid/res/values-ko/arrays.xml similarity index 100% rename from res/values-ko/arrays.xml rename to astrid/res/values-ko/arrays.xml diff --git a/res/values-ko/strings.xml b/astrid/res/values-ko/strings.xml similarity index 100% rename from res/values-ko/strings.xml rename to astrid/res/values-ko/strings.xml diff --git a/res/values-nb/arrays.xml b/astrid/res/values-nb/arrays.xml similarity index 100% rename from res/values-nb/arrays.xml rename to astrid/res/values-nb/arrays.xml diff --git a/res/values-nb/strings.xml b/astrid/res/values-nb/strings.xml similarity index 100% rename from res/values-nb/strings.xml rename to astrid/res/values-nb/strings.xml diff --git a/res/values-nl/arrays.xml b/astrid/res/values-nl/arrays.xml similarity index 100% rename from res/values-nl/arrays.xml rename to astrid/res/values-nl/arrays.xml diff --git a/res/values-nl/strings.xml b/astrid/res/values-nl/strings.xml similarity index 100% rename from res/values-nl/strings.xml rename to astrid/res/values-nl/strings.xml diff --git a/res/values-pl/arrays.xml b/astrid/res/values-pl/arrays.xml similarity index 100% rename from res/values-pl/arrays.xml rename to astrid/res/values-pl/arrays.xml diff --git a/res/values-pl/strings.xml b/astrid/res/values-pl/strings.xml similarity index 100% rename from res/values-pl/strings.xml rename to astrid/res/values-pl/strings.xml diff --git a/res/values-ru/arrays.xml b/astrid/res/values-ru/arrays.xml similarity index 100% rename from res/values-ru/arrays.xml rename to astrid/res/values-ru/arrays.xml diff --git a/res/values-ru/strings.xml b/astrid/res/values-ru/strings.xml similarity index 100% rename from res/values-ru/strings.xml rename to astrid/res/values-ru/strings.xml diff --git a/res/values-zh-rCN/arrays.xml b/astrid/res/values-zh-rCN/arrays.xml similarity index 100% rename from res/values-zh-rCN/arrays.xml rename to astrid/res/values-zh-rCN/arrays.xml diff --git a/res/values-zh-rCN/strings.xml b/astrid/res/values-zh-rCN/strings.xml similarity index 100% rename from res/values-zh-rCN/strings.xml rename to astrid/res/values-zh-rCN/strings.xml diff --git a/res/values-zh-rTW/arrays.xml b/astrid/res/values-zh-rTW/arrays.xml similarity index 100% rename from res/values-zh-rTW/arrays.xml rename to astrid/res/values-zh-rTW/arrays.xml diff --git a/res/values-zh-rTW/strings.xml b/astrid/res/values-zh-rTW/strings.xml similarity index 100% rename from res/values-zh-rTW/strings.xml rename to astrid/res/values-zh-rTW/strings.xml diff --git a/res/values/arrays-legacy.xml b/astrid/res/values/arrays-legacy.xml similarity index 100% rename from res/values/arrays-legacy.xml rename to astrid/res/values/arrays-legacy.xml diff --git a/res/values/colors-legacy.xml b/astrid/res/values/colors-legacy.xml similarity index 100% rename from res/values/colors-legacy.xml rename to astrid/res/values/colors-legacy.xml diff --git a/res/values/keys.xml b/astrid/res/values/keys.xml similarity index 100% rename from res/values/keys.xml rename to astrid/res/values/keys.xml diff --git a/res/values/strings-legacy.xml b/astrid/res/values/strings-legacy.xml similarity index 100% rename from res/values/strings-legacy.xml rename to astrid/res/values/strings-legacy.xml diff --git a/res/values/strings.xml b/astrid/res/values/strings.xml similarity index 100% rename from res/values/strings.xml rename to astrid/res/values/strings.xml diff --git a/res/values/styles-legacy.xml b/astrid/res/values/styles-legacy.xml similarity index 100% rename from res/values/styles-legacy.xml rename to astrid/res/values/styles-legacy.xml diff --git a/res/xml/preferences.xml b/astrid/res/xml/preferences.xml similarity index 100% rename from res/xml/preferences.xml rename to astrid/res/xml/preferences.xml diff --git a/res/xml/sync_preferences.xml b/astrid/res/xml/sync_preferences.xml similarity index 100% rename from res/xml/sync_preferences.xml rename to astrid/res/xml/sync_preferences.xml diff --git a/res/xml/widget_provider_info.xml b/astrid/res/xml/widget_provider_info.xml similarity index 100% rename from res/xml/widget_provider_info.xml rename to astrid/res/xml/widget_provider_info.xml diff --git a/src-legacy/com/mdt/rtm/ApplicationInfo.java b/astrid/src-legacy/com/mdt/rtm/ApplicationInfo.java similarity index 100% rename from src-legacy/com/mdt/rtm/ApplicationInfo.java rename to astrid/src-legacy/com/mdt/rtm/ApplicationInfo.java diff --git a/src-legacy/com/mdt/rtm/Invoker.java b/astrid/src-legacy/com/mdt/rtm/Invoker.java similarity index 100% rename from src-legacy/com/mdt/rtm/Invoker.java rename to astrid/src-legacy/com/mdt/rtm/Invoker.java diff --git a/src-legacy/com/mdt/rtm/Param.java b/astrid/src-legacy/com/mdt/rtm/Param.java similarity index 100% rename from src-legacy/com/mdt/rtm/Param.java rename to astrid/src-legacy/com/mdt/rtm/Param.java diff --git a/src-legacy/com/mdt/rtm/Prefs.java b/astrid/src-legacy/com/mdt/rtm/Prefs.java similarity index 100% rename from src-legacy/com/mdt/rtm/Prefs.java rename to astrid/src-legacy/com/mdt/rtm/Prefs.java diff --git a/src-legacy/com/mdt/rtm/Service.java b/astrid/src-legacy/com/mdt/rtm/Service.java similarity index 100% rename from src-legacy/com/mdt/rtm/Service.java rename to astrid/src-legacy/com/mdt/rtm/Service.java diff --git a/src-legacy/com/mdt/rtm/ServiceException.java b/astrid/src-legacy/com/mdt/rtm/ServiceException.java similarity index 100% rename from src-legacy/com/mdt/rtm/ServiceException.java rename to astrid/src-legacy/com/mdt/rtm/ServiceException.java diff --git a/src-legacy/com/mdt/rtm/ServiceImpl.java b/astrid/src-legacy/com/mdt/rtm/ServiceImpl.java similarity index 100% rename from src-legacy/com/mdt/rtm/ServiceImpl.java rename to astrid/src-legacy/com/mdt/rtm/ServiceImpl.java diff --git a/src-legacy/com/mdt/rtm/ServiceInternalException.java b/astrid/src-legacy/com/mdt/rtm/ServiceInternalException.java similarity index 100% rename from src-legacy/com/mdt/rtm/ServiceInternalException.java rename to astrid/src-legacy/com/mdt/rtm/ServiceInternalException.java diff --git a/src-legacy/com/mdt/rtm/data/RtmAuth.java b/astrid/src-legacy/com/mdt/rtm/data/RtmAuth.java similarity index 100% rename from src-legacy/com/mdt/rtm/data/RtmAuth.java rename to astrid/src-legacy/com/mdt/rtm/data/RtmAuth.java diff --git a/src-legacy/com/mdt/rtm/data/RtmData.java b/astrid/src-legacy/com/mdt/rtm/data/RtmData.java similarity index 100% rename from src-legacy/com/mdt/rtm/data/RtmData.java rename to astrid/src-legacy/com/mdt/rtm/data/RtmData.java diff --git a/src-legacy/com/mdt/rtm/data/RtmFrob.java b/astrid/src-legacy/com/mdt/rtm/data/RtmFrob.java similarity index 100% rename from src-legacy/com/mdt/rtm/data/RtmFrob.java rename to astrid/src-legacy/com/mdt/rtm/data/RtmFrob.java diff --git a/src-legacy/com/mdt/rtm/data/RtmList.java b/astrid/src-legacy/com/mdt/rtm/data/RtmList.java similarity index 100% rename from src-legacy/com/mdt/rtm/data/RtmList.java rename to astrid/src-legacy/com/mdt/rtm/data/RtmList.java diff --git a/src-legacy/com/mdt/rtm/data/RtmLists.java b/astrid/src-legacy/com/mdt/rtm/data/RtmLists.java similarity index 100% rename from src-legacy/com/mdt/rtm/data/RtmLists.java rename to astrid/src-legacy/com/mdt/rtm/data/RtmLists.java diff --git a/src-legacy/com/mdt/rtm/data/RtmLocation.java b/astrid/src-legacy/com/mdt/rtm/data/RtmLocation.java similarity index 100% rename from src-legacy/com/mdt/rtm/data/RtmLocation.java rename to astrid/src-legacy/com/mdt/rtm/data/RtmLocation.java diff --git a/src-legacy/com/mdt/rtm/data/RtmTask.java b/astrid/src-legacy/com/mdt/rtm/data/RtmTask.java similarity index 100% rename from src-legacy/com/mdt/rtm/data/RtmTask.java rename to astrid/src-legacy/com/mdt/rtm/data/RtmTask.java diff --git a/src-legacy/com/mdt/rtm/data/RtmTaskList.java b/astrid/src-legacy/com/mdt/rtm/data/RtmTaskList.java similarity index 100% rename from src-legacy/com/mdt/rtm/data/RtmTaskList.java rename to astrid/src-legacy/com/mdt/rtm/data/RtmTaskList.java diff --git a/src-legacy/com/mdt/rtm/data/RtmTaskNote.java b/astrid/src-legacy/com/mdt/rtm/data/RtmTaskNote.java similarity index 100% rename from src-legacy/com/mdt/rtm/data/RtmTaskNote.java rename to astrid/src-legacy/com/mdt/rtm/data/RtmTaskNote.java diff --git a/src-legacy/com/mdt/rtm/data/RtmTaskNotes.java b/astrid/src-legacy/com/mdt/rtm/data/RtmTaskNotes.java similarity index 100% rename from src-legacy/com/mdt/rtm/data/RtmTaskNotes.java rename to astrid/src-legacy/com/mdt/rtm/data/RtmTaskNotes.java diff --git a/src-legacy/com/mdt/rtm/data/RtmTaskSeries.java b/astrid/src-legacy/com/mdt/rtm/data/RtmTaskSeries.java similarity index 100% rename from src-legacy/com/mdt/rtm/data/RtmTaskSeries.java rename to astrid/src-legacy/com/mdt/rtm/data/RtmTaskSeries.java diff --git a/src-legacy/com/mdt/rtm/data/RtmTasks.java b/astrid/src-legacy/com/mdt/rtm/data/RtmTasks.java similarity index 100% rename from src-legacy/com/mdt/rtm/data/RtmTasks.java rename to astrid/src-legacy/com/mdt/rtm/data/RtmTasks.java diff --git a/src-legacy/com/mdt/rtm/data/RtmTimeline.java b/astrid/src-legacy/com/mdt/rtm/data/RtmTimeline.java similarity index 100% rename from src-legacy/com/mdt/rtm/data/RtmTimeline.java rename to astrid/src-legacy/com/mdt/rtm/data/RtmTimeline.java diff --git a/src-legacy/com/mdt/rtm/data/RtmUser.java b/astrid/src-legacy/com/mdt/rtm/data/RtmUser.java similarity index 100% rename from src-legacy/com/mdt/rtm/data/RtmUser.java rename to astrid/src-legacy/com/mdt/rtm/data/RtmUser.java diff --git a/src-legacy/com/timsu/astrid/activities/EditPreferences.java b/astrid/src-legacy/com/timsu/astrid/activities/EditPreferences.java similarity index 100% rename from src-legacy/com/timsu/astrid/activities/EditPreferences.java rename to astrid/src-legacy/com/timsu/astrid/activities/EditPreferences.java diff --git a/src-legacy/com/timsu/astrid/activities/LocaleEditAlerts.java b/astrid/src-legacy/com/timsu/astrid/activities/LocaleEditAlerts.java similarity index 100% rename from src-legacy/com/timsu/astrid/activities/LocaleEditAlerts.java rename to astrid/src-legacy/com/timsu/astrid/activities/LocaleEditAlerts.java diff --git a/src-legacy/com/timsu/astrid/activities/SubActivity.java b/astrid/src-legacy/com/timsu/astrid/activities/SubActivity.java similarity index 100% rename from src-legacy/com/timsu/astrid/activities/SubActivity.java rename to astrid/src-legacy/com/timsu/astrid/activities/SubActivity.java diff --git a/src-legacy/com/timsu/astrid/activities/SyncLoginActivity.java b/astrid/src-legacy/com/timsu/astrid/activities/SyncLoginActivity.java similarity index 100% rename from src-legacy/com/timsu/astrid/activities/SyncLoginActivity.java rename to astrid/src-legacy/com/timsu/astrid/activities/SyncLoginActivity.java diff --git a/src-legacy/com/timsu/astrid/activities/SyncPreferences.java b/astrid/src-legacy/com/timsu/astrid/activities/SyncPreferences.java similarity index 100% rename from src-legacy/com/timsu/astrid/activities/SyncPreferences.java rename to astrid/src-legacy/com/timsu/astrid/activities/SyncPreferences.java diff --git a/src-legacy/com/timsu/astrid/activities/TagListSubActivity.java b/astrid/src-legacy/com/timsu/astrid/activities/TagListSubActivity.java similarity index 100% rename from src-legacy/com/timsu/astrid/activities/TagListSubActivity.java rename to astrid/src-legacy/com/timsu/astrid/activities/TagListSubActivity.java diff --git a/src-legacy/com/timsu/astrid/activities/TagView.java b/astrid/src-legacy/com/timsu/astrid/activities/TagView.java similarity index 100% rename from src-legacy/com/timsu/astrid/activities/TagView.java rename to astrid/src-legacy/com/timsu/astrid/activities/TagView.java diff --git a/src-legacy/com/timsu/astrid/activities/TaskEdit.java b/astrid/src-legacy/com/timsu/astrid/activities/TaskEdit.java similarity index 100% rename from src-legacy/com/timsu/astrid/activities/TaskEdit.java rename to astrid/src-legacy/com/timsu/astrid/activities/TaskEdit.java diff --git a/src-legacy/com/timsu/astrid/activities/TaskList.java b/astrid/src-legacy/com/timsu/astrid/activities/TaskList.java similarity index 100% rename from src-legacy/com/timsu/astrid/activities/TaskList.java rename to astrid/src-legacy/com/timsu/astrid/activities/TaskList.java diff --git a/src-legacy/com/timsu/astrid/activities/TaskListAdapter.java b/astrid/src-legacy/com/timsu/astrid/activities/TaskListAdapter.java similarity index 100% rename from src-legacy/com/timsu/astrid/activities/TaskListAdapter.java rename to astrid/src-legacy/com/timsu/astrid/activities/TaskListAdapter.java diff --git a/src-legacy/com/timsu/astrid/activities/TaskListNotify.java b/astrid/src-legacy/com/timsu/astrid/activities/TaskListNotify.java similarity index 100% rename from src-legacy/com/timsu/astrid/activities/TaskListNotify.java rename to astrid/src-legacy/com/timsu/astrid/activities/TaskListNotify.java diff --git a/src-legacy/com/timsu/astrid/activities/TaskListSubActivity.java b/astrid/src-legacy/com/timsu/astrid/activities/TaskListSubActivity.java similarity index 100% rename from src-legacy/com/timsu/astrid/activities/TaskListSubActivity.java rename to astrid/src-legacy/com/timsu/astrid/activities/TaskListSubActivity.java diff --git a/src-legacy/com/timsu/astrid/activities/TaskModificationActivity.java b/astrid/src-legacy/com/timsu/astrid/activities/TaskModificationActivity.java similarity index 100% rename from src-legacy/com/timsu/astrid/activities/TaskModificationActivity.java rename to astrid/src-legacy/com/timsu/astrid/activities/TaskModificationActivity.java diff --git a/src-legacy/com/timsu/astrid/activities/TaskModificationTabbedActivity.java b/astrid/src-legacy/com/timsu/astrid/activities/TaskModificationTabbedActivity.java similarity index 100% rename from src-legacy/com/timsu/astrid/activities/TaskModificationTabbedActivity.java rename to astrid/src-legacy/com/timsu/astrid/activities/TaskModificationTabbedActivity.java diff --git a/src-legacy/com/timsu/astrid/appwidget/AstridAppWidgetProvider.java b/astrid/src-legacy/com/timsu/astrid/appwidget/AstridAppWidgetProvider.java similarity index 100% rename from src-legacy/com/timsu/astrid/appwidget/AstridAppWidgetProvider.java rename to astrid/src-legacy/com/timsu/astrid/appwidget/AstridAppWidgetProvider.java diff --git a/src-legacy/com/timsu/astrid/data/AbstractController.java b/astrid/src-legacy/com/timsu/astrid/data/AbstractController.java similarity index 100% rename from src-legacy/com/timsu/astrid/data/AbstractController.java rename to astrid/src-legacy/com/timsu/astrid/data/AbstractController.java diff --git a/src-legacy/com/timsu/astrid/data/AbstractModel.java b/astrid/src-legacy/com/timsu/astrid/data/AbstractModel.java similarity index 100% rename from src-legacy/com/timsu/astrid/data/AbstractModel.java rename to astrid/src-legacy/com/timsu/astrid/data/AbstractModel.java diff --git a/src-legacy/com/timsu/astrid/data/Identifier.java b/astrid/src-legacy/com/timsu/astrid/data/Identifier.java similarity index 100% rename from src-legacy/com/timsu/astrid/data/Identifier.java rename to astrid/src-legacy/com/timsu/astrid/data/Identifier.java diff --git a/src-legacy/com/timsu/astrid/data/alerts/Alert.java b/astrid/src-legacy/com/timsu/astrid/data/alerts/Alert.java similarity index 100% rename from src-legacy/com/timsu/astrid/data/alerts/Alert.java rename to astrid/src-legacy/com/timsu/astrid/data/alerts/Alert.java diff --git a/src-legacy/com/timsu/astrid/data/alerts/AlertController.java b/astrid/src-legacy/com/timsu/astrid/data/alerts/AlertController.java similarity index 100% rename from src-legacy/com/timsu/astrid/data/alerts/AlertController.java rename to astrid/src-legacy/com/timsu/astrid/data/alerts/AlertController.java diff --git a/src-legacy/com/timsu/astrid/data/enums/Importance.java b/astrid/src-legacy/com/timsu/astrid/data/enums/Importance.java similarity index 100% rename from src-legacy/com/timsu/astrid/data/enums/Importance.java rename to astrid/src-legacy/com/timsu/astrid/data/enums/Importance.java diff --git a/src-legacy/com/timsu/astrid/data/enums/RepeatInterval.java b/astrid/src-legacy/com/timsu/astrid/data/enums/RepeatInterval.java similarity index 100% rename from src-legacy/com/timsu/astrid/data/enums/RepeatInterval.java rename to astrid/src-legacy/com/timsu/astrid/data/enums/RepeatInterval.java diff --git a/src-legacy/com/timsu/astrid/data/location/GeoPoint.java b/astrid/src-legacy/com/timsu/astrid/data/location/GeoPoint.java similarity index 100% rename from src-legacy/com/timsu/astrid/data/location/GeoPoint.java rename to astrid/src-legacy/com/timsu/astrid/data/location/GeoPoint.java diff --git a/src-legacy/com/timsu/astrid/data/sync/SyncDataController.java b/astrid/src-legacy/com/timsu/astrid/data/sync/SyncDataController.java similarity index 100% rename from src-legacy/com/timsu/astrid/data/sync/SyncDataController.java rename to astrid/src-legacy/com/timsu/astrid/data/sync/SyncDataController.java diff --git a/src-legacy/com/timsu/astrid/data/sync/SyncMapping.java b/astrid/src-legacy/com/timsu/astrid/data/sync/SyncMapping.java similarity index 100% rename from src-legacy/com/timsu/astrid/data/sync/SyncMapping.java rename to astrid/src-legacy/com/timsu/astrid/data/sync/SyncMapping.java diff --git a/src-legacy/com/timsu/astrid/data/tag/AbstractTagModel.java b/astrid/src-legacy/com/timsu/astrid/data/tag/AbstractTagModel.java similarity index 100% rename from src-legacy/com/timsu/astrid/data/tag/AbstractTagModel.java rename to astrid/src-legacy/com/timsu/astrid/data/tag/AbstractTagModel.java diff --git a/src-legacy/com/timsu/astrid/data/tag/TagController.java b/astrid/src-legacy/com/timsu/astrid/data/tag/TagController.java similarity index 100% rename from src-legacy/com/timsu/astrid/data/tag/TagController.java rename to astrid/src-legacy/com/timsu/astrid/data/tag/TagController.java diff --git a/src-legacy/com/timsu/astrid/data/tag/TagIdentifier.java b/astrid/src-legacy/com/timsu/astrid/data/tag/TagIdentifier.java similarity index 100% rename from src-legacy/com/timsu/astrid/data/tag/TagIdentifier.java rename to astrid/src-legacy/com/timsu/astrid/data/tag/TagIdentifier.java diff --git a/src-legacy/com/timsu/astrid/data/tag/TagModelForView.java b/astrid/src-legacy/com/timsu/astrid/data/tag/TagModelForView.java similarity index 100% rename from src-legacy/com/timsu/astrid/data/tag/TagModelForView.java rename to astrid/src-legacy/com/timsu/astrid/data/tag/TagModelForView.java diff --git a/src-legacy/com/timsu/astrid/data/tag/TagToTaskMapping.java b/astrid/src-legacy/com/timsu/astrid/data/tag/TagToTaskMapping.java similarity index 100% rename from src-legacy/com/timsu/astrid/data/tag/TagToTaskMapping.java rename to astrid/src-legacy/com/timsu/astrid/data/tag/TagToTaskMapping.java diff --git a/src-legacy/com/timsu/astrid/data/task/AbstractTaskModel.java b/astrid/src-legacy/com/timsu/astrid/data/task/AbstractTaskModel.java similarity index 100% rename from src-legacy/com/timsu/astrid/data/task/AbstractTaskModel.java rename to astrid/src-legacy/com/timsu/astrid/data/task/AbstractTaskModel.java diff --git a/src-legacy/com/timsu/astrid/data/task/TaskController.java b/astrid/src-legacy/com/timsu/astrid/data/task/TaskController.java similarity index 100% rename from src-legacy/com/timsu/astrid/data/task/TaskController.java rename to astrid/src-legacy/com/timsu/astrid/data/task/TaskController.java diff --git a/src-legacy/com/timsu/astrid/data/task/TaskIdentifier.java b/astrid/src-legacy/com/timsu/astrid/data/task/TaskIdentifier.java similarity index 100% rename from src-legacy/com/timsu/astrid/data/task/TaskIdentifier.java rename to astrid/src-legacy/com/timsu/astrid/data/task/TaskIdentifier.java diff --git a/src-legacy/com/timsu/astrid/data/task/TaskModelForEdit.java b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForEdit.java similarity index 100% rename from src-legacy/com/timsu/astrid/data/task/TaskModelForEdit.java rename to astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForEdit.java diff --git a/src-legacy/com/timsu/astrid/data/task/TaskModelForHandlers.java b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForHandlers.java similarity index 100% rename from src-legacy/com/timsu/astrid/data/task/TaskModelForHandlers.java rename to astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForHandlers.java diff --git a/src-legacy/com/timsu/astrid/data/task/TaskModelForList.java b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForList.java similarity index 100% rename from src-legacy/com/timsu/astrid/data/task/TaskModelForList.java rename to astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForList.java diff --git a/src-legacy/com/timsu/astrid/data/task/TaskModelForNotify.java b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForNotify.java similarity index 100% rename from src-legacy/com/timsu/astrid/data/task/TaskModelForNotify.java rename to astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForNotify.java diff --git a/src-legacy/com/timsu/astrid/data/task/TaskModelForProvider.java b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForProvider.java similarity index 100% rename from src-legacy/com/timsu/astrid/data/task/TaskModelForProvider.java rename to astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForProvider.java diff --git a/src-legacy/com/timsu/astrid/data/task/TaskModelForReminder.java b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForReminder.java similarity index 100% rename from src-legacy/com/timsu/astrid/data/task/TaskModelForReminder.java rename to astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForReminder.java diff --git a/src-legacy/com/timsu/astrid/data/task/TaskModelForSync.java b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForSync.java similarity index 100% rename from src-legacy/com/timsu/astrid/data/task/TaskModelForSync.java rename to astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForSync.java diff --git a/src-legacy/com/timsu/astrid/data/task/TaskModelForWidget.java b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForWidget.java similarity index 100% rename from src-legacy/com/timsu/astrid/data/task/TaskModelForWidget.java rename to astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForWidget.java diff --git a/src-legacy/com/timsu/astrid/data/task/TaskModelForXml.java b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForXml.java similarity index 100% rename from src-legacy/com/timsu/astrid/data/task/TaskModelForXml.java rename to astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForXml.java diff --git a/src-legacy/com/timsu/astrid/provider/TasksProvider.java b/astrid/src-legacy/com/timsu/astrid/provider/TasksProvider.java similarity index 100% rename from src-legacy/com/timsu/astrid/provider/TasksProvider.java rename to astrid/src-legacy/com/timsu/astrid/provider/TasksProvider.java diff --git a/src-legacy/com/timsu/astrid/sync/RTMSyncProvider.java b/astrid/src-legacy/com/timsu/astrid/sync/RTMSyncProvider.java similarity index 100% rename from src-legacy/com/timsu/astrid/sync/RTMSyncProvider.java rename to astrid/src-legacy/com/timsu/astrid/sync/RTMSyncProvider.java diff --git a/src-legacy/com/timsu/astrid/sync/SynchronizationProvider.java b/astrid/src-legacy/com/timsu/astrid/sync/SynchronizationProvider.java similarity index 100% rename from src-legacy/com/timsu/astrid/sync/SynchronizationProvider.java rename to astrid/src-legacy/com/timsu/astrid/sync/SynchronizationProvider.java diff --git a/src-legacy/com/timsu/astrid/sync/SynchronizationService.java b/astrid/src-legacy/com/timsu/astrid/sync/SynchronizationService.java similarity index 100% rename from src-legacy/com/timsu/astrid/sync/SynchronizationService.java rename to astrid/src-legacy/com/timsu/astrid/sync/SynchronizationService.java diff --git a/src-legacy/com/timsu/astrid/sync/Synchronizer.java b/astrid/src-legacy/com/timsu/astrid/sync/Synchronizer.java similarity index 100% rename from src-legacy/com/timsu/astrid/sync/Synchronizer.java rename to astrid/src-legacy/com/timsu/astrid/sync/Synchronizer.java diff --git a/src-legacy/com/timsu/astrid/sync/TaskProxy.java b/astrid/src-legacy/com/timsu/astrid/sync/TaskProxy.java similarity index 100% rename from src-legacy/com/timsu/astrid/sync/TaskProxy.java rename to astrid/src-legacy/com/timsu/astrid/sync/TaskProxy.java diff --git a/src-legacy/com/timsu/astrid/utilities/AstridUtilities.java b/astrid/src-legacy/com/timsu/astrid/utilities/AstridUtilities.java similarity index 100% rename from src-legacy/com/timsu/astrid/utilities/AstridUtilities.java rename to astrid/src-legacy/com/timsu/astrid/utilities/AstridUtilities.java diff --git a/src-legacy/com/timsu/astrid/utilities/BackupService.java b/astrid/src-legacy/com/timsu/astrid/utilities/BackupService.java similarity index 100% rename from src-legacy/com/timsu/astrid/utilities/BackupService.java rename to astrid/src-legacy/com/timsu/astrid/utilities/BackupService.java diff --git a/src-legacy/com/timsu/astrid/utilities/Constants.java b/astrid/src-legacy/com/timsu/astrid/utilities/Constants.java similarity index 100% rename from src-legacy/com/timsu/astrid/utilities/Constants.java rename to astrid/src-legacy/com/timsu/astrid/utilities/Constants.java diff --git a/src-legacy/com/timsu/astrid/utilities/DateUtilities.java b/astrid/src-legacy/com/timsu/astrid/utilities/DateUtilities.java similarity index 100% rename from src-legacy/com/timsu/astrid/utilities/DateUtilities.java rename to astrid/src-legacy/com/timsu/astrid/utilities/DateUtilities.java diff --git a/src-legacy/com/timsu/astrid/utilities/DialogUtilities.java b/astrid/src-legacy/com/timsu/astrid/utilities/DialogUtilities.java similarity index 100% rename from src-legacy/com/timsu/astrid/utilities/DialogUtilities.java rename to astrid/src-legacy/com/timsu/astrid/utilities/DialogUtilities.java diff --git a/src-legacy/com/timsu/astrid/utilities/LocaleReceiver.java b/astrid/src-legacy/com/timsu/astrid/utilities/LocaleReceiver.java similarity index 100% rename from src-legacy/com/timsu/astrid/utilities/LocaleReceiver.java rename to astrid/src-legacy/com/timsu/astrid/utilities/LocaleReceiver.java diff --git a/src-legacy/com/timsu/astrid/utilities/Notifications.java b/astrid/src-legacy/com/timsu/astrid/utilities/Notifications.java similarity index 100% rename from src-legacy/com/timsu/astrid/utilities/Notifications.java rename to astrid/src-legacy/com/timsu/astrid/utilities/Notifications.java diff --git a/src-legacy/com/timsu/astrid/utilities/Preferences.java b/astrid/src-legacy/com/timsu/astrid/utilities/Preferences.java similarity index 100% rename from src-legacy/com/timsu/astrid/utilities/Preferences.java rename to astrid/src-legacy/com/timsu/astrid/utilities/Preferences.java diff --git a/src-legacy/com/timsu/astrid/utilities/StartupReceiver.java b/astrid/src-legacy/com/timsu/astrid/utilities/StartupReceiver.java similarity index 100% rename from src-legacy/com/timsu/astrid/utilities/StartupReceiver.java rename to astrid/src-legacy/com/timsu/astrid/utilities/StartupReceiver.java diff --git a/src-legacy/com/timsu/astrid/utilities/TaskFieldsVisibility.java b/astrid/src-legacy/com/timsu/astrid/utilities/TaskFieldsVisibility.java similarity index 100% rename from src-legacy/com/timsu/astrid/utilities/TaskFieldsVisibility.java rename to astrid/src-legacy/com/timsu/astrid/utilities/TaskFieldsVisibility.java diff --git a/src-legacy/com/timsu/astrid/utilities/TasksXmlExporter.java b/astrid/src-legacy/com/timsu/astrid/utilities/TasksXmlExporter.java similarity index 100% rename from src-legacy/com/timsu/astrid/utilities/TasksXmlExporter.java rename to astrid/src-legacy/com/timsu/astrid/utilities/TasksXmlExporter.java diff --git a/src-legacy/com/timsu/astrid/utilities/TasksXmlImporter.java b/astrid/src-legacy/com/timsu/astrid/utilities/TasksXmlImporter.java similarity index 100% rename from src-legacy/com/timsu/astrid/utilities/TasksXmlImporter.java rename to astrid/src-legacy/com/timsu/astrid/utilities/TasksXmlImporter.java diff --git a/src-legacy/com/timsu/astrid/widget/DateControlSet.java b/astrid/src-legacy/com/timsu/astrid/widget/DateControlSet.java similarity index 100% rename from src-legacy/com/timsu/astrid/widget/DateControlSet.java rename to astrid/src-legacy/com/timsu/astrid/widget/DateControlSet.java diff --git a/src-legacy/com/timsu/astrid/widget/DateWithNullControlSet.java b/astrid/src-legacy/com/timsu/astrid/widget/DateWithNullControlSet.java similarity index 100% rename from src-legacy/com/timsu/astrid/widget/DateWithNullControlSet.java rename to astrid/src-legacy/com/timsu/astrid/widget/DateWithNullControlSet.java diff --git a/src-legacy/com/timsu/astrid/widget/FilePickerBuilder.java b/astrid/src-legacy/com/timsu/astrid/widget/FilePickerBuilder.java similarity index 100% rename from src-legacy/com/timsu/astrid/widget/FilePickerBuilder.java rename to astrid/src-legacy/com/timsu/astrid/widget/FilePickerBuilder.java diff --git a/src-legacy/com/timsu/astrid/widget/NNumberPickerDialog.java b/astrid/src-legacy/com/timsu/astrid/widget/NNumberPickerDialog.java similarity index 100% rename from src-legacy/com/timsu/astrid/widget/NNumberPickerDialog.java rename to astrid/src-legacy/com/timsu/astrid/widget/NNumberPickerDialog.java diff --git a/src-legacy/com/timsu/astrid/widget/NumberPicker.java b/astrid/src-legacy/com/timsu/astrid/widget/NumberPicker.java similarity index 100% rename from src-legacy/com/timsu/astrid/widget/NumberPicker.java rename to astrid/src-legacy/com/timsu/astrid/widget/NumberPicker.java diff --git a/src-legacy/com/timsu/astrid/widget/NumberPickerButton.java b/astrid/src-legacy/com/timsu/astrid/widget/NumberPickerButton.java similarity index 100% rename from src-legacy/com/timsu/astrid/widget/NumberPickerButton.java rename to astrid/src-legacy/com/timsu/astrid/widget/NumberPickerButton.java diff --git a/src-legacy/com/timsu/astrid/widget/NumberPickerDialog.java b/astrid/src-legacy/com/timsu/astrid/widget/NumberPickerDialog.java similarity index 100% rename from src-legacy/com/timsu/astrid/widget/NumberPickerDialog.java rename to astrid/src-legacy/com/timsu/astrid/widget/NumberPickerDialog.java diff --git a/src-legacy/com/timsu/astrid/widget/TimeDurationControlSet.java b/astrid/src-legacy/com/timsu/astrid/widget/TimeDurationControlSet.java similarity index 100% rename from src-legacy/com/timsu/astrid/widget/TimeDurationControlSet.java rename to astrid/src-legacy/com/timsu/astrid/widget/TimeDurationControlSet.java diff --git a/src/com/todoroo/astrid/dao/Database.java b/astrid/src/com/todoroo/astrid/dao/Database.java similarity index 100% rename from src/com/todoroo/astrid/dao/Database.java rename to astrid/src/com/todoroo/astrid/dao/Database.java diff --git a/src/com/todoroo/astrid/dao/MetadataDao.java b/astrid/src/com/todoroo/astrid/dao/MetadataDao.java similarity index 100% rename from src/com/todoroo/astrid/dao/MetadataDao.java rename to astrid/src/com/todoroo/astrid/dao/MetadataDao.java diff --git a/src/com/todoroo/astrid/dao/TaskDao.java b/astrid/src/com/todoroo/astrid/dao/TaskDao.java similarity index 100% rename from src/com/todoroo/astrid/dao/TaskDao.java rename to astrid/src/com/todoroo/astrid/dao/TaskDao.java diff --git a/src/com/todoroo/astrid/model/Metadata.java b/astrid/src/com/todoroo/astrid/model/Metadata.java similarity index 100% rename from src/com/todoroo/astrid/model/Metadata.java rename to astrid/src/com/todoroo/astrid/model/Metadata.java diff --git a/src/com/todoroo/astrid/model/Task.java b/astrid/src/com/todoroo/astrid/model/Task.java similarity index 100% rename from src/com/todoroo/astrid/model/Task.java rename to astrid/src/com/todoroo/astrid/model/Task.java diff --git a/src/com/todoroo/astrid/service/AstridDependencyInjector.java b/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java similarity index 100% rename from src/com/todoroo/astrid/service/AstridDependencyInjector.java rename to astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java diff --git a/src/com/todoroo/astrid/service/FlurryReporter.java b/astrid/src/com/todoroo/astrid/service/FlurryReporter.java similarity index 100% rename from src/com/todoroo/astrid/service/FlurryReporter.java rename to astrid/src/com/todoroo/astrid/service/FlurryReporter.java diff --git a/src/com/todoroo/astrid/service/MetadataService.java b/astrid/src/com/todoroo/astrid/service/MetadataService.java similarity index 100% rename from src/com/todoroo/astrid/service/MetadataService.java rename to astrid/src/com/todoroo/astrid/service/MetadataService.java diff --git a/src/com/todoroo/astrid/service/TaskService.java b/astrid/src/com/todoroo/astrid/service/TaskService.java similarity index 100% rename from src/com/todoroo/astrid/service/TaskService.java rename to astrid/src/com/todoroo/astrid/service/TaskService.java diff --git a/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java similarity index 100% rename from src/com/todoroo/astrid/service/UpgradeService.java rename to astrid/src/com/todoroo/astrid/service/UpgradeService.java diff --git a/src/com/todoroo/astrid/utility/Constants.java b/astrid/src/com/todoroo/astrid/utility/Constants.java similarity index 100% rename from src/com/todoroo/astrid/utility/Constants.java rename to astrid/src/com/todoroo/astrid/utility/Constants.java diff --git a/src/com/todoroo/astrid/utility/Preferences.java b/astrid/src/com/todoroo/astrid/utility/Preferences.java similarity index 100% rename from src/com/todoroo/astrid/utility/Preferences.java rename to astrid/src/com/todoroo/astrid/utility/Preferences.java diff --git a/tests/.project b/tests/.project index dc7cd9aaa..4e205d948 100644 --- a/tests/.project +++ b/tests/.project @@ -1,6 +1,6 @@ - astrid-3.x-tests + astrid-tests diff --git a/tests/gen/.gitignore b/tests/gen/.gitignore new file mode 100644 index 000000000..e69de29bb