diff --git a/.gitignore b/.gitignore index e3ca6e99c..a8f7e0463 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,7 @@ +.gradle .idea/workspace.xml +.idea/gradle.xml +build/ out/ proguard_logs/ *.apk diff --git a/.idea/libraries/CWAC_SackOfViewsAdapter.xml b/.idea/libraries/CWAC_SackOfViewsAdapter.xml index 18a0d1835..d5291b70c 100644 --- a/.idea/libraries/CWAC_SackOfViewsAdapter.xml +++ b/.idea/libraries/CWAC_SackOfViewsAdapter.xml @@ -1,7 +1,7 @@ - + diff --git a/.idea/libraries/android_support_v41.xml b/.idea/libraries/android_support_v41.xml deleted file mode 100644 index eaba40aa8..000000000 --- a/.idea/libraries/android_support_v41.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/framework.xml b/.idea/libraries/framework.xml index cad4e90ce..ec39bf466 100644 --- a/.idea/libraries/framework.xml +++ b/.idea/libraries/framework.xml @@ -1,7 +1,7 @@ - + diff --git a/.idea/libraries/google_api_client.xml b/.idea/libraries/google_api_client.xml deleted file mode 100644 index 8d4beb3f8..000000000 --- a/.idea/libraries/google_api_client.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/google_api_client_1_6_0_beta.xml b/.idea/libraries/google_api_client_1_6_0_beta.xml new file mode 100644 index 000000000..d0e9a80d8 --- /dev/null +++ b/.idea/libraries/google_api_client_1_6_0_beta.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/google_api_client_extensions_1_6_0_beta.xml b/.idea/libraries/google_api_client_extensions_1_6_0_beta.xml new file mode 100644 index 000000000..e5d255219 --- /dev/null +++ b/.idea/libraries/google_api_client_extensions_1_6_0_beta.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/google_api_client_extensions_android2_1_6_0_beta.xml b/.idea/libraries/google_api_client_extensions_android2_1_6_0_beta.xml new file mode 100644 index 000000000..619ed46c2 --- /dev/null +++ b/.idea/libraries/google_api_client_extensions_android2_1_6_0_beta.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/google_api_services_tasks.xml b/.idea/libraries/google_api_services_tasks.xml deleted file mode 100644 index 66d5bd867..000000000 --- a/.idea/libraries/google_api_services_tasks.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/google_api_services_tasks_v1_1_3_0_beta.xml b/.idea/libraries/google_api_services_tasks_v1_1_3_0_beta.xml new file mode 100644 index 000000000..81aca28d4 --- /dev/null +++ b/.idea/libraries/google_api_services_tasks_v1_1_3_0_beta.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/google_api_services_tasks_v1_1_3_0_beta_sources.xml b/.idea/libraries/google_api_services_tasks_v1_1_3_0_beta_sources.xml new file mode 100644 index 000000000..1075232b1 --- /dev/null +++ b/.idea/libraries/google_api_services_tasks_v1_1_3_0_beta_sources.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/google_http_client.xml b/.idea/libraries/google_http_client.xml deleted file mode 100644 index c55365a4d..000000000 --- a/.idea/libraries/google_http_client.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/google_http_client_1_6_0_beta.xml b/.idea/libraries/google_http_client_1_6_0_beta.xml new file mode 100644 index 000000000..e0bc8c24b --- /dev/null +++ b/.idea/libraries/google_http_client_1_6_0_beta.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/google_http_client_extensions_1_6_0_beta.xml b/.idea/libraries/google_http_client_extensions_1_6_0_beta.xml new file mode 100644 index 000000000..1d585f1f6 --- /dev/null +++ b/.idea/libraries/google_http_client_extensions_1_6_0_beta.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/google_http_client_extensions_android2_1_6_0_beta.xml b/.idea/libraries/google_http_client_extensions_android2_1_6_0_beta.xml new file mode 100644 index 000000000..3729ab0df --- /dev/null +++ b/.idea/libraries/google_http_client_extensions_android2_1_6_0_beta.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/google_http_client_extensions_android3_1_6_0_beta.xml b/.idea/libraries/google_http_client_extensions_android3_1_6_0_beta.xml new file mode 100644 index 000000000..024b28b8b --- /dev/null +++ b/.idea/libraries/google_http_client_extensions_android3_1_6_0_beta.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/google_oauth_client.xml b/.idea/libraries/google_oauth_client.xml deleted file mode 100644 index 7636b144c..000000000 --- a/.idea/libraries/google_oauth_client.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/google_oauth_client_1_6_0_beta.xml b/.idea/libraries/google_oauth_client_1_6_0_beta.xml new file mode 100644 index 000000000..ea99aed11 --- /dev/null +++ b/.idea/libraries/google_oauth_client_1_6_0_beta.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/google_oauth_client_extensions_1_6_0_beta.xml b/.idea/libraries/google_oauth_client_extensions_1_6_0_beta.xml new file mode 100644 index 000000000..6a3cd9422 --- /dev/null +++ b/.idea/libraries/google_oauth_client_extensions_1_6_0_beta.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/googleloginclient_helper.xml b/.idea/libraries/googleloginclient_helper.xml index 6b0abd554..a140712f4 100644 --- a/.idea/libraries/googleloginclient_helper.xml +++ b/.idea/libraries/googleloginclient_helper.xml @@ -1,7 +1,7 @@ - + diff --git a/.idea/libraries/gson.xml b/.idea/libraries/gson_1_7_1.xml similarity index 50% rename from .idea/libraries/gson.xml rename to .idea/libraries/gson_1_7_1.xml index a625b9dbc..73fdaee01 100644 --- a/.idea/libraries/gson.xml +++ b/.idea/libraries/gson_1_7_1.xml @@ -1,7 +1,7 @@ - + - + diff --git a/.idea/libraries/guava.xml b/.idea/libraries/guava.xml deleted file mode 100644 index b559e33c8..000000000 --- a/.idea/libraries/guava.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/guava_11_0_1.xml b/.idea/libraries/guava_11_0_1.xml new file mode 100644 index 000000000..75077e675 --- /dev/null +++ b/.idea/libraries/guava_11_0_1.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/httpmime.xml b/.idea/libraries/httpmime.xml deleted file mode 100644 index f4c9c06d1..000000000 --- a/.idea/libraries/httpmime.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/httpmime_4_1_1.xml b/.idea/libraries/httpmime_4_1_1.xml new file mode 100644 index 000000000..ed17d7127 --- /dev/null +++ b/.idea/libraries/httpmime_4_1_1.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/jackson_core_asl.xml b/.idea/libraries/jackson_core_asl.xml deleted file mode 100644 index 6f91d5b8b..000000000 --- a/.idea/libraries/jackson_core_asl.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/jackson_core_asl_1_6_7.xml b/.idea/libraries/jackson_core_asl_1_6_7.xml new file mode 100644 index 000000000..4a06b9d13 --- /dev/null +++ b/.idea/libraries/jackson_core_asl_1_6_7.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/jchronic.xml b/.idea/libraries/jchronic.xml deleted file mode 100644 index dbcf84966..000000000 --- a/.idea/libraries/jchronic.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/jchronic_0_2_3.xml b/.idea/libraries/jchronic_0_2_3.xml new file mode 100644 index 000000000..ee129bb86 --- /dev/null +++ b/.idea/libraries/jchronic_0_2_3.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/jsr305.xml b/.idea/libraries/jsr305.xml index 6c0616f63..06e0fa98f 100644 --- a/.idea/libraries/jsr305.xml +++ b/.idea/libraries/jsr305.xml @@ -1,11 +1,9 @@ - + - - - + \ No newline at end of file diff --git a/.idea/libraries/locale_platform.xml b/.idea/libraries/locale_platform.xml index 85ca8bcd6..95f5553b3 100644 --- a/.idea/libraries/locale_platform.xml +++ b/.idea/libraries/locale_platform.xml @@ -1,7 +1,7 @@ - + diff --git a/.idea/libraries/rfc2445_4Mar2011.xml b/.idea/libraries/rfc2445_4Mar2011.xml index 0848b95b8..bc0c118df 100644 --- a/.idea/libraries/rfc2445_4Mar2011.xml +++ b/.idea/libraries/rfc2445_4Mar2011.xml @@ -1,7 +1,7 @@ - + diff --git a/.idea/libraries/support_v4_18_0_0.xml b/.idea/libraries/support_v4_18_0_0.xml new file mode 100644 index 000000000..36693042c --- /dev/null +++ b/.idea/libraries/support_v4_18_0_0.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index f49400081..b11b2884f 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,13 +2,12 @@ - - + + - - + diff --git a/.idea/runConfigurations/Astrid_Emulator.xml b/.idea/runConfigurations/Astrid_Emulator.xml deleted file mode 100644 index f5a80742f..000000000 --- a/.idea/runConfigurations/Astrid_Emulator.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/Astrid_USB.xml b/.idea/runConfigurations/Astrid_USB.xml deleted file mode 100644 index fc21c9e19..000000000 --- a/.idea/runConfigurations/Astrid_USB.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - \ No newline at end of file diff --git a/README.md b/README.md index 643b6ef46..a2765d7ae 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,10 @@ Requires [Android Studio](http://developer.android.com/sdk/installing/studio.htm To Do ----- -* Gradle +* TeamCity +* DropBox * Widgets +* Translation workflow * Remove dead code, old branches * Remove unused resources and preferences * Fix warnings diff --git a/actionbarsherlock/ActionBarSherlock.iml b/actionbarsherlock/ActionBarSherlock.iml new file mode 100644 index 000000000..71c271632 --- /dev/null +++ b/actionbarsherlock/ActionBarSherlock.iml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/actionbarsherlock/CHANGELOG.md b/actionbarsherlock/CHANGELOG.md deleted file mode 100755 index 432230bf0..000000000 --- a/actionbarsherlock/CHANGELOG.md +++ /dev/null @@ -1,469 +0,0 @@ -Change Log -=============================================================================== - -Version 4.2.0 *(2012-10-07)* ----------------------------- - -**Maven `artifactId` is now to 'actionbarsherlock'.** - -Note: The `.Dialog` themes are now deprecated. These will be removed in a future -version of the library. - - * Add `SearchView` widget for standard search interaction (API 8+ only) - * Fix: `ShareActionProvider` in the split action bar no longer fills the entire - screen. - * Fix: `ShareActionProvider` now does file I/O on a background thread. - * Fix: Automatically correct `ColorDrawable` not respecting bounds when used as - a stacked background. - * Fix: Ensure fragments collection is present before dispatching events. - * Fix: XML-defined `onClick` searches the correct context for the declared - method. - * Fix: Ensure action mode start/finish callbacks are invoked on the activity - for the native action bar. - * Fix: Allow tab callbacks to have a fragment transaction instance for any - `FragmentActivity`. - * Fix: Ensure `CollapsibleActionView` callbacks are dispatched in both native - and compatbility action bars. - * Fix: Remove `.ForceOverflow` themes. These never should have been included. - - -Version 4.1.0 *(2012-05-17)* ----------------------------- - - * Fix: Altered technique used for menu event dispatching through the fragment - manager for greater control. - * Fix: Do not dispatch menu creation event if the activity has been destroyed. - * Fix: Correct potential `NullPointerException` when expanding an action item. - * Fix: Correct potential `NullPointerException` when the hardware menu key was - pressed in an activity that is forcing the overflow menu. - * Fix: Do not set a listener on the native action bar tab wrapper unless a - compatibility listener has been set. - * Fix: Ensure the compatibility animation framework is always available on - views even if they were previously detached from the view hierarchy. - - -Version 4.0.2 *(2012-04-15)* ----------------------------- - - * Upgrade to r7 support library. - * Fix: Do not trigger menu creation after `onCreate` if activity is finishing. - * Fix: Prevent overflow from displaying if there are no overflow action items. - * Fix: Long-pressing menu key no longer triggers overflow. - * Fix: Use proper tab state-list drawable to mimic ICS. - * Fix: Ensure dispatching menu creation and preparation to fragments can - properly return `false` when appropriate to avoid rendering artifacts. - * Fix: Properly save and fetch action mode tag on ICS. - * Fix: Add missing density-specific resources for certain asssets and remove - unused assets. - - -Version 4.0.1 *(2012-03-25)* ----------------------------- - - * Add `ShareActionProvider` widget for use as action items. - * Re-add 'Styled' sample to provide a more comprehensive theming example. - * Fix: Do not dispatch options item selection to fragments if the activity - handles the callback. - * Fix: Prevent menu key from opening the overflow menu when an action mode is - currently displayed. - * Fix: Ensure fragment transaction instance is not `null` on initial tab - selection callback. - * Fix: Displaying an action mode while using stacked tab navigation no longer - throws an exception. - * Fix: Using expandable action item callbacks no longer results in a possible - exception on older devices. - - -Version 4.0.0 *(2012-03-07)* ----------------------------- - -Complete rewrite of the library to backport the Android 4.0 action bar. - - * The minimum supported version of Android is now 2.1 (API 7). - * New base activities are provided (e.g., `SherlockActivity` and - `SherlockFragmentActivity`) which extend from the native activities. - * The support library sources are no longer included in the library. You must - include `android-support-v4.jar` in your project separately. - * Theming now mirrors that of the native action bar through the use of multiple - styles rather than through `ab`- and `am`-prefixed attributes in the theme. - * The action bar can be statically attached to an activity view without the - requirement of using one of the provided base activities. - - -Version 3.5.1 *(2012-01-03)* ----------------------------- - - * Fix: `NullPointerException` in `FragmentManager` can no longer occur when an - attempt is being made to save to a `Bundle` that has not yet been created. - * Fix: Pre-3.0 action item submenu dialogs now properly dismiss themselves when - an item of theirs is selected. - - -Version 3.5.0 *(2011-12-18)* ----------------------------- - - * Library now uses the `r6` version of the compatibility library for its base. - Ice Cream Sandwich-specific implementations are currently disabled, however, - but will be added in a future version of the library. - - `MenuCompat`, `MenuItemCompat`, and `ActivityCompat` have be added back in - to ease transition to this library but all their methods and the classes - themselves have been deprecated. - * Rewritten menu and action item support from Ice Cream Sandwich. - - * Removed the need for the custom `Window.FEATURE_ACTION_ITEM_TEXT` flag. - You should now use the `showAsAction` attribute and/or the - `setShowAsAction(int)` method on each `MenuItem` to control whether or - not text is shown - * Action item dividers are now added automatically only when necessary - to distinguish possible confusion between action items. - * Fix: Action views now properly size themselves within the bounded space - of the menu. - - * Fix: List navigation no longer becomes unusable on certain device - configurations. - * Fix: `SubMenu`'s `findItem(int)` method now properly returns the support - version of `MenuItem`. - * Fix: Invisible sub-menu items are no longer shown on the pre-3.0 popup list. - - -Version 3.4.2 *(2001-11-09)* ----------------------------- - - * Fix: Stacked action bar now properly sets the tab bar background based on - the theme. - - -Version 3.4.1 *(2011-11-09)* ----------------------------- - - * The `makeFragmentName` method in `FragmentPagerAdapter` has been changed to - `public` scope to allow for easier access to your fragments that it is - managing. - * Action bar will now animate when calling `show()` or `hide()`. - * `SherlockPreferenceActivity` now provides full fragment and loader support. - * Examples for the plugins are now in their own sample application. - * Fix: Home icon no longer erroneously clipped when it exceeds the size of the - action bar. - * Fix: Tabs will now scroll horizontally to mimic the native action bar - behavior. - * Fix: Plugins now properly DO NOT inline their `R.java` integer constants. - * Fix: Tabs below the action bar are now styled with a default background so - that they do not incorrectly inherit an applied background unless explicity - declared. - - -Version 3.4.0 *(2011-10-30)* ----------------------------- - - * Library now uses the `r4` version of the compatibility library for its base. - Ice Cream Sandwich-specific implementations are currently disabled, however, - but will be added in a future version of the library. - * Context menu callbacks now use the support version of `MenuItem` to maintain - consistency. - * Added preference plugin which provides an action bar enhanced preference - screen. - * Fix: `abHomeLayout` theme attribute is now honored. - * Fix: `onPrepareOptionsMenu` is now properly dispatched upon menu - invalidation. - - -Version 3.3.1 *(2011-10-20)* ----------------------------- - -ADT 14 is now required. Maven 3 is required if building from the command line. - - * XML-defined `onClick` attributes will now check for an `onClick` method that - takes an `android.support.v4.view.MenuItem` instance. - * Tabs on medium screens in landscape now display inline rather than below the - action bar to mirror how Android 4.0 behaves with the same configuration. - * Fix: Menu inflater properly checks activity context for `onClick` method - declared in the XML. - * Fix: Dialog fragment properly saves its `showDialog` state when not being - used as a popup. - * Fix: Return `-1` when in tab navigation but no tab is selected. This brings - the library in line with the post-3.0 behavior. - * Fix: Removing a menu group no longer throws an `IndexOutOfBoundsException`. - * Fix: `getSelectedTab` and `getTabAt` no longer throw `NullPointerException`s - on post-3.0 when no tab was selected or no tab existed at the specified - position, respectively. - * Fix: `findFragmentById` now properly returns fragments attached to - `android.R.id.content` when run on pre-3.0 devices. - - -Version 3.3.0 *(2011-10-11)* ----------------------------- - - * Tabs are now displayed below the action bar on all medium-screen devices and - portrait large-screen devices. - * Fix: Dialog fragments no longer throw an `IllegalStateException` when being - used as a regular fragment (i.e., not as a popup). See - [StackOverflow](http://stackoverflow.com/questions/5637894/dialogfragments-with-devices-api-level-11/7560686#7560686) - for more information. - * Fix: Popping a fragment off of the back stack now properly assigns its parent - activity. - * Fix: An activity result no longer causes a `NullPointerException` when the - target fragment no longer exists. - * Fix: Action item dividers are now properly initially hidden when their - associated action items are as well. - - -Version 3.2.3 *(2011-09-16)* ----------------------------- - - * Fix: Fragments in a `ViewPager` that contributed items to the options menu - were caught in a race condition causing inconsistent results when a new page - was selected. This regression was introduced in version 3.2.2. - - -Version 3.2.2 *(2011-09-15)* ----------------------------- - - * Fix: Side-effects related to using `FragmentMapActivity` due to how it was - referencing resources from the main library. - * Fix: Fragments adjacent to the currently selected fragment in a `ViewPager` - no longer receive context menu events. - * Fix: Eliminate exception when inflating context menus on 3.0+ when using - `getMenuInflater()`. - * Fix: `ViewPager` now determines whether or not an activity menu invalidation - is required independently of whether or not fragments were created or - destroyed. This should fix an edge case where an activity with a `ViewPager` - containing only two fragments would not get its menu properly invalidated. - - -Version 3.2.1 *(2011-09-12)* ----------------------------- - - * Fix: Action mode API incorrectly using the native `Menu` and `MenuItem` - classes causing an easy pitfall for `ClassCastExceptions`. - * Fix: Large action bar backgrounds increasing the size beyond that alloted in - the theme. - - -Version 3.2.0 *(2011-09-05)* ----------------------------- - - * Added support for `MapView` and the Google APIs through the use of - `FragmentMapActivity`. If you are using a map within a fragment you must - ensure it is always attached to an activity which extends from this new base - class. - - Since supporting maps requires compiling against the Google APIs, this - functionality is implemented in the form of a plugin which is to be used - alongside the normal library. You can choose to add it as an additional - library project or by including it as a `.jar`. Maven users may simply - include the additional dependency (artifactId: `plugin-maps`). - * Fix: Fragments adjacent to the currently selected fragment in a `ViewPager` - no longer contribute to the activity menu. - * `ActionBar.Tab` has been changed from an interface to an abstract class to - mirror its native counterpart. - - -Version 3.1.3 *(2011-08-14)* ----------------------------- - - * Renamed all resources to be prefixed with `abs__` to avoid conflicts when - including in your project. - * Fix: Action bar background being set on two views causing artifacts to remain - on screen when the action bar was hidden. - * Fix: Incorrect sub-menu item being selected by default when the sub-menu was - triggered from the native options menu on pre-3.0. - * Fix: `MenuItem.setVisible` now properly updates the associated action item and - native menu item visible state. - * Fix: Adding items to a menu now honors its ordering and category. - * Fix: Fragment options item selected callback now uses the proper version of - `MenuItem`. - - -Version 3.1.2 *(2011-08-07)* ----------------------------- - - * Fix: `MenuItem.getMenuInfo()` was throwing runtime exception. Will now just - return `null`. - * Fix: Dragging over a `WebView` contained in a `ViewPager` would not register. - * Fix: Inflation of context menu incorrectly being handled by the custom menu - inflater for the library. - - -Version 3.1.1 *(2011-07-31)* ----------------------------- - - * Fix: `MenuItem.getSubMenu` now returns a support instance rather than a - native instance. - * Fix: Fragment methods `onAttach` and `onInflate` incorrectly regressed to use - `Activity` instead of a `FragmentActivity` in their method signatures. - * Fix: Retained fragments not being re-attached on pre-3.0 when attached to - `android.R.id.content` upon activity recreation. - * Fix: `onPrepareOptionsMenu` not dispatched to fragments. This still will only - occur if the activity method returns true (which is the default). - * Fix: `Menu.findItem` not returning `null` when the item was not found on - Android 3.0+. - - -Version 3.1.0 *(2011-07-22)* ----------------------------- - -Due to shortcomings in the Android theming system, a small change must be made -in how this library handles themes. If you were using a custom style for -`actionBarStyle` you must now specify its attributes in the root of the theme -and prefix them with 'ab'. - -You can see an example of this in the `SherlockCustom` theme in -`samples/demos/res/values/styles.xml`. - - * Library now uses the `r3` version of the compatibility library for its base. - * `actionBarStyle` is no longer a valid theme attribute (see note above). - * Added the demo project included with the new compatibility library under - `samples/demos/` and merged in the old 'featuredemo'. - * Dividers are now shown on pre-3.0 devices between all action items. - * `Window.FEATURE_ACTION_BAR_OVERLAY` is now honored on pre-3.0 devices. - * Inflation of XML menu resources will now honor `android:actionLayout` and - `android:actionViewClass` attributes. - * Buttons for displaying the determinate and indeterminate progress bars have - been added to the feature toggle demo. - * Added support for indeterminate progress bar. Due to the `final` modifier on - the native type, you must use `setIndeterminateProgressBarVisibility(Boolean)` - and pass `Boolean.TRUE` or `Boolean.FALSE`. - * Fix: `MenuBuilder#removeItem(int)` and `MenuBuilder#findItem(int)` throwing - `IndexOutOfBoundsException`s when the item was not found. - * Fix: Theme attributes for home item data (e.g., icon, logo) will not be - overwritten by the special `MenuItem` instance for home. - * Fix: Native strings can now be specified for an XML menu `` in - `android:title` and `android:titleCondensed`. - * `Window.FEATURE_ENABLE_ACTION_BAR_WATSON_TEXT` is now - `Window.FEATURE_ACTION_BAR_ITEM_TEXT`. - * `Widget.Sherlock.Spinner.DropDown.ActionBar` and - `Widget.Sherlock.Light.Spinner.DropDown.ActionBar` styles are now - `Widget.Sherlock.Spinner` and `Widget.Sherlock.Light.Spinner`, respectively. - * `Widget.Sherlock.ActionBarView_TabXXX` styles are now - `Widget.Sherlock.ActionBar.TabXXX`. - - -Version 3.0.3 *(2011-07-17)* ----------------------------- - -This version is a hotfix for incompatibilities introduced with the SDKs for -3.1 r2 and 3.2 r1. Due to unavoidable changes in the underlying SDK, the library -must now be compiled against API level 13. - - * `actionModeStyle` and `actionModePopupWindowStyle` are no longer valid theme - attributes. - - -Version 3.0.2 *(2011-06-23)* ----------------------------- - - * Sub-menus for action items are now shown in a list dialog. - * Moved certain classes to the `com.actionbarsherlock.internal` package which - were not meant for public consumption. Despite being given `public` scope in - this new package, these classes should **NOT** be used under any circumstances - as their API can be considered highly volatile and is subject to change often - and without warning. - - -Version 3.0.1 *(2011-06-08)* ----------------------------- - - * Fix: `onOptionsItemSelected()` not being called in fragments if the activity - version returns `false`. - * Fix: `onCreateOptionsMenu()` not being called in fragments on Android 3.0+. - * New: Enable action item text display on pre-Android 3.0 by calling - `requestWindowFeature` with `Window.FEATURE_ENABLE_ACTION_BAR_WATSON_TEXT`. - * Fix: `setCustomView()` no longer automatically enables the custom view on - pre-3.0. You must call `setDisplayShowCustomEnabled()` in order to display - the view. - - -Version 3.0.0 *(2011-06-05)* ----------------------------- - -The API has been rewritten to mimic that of the native action bar. As a result, -usage now only requires changing a few imports to use the support versions -of classes and calling `getSupportActionBar()`. See the README for more info. - -The rewrite necessitated tight interaction with the -[compatibility library](http://android-developers.blogspot.com/2011/03/fragments-for-all.html) -to the point where its sources are now included. You are no longer required to -have the standalone `.jar` file. - -Also included is a default custom action bar for use by default on pre-3.0 -devices. This custom implementation is based off of Johan Nilsson's -[Android-ActionBar](https://github.com/johannilsson/android-actionbar) and the -[work that I have done](https://github.com/johannilsson/android-actionbar/pull/25) -on it. - -More details are available at http://actionbarsherlock.com - - -Version 2.1.1 *(2011-03-21)* ----------------------------- - -**No changes to library code.** - - * Moved library to the root of the repository. - * Added `samples/dependencies.py` script to automatically download the needed - dependencies for the sample projects. - - -Version 2.1.0 *(2011-03-21)* ----------------------------- - -**WARNING**: The -[Android Compatibility Library (v4)](http://android-developers.blogspot.com/2011/03/fragments-for-all.html) -is now required. - - * Added `ActionBarSherlock.Activity`, `ActionBarSherlock.FragmentActivity`, - and `ActionBarSherlock.ListActivity` for extension by implementing - activities, the latter of which is deprecated. This affords a much tighter - integration and allows for the use of other new features listed below. - * New API method: `layout(Fragment)` will use the fragment argument as the - content to the activity. - * New API method: `menu(int)` allows for the inflation of menu XMLs from a - resource. For the non-native implementation, the XML can be inflated to a - custom Menu which can then be applied appropriately to the third-party - action bar. Sub-menus are also supported. Third-party action bar handlers - should implement `ActionBarSherlock.HasMenu` for this functionality. *This - feature requires that activities extend from one of the provided activity - base classes.* - * New API method: `homeAsUp(boolean)`. This mimics the native method - `setDisplayHomeAsUpEnalbed` on the native action bar. Third-party action bar - handlers should implement `ActionBarSherlock.HasHomeAsUp` for this - functionality. - * New API method: `useLogo(boolean)` will trigger the action bar to hide the - application icon/home button and title and show a larger logo representing - the application. Third-party action bar handlers should implement - `ActionBarSherlock.HasLogo` for this functionality. - * New API method: `listNavigation(SpinnerAdapter, OnNavigationListener)`. Tells - the action bar to use drop-down style navigation with the specified list of - items and callback listener. Third-party action bar handlers should - implement `ActionBarSherlock.HasListNavigation` for this functionality. - * Javadocs are now available at - [jakewharton.github.com/ActionBarSherlock](http://jakewharton.github.com/ActionBarSherlock/). - * A standalone JAR is now available via the - [GitHub downloads page](https://github.com/JakeWharton/ActionBarSherlock/downloads) - or in my - [personal maven repository](http://r.jakewharton.com/maven/) - as `com.jakewharton:android-actionbarsherlock:2.1.0`. - - -Version 2.0.1 *(2011-03-11)* ----------------------------- - - * Use `Class.forName()` for detection of native action bar. This provides - compatability all the way back to Android 1.5. - - -Version 2.0.0 *(2011-03-09)* ----------------------------- -Complete rewrite! - - * New and better API. - * More sane logic and attachment to activity. - * Extensible via generics. Implement any ActionBar or roll your own with - minimal effort. - * Now a library project for easy inclusion in applications. - - -Version 1.0.0 *(2011-03-07)* ----------------------------- -Initial release. diff --git a/actionbarsherlock/CONTRIBUTING.md b/actionbarsherlock/CONTRIBUTING.md deleted file mode 100755 index 30d383364..000000000 --- a/actionbarsherlock/CONTRIBUTING.md +++ /dev/null @@ -1,11 +0,0 @@ -Contributing -============ - -If you would like to contribute code to ActionBarSherlock you can do so through -GitHub by forking the repository and sending a pull request. - -When submitting code, please make every effort to follow existing conventions -and style in order to keep the code as readable as possible. Please also make -sure your code compiles by running `mvn clean verify`. Checkstyle failures -during compilation indicate errors in your style and can be viewed in the -`checkstyle-result.xml` file. diff --git a/actionbarsherlock/LICENSE.txt b/actionbarsherlock/LICENSE.txt deleted file mode 100755 index d64569567..000000000 --- a/actionbarsherlock/LICENSE.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/actionbarsherlock/README.md b/actionbarsherlock/README.md deleted file mode 100755 index 6506c361d..000000000 --- a/actionbarsherlock/README.md +++ /dev/null @@ -1,60 +0,0 @@ -ActionBarSherlock -================= - -ActionBarSherlock is an standalone library designed to facilitate the use of -the action bar design pattern across all versions of Android through a single -API. - -The library will automatically use the [native ActionBar][2] implementation on -Android 4.0 or later. For previous versions which do not include ActionBar, a -custom action bar implementation based on the sources of Ice Cream Sandwich -will automatically be wrapped around the layout. This allows you to easily -develop an application with an action bar for every version of Android from 2.x -and up. - -**See http://actionbarsherlock.com for more information.** - -![Example Image][3] - -Try out the sample applications on the Android Market: [Feature Demos][4], -[Fragments][5], and [RoboGuice][6]. - -Continuous integration is provided by [Travis CI][7]. - - - -Developed By -============ - -* Jake Wharton - - - - -License -======= - - Copyright 2012 Jake Wharton - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - - - - [1]: http://android-developers.blogspot.com/2011/03/fragments-for-all.html - [2]: http://developer.android.com/guide/topics/ui/actionbar.html - [3]: http://actionbarsherlock.com/static/feature.png - [4]: https://play.google.com/store/apps/details?id=com.actionbarsherlock.sample.demos - [5]: https://play.google.com/store/apps/details?id=com.actionbarsherlock.sample.fragments - [6]: https://play.google.com/store/apps/details?id=com.actionbarsherlock.sample.roboguice - [7]: https://travis-ci.org/JakeWharton/ActionBarSherlock diff --git a/actionbarsherlock/build.gradle b/actionbarsherlock/build.gradle new file mode 100644 index 000000000..f9c213af4 --- /dev/null +++ b/actionbarsherlock/build.gradle @@ -0,0 +1,28 @@ +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:0.5.+' + } +} + +apply plugin: 'android-library' + +repositories { + mavenCentral() +} + +android { + compileSdkVersion 17 + buildToolsVersion "17.0.0" + + defaultConfig { + minSdkVersion 7 + targetSdkVersion 17 + } +} + +dependencies { + compile 'com.android.support:support-v4:18.0.0' +} diff --git a/actionbarsherlock/checkstyle.xml b/actionbarsherlock/checkstyle.xml deleted file mode 100755 index a2119a1ba..000000000 --- a/actionbarsherlock/checkstyle.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/actionbarsherlock/library/ActionBarSherlock.iml b/actionbarsherlock/library/ActionBarSherlock.iml deleted file mode 100644 index 7b14baed5..000000000 --- a/actionbarsherlock/library/ActionBarSherlock.iml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/actionbarsherlock/library/README.md b/actionbarsherlock/library/README.md deleted file mode 100755 index e8a2c080e..000000000 --- a/actionbarsherlock/library/README.md +++ /dev/null @@ -1,15 +0,0 @@ -ActionBarSherlock Library -========================= - -This folder contains the main library which should be linked against as an -Android library project in your application. - -For more information see the "Including In Your Project" section of the -[usage page][1]. - - - - - - - [1]: http://actionbarsherlock.com/usage.html diff --git a/actionbarsherlock/library/checkstyle.xml b/actionbarsherlock/library/checkstyle.xml deleted file mode 100644 index 26be34cc6..000000000 --- a/actionbarsherlock/library/checkstyle.xml +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/actionbarsherlock/library/libs/android-support-v4.jar b/actionbarsherlock/library/libs/android-support-v4.jar deleted file mode 100755 index 99e063b33..000000000 Binary files a/actionbarsherlock/library/libs/android-support-v4.jar and /dev/null differ diff --git a/actionbarsherlock/library/pom.xml b/actionbarsherlock/library/pom.xml deleted file mode 100755 index 3b6ce40ce..000000000 --- a/actionbarsherlock/library/pom.xml +++ /dev/null @@ -1,148 +0,0 @@ - - - - 4.0.0 - - actionbarsherlock - ActionBarSherlock - apklib - - - com.actionbarsherlock - parent - 4.2.0 - ../pom.xml - - - - - com.google.android - android - provided - - - com.google.android - support-v4 - - - - junit - junit - test - - - - - src - test - - - - com.jayway.maven.plugins.android.generation2 - android-maven-plugin - true - - ignored - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - true - - - - - com.google.code.maven-replacer-plugin - maven-replacer-plugin - 1.4.0 - - - process-sources - - replace - - - - - false - target/generated-sources/r/com/actionbarsherlock/R.java - target/generated-sources/r/com/actionbarsherlock/R.java - false - static final int - static int - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - ../checkstyle.xml - - - - verify - - checkstyle - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.7 - - - package - - attach-artifact - - - - - jar - ${project.build.directory}/${project.build.finalName}.jar - - - - - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - com.google.code.maven-replacer-plugin - maven-replacer-plugin - [1.4.0,) - - replace - - - - - - - - - - - - - - diff --git a/actionbarsherlock/pom.xml b/actionbarsherlock/pom.xml deleted file mode 100755 index 371c34e33..000000000 --- a/actionbarsherlock/pom.xml +++ /dev/null @@ -1,189 +0,0 @@ - - - - 4.0.0 - - - org.sonatype.oss - oss-parent - 7 - - - com.actionbarsherlock - parent - pom - 4.2.0 - - ActionBarSherlock (Parent) - Android library for implementing the action bar design pattern using the backported sources of Ice Cream Sandwich. - http://actionbarsherlock.com - 2011 - - - library - samples - - - - https://github.com/JakeWharton/ActionBarSherlock/ - scm:git:git://github.com/JakeWharton/ActionBarSherlock.git - scm:git:git@github.com:JakeWharton/ActionBarSherlock.git - - - - - Jake Wharton - jakewharton@gmail.com - jakewharton - http://jakewharton.com - -5 - - developer - - - - - - - Apache License Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - Jake Wharton - http://jakewharton.com - - - - GitHub Issues - https://github.com/JakeWharton/ActionBarSherlock/issues - - - - UTF-8 - UTF-8 - - 1.6 - 4.0.1.2 - 14 - r7 - - 3.3.2 - 4.10 - - JakeWharton - ActionBarSherlock - - - - - - com.google.android - android - ${android.version} - - - com.google.android - support-v4 - ${android-support.version} - - - com.nineoldandroids - library - 2.4.0 - - - com.github.rtyley - roboguice-sherlock - 1.4 - - - junit - junit - ${junit.version} - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5 - - ${java.version} - ${java.version} - - - - - com.jayway.maven.plugins.android.generation2 - android-maven-plugin - 3.3.2 - - - ${android.platform} - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.8 - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.9.1 - - true - - - - - org.apache.maven.plugins - maven-site-plugin - 3.0 - - true - - - - - - - - org.apache.maven.plugins - maven-release-plugin - 2.2.2 - - true - - - - - com.github.github - site-maven-plugin - 0.5 - - - site - - site - - - - - Creating site for ${project.version}. - website - - - - - diff --git a/actionbarsherlock/library/proguard.cfg b/actionbarsherlock/proguard.cfg similarity index 100% rename from actionbarsherlock/library/proguard.cfg rename to actionbarsherlock/proguard.cfg diff --git a/actionbarsherlock/library/project.properties b/actionbarsherlock/project.properties similarity index 100% rename from actionbarsherlock/library/project.properties rename to actionbarsherlock/project.properties diff --git a/actionbarsherlock/library/AndroidManifest.xml b/actionbarsherlock/src/main/AndroidManifest.xml similarity index 100% rename from actionbarsherlock/library/AndroidManifest.xml rename to actionbarsherlock/src/main/AndroidManifest.xml diff --git a/actionbarsherlock/library/src/android/support/v4/app/Watson.java b/actionbarsherlock/src/main/java/android/support/v4/app/Watson.java similarity index 100% rename from actionbarsherlock/library/src/android/support/v4/app/Watson.java rename to actionbarsherlock/src/main/java/android/support/v4/app/Watson.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/ActionBarSherlock.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/ActionBarSherlock.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/ActionBarSherlock.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/ActionBarSherlock.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/app/ActionBar.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/app/ActionBar.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/app/ActionBar.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/app/ActionBar.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/app/SherlockActivity.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/app/SherlockActivity.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/app/SherlockActivity.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/app/SherlockActivity.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/app/SherlockDialogFragment.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/app/SherlockDialogFragment.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/app/SherlockDialogFragment.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/app/SherlockDialogFragment.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/app/SherlockExpandableListActivity.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/app/SherlockExpandableListActivity.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/app/SherlockFragment.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/app/SherlockFragment.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/app/SherlockFragment.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/app/SherlockFragment.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/app/SherlockFragmentActivity.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/app/SherlockFragmentActivity.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/app/SherlockFragmentActivity.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/app/SherlockFragmentActivity.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/app/SherlockListActivity.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/app/SherlockListActivity.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/app/SherlockListActivity.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/app/SherlockListActivity.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/app/SherlockListFragment.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/app/SherlockListFragment.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/app/SherlockListFragment.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/app/SherlockListFragment.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/app/SherlockPreferenceActivity.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/app/SherlockPreferenceActivity.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/ActionBarSherlockCompat.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/ActionBarSherlockCompat.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/ActionBarSherlockNative.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/ActionBarSherlockNative.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/ResourcesCompat.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/ResourcesCompat.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/ResourcesCompat.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/ResourcesCompat.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/app/ActionBarImpl.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/app/ActionBarImpl.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/app/ActionBarImpl.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/app/ActionBarImpl.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/app/ActionBarWrapper.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/app/ActionBarWrapper.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/ActionProviderWrapper.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/ActionProviderWrapper.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/StandaloneActionMode.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/StandaloneActionMode.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/menu/ActionMenu.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/menu/ActionMenu.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/menu/ActionMenuView.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/menu/ActionMenuView.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/menu/MenuBuilder.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/menu/MenuBuilder.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/menu/MenuPresenter.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/menu/MenuPresenter.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuView.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/menu/MenuView.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuView.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/menu/MenuView.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/menu/MenuWrapper.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/menu/MenuWrapper.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/widget/AbsActionBarView.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/widget/AbsActionBarView.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/widget/ActionBarContainer.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/widget/ActionBarContainer.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/widget/ActionBarContextView.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/widget/ActionBarContextView.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/widget/ActionBarView.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/widget/ActionBarView.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/widget/ActionBarView.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/widget/ActionBarView.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/widget/CapitalizingButton.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/widget/CapitalizingButton.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/widget/CapitalizingTextView.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/widget/CapitalizingTextView.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/widget/CollapsibleActionViewWrapper.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/widget/CollapsibleActionViewWrapper.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/widget/CollapsibleActionViewWrapper.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/widget/CollapsibleActionViewWrapper.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/widget/IcsAdapterView.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/widget/IcsAdapterView.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/widget/IcsColorDrawable.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/widget/IcsColorDrawable.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/widget/IcsColorDrawable.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/widget/IcsColorDrawable.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/widget/IcsLinearLayout.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/widget/IcsLinearLayout.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/widget/IcsProgressBar.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/widget/IcsProgressBar.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/widget/IcsSpinner.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/widget/IcsSpinner.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/widget/IcsSpinner.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/widget/IcsSpinner.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/widget/IcsView.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/widget/IcsView.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/widget/IcsView.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/widget/IcsView.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/view/ActionMode.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/view/ActionMode.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/view/ActionMode.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/view/ActionMode.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/view/ActionProvider.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/view/ActionProvider.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/view/ActionProvider.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/view/ActionProvider.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/view/CollapsibleActionView.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/view/CollapsibleActionView.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/view/CollapsibleActionView.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/view/CollapsibleActionView.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/view/Menu.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/view/Menu.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/view/Menu.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/view/Menu.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/view/MenuInflater.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/view/MenuInflater.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/view/MenuInflater.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/view/MenuInflater.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/view/MenuItem.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/view/MenuItem.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/view/MenuItem.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/view/MenuItem.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/view/SubMenu.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/view/SubMenu.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/view/SubMenu.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/view/SubMenu.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/view/Window.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/view/Window.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/view/Window.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/view/Window.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/widget/ActivityChooserModel.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/widget/ActivityChooserModel.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/widget/ActivityChooserModel.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/widget/ActivityChooserModel.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/widget/ActivityChooserView.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/widget/ActivityChooserView.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/widget/ActivityChooserView.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/widget/ActivityChooserView.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/widget/SearchView.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/widget/SearchView.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/widget/SearchView.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/widget/SearchView.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/widget/ShareActionProvider.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/widget/ShareActionProvider.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/widget/ShareActionProvider.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/widget/ShareActionProvider.java diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/widget/SuggestionsAdapter.java b/actionbarsherlock/src/main/java/com/actionbarsherlock/widget/SuggestionsAdapter.java similarity index 100% rename from actionbarsherlock/library/src/com/actionbarsherlock/widget/SuggestionsAdapter.java rename to actionbarsherlock/src/main/java/com/actionbarsherlock/widget/SuggestionsAdapter.java diff --git a/actionbarsherlock/library/res/color/abs__primary_text_disable_only_holo_dark.xml b/actionbarsherlock/src/main/res/color/abs__primary_text_disable_only_holo_dark.xml similarity index 100% rename from actionbarsherlock/library/res/color/abs__primary_text_disable_only_holo_dark.xml rename to actionbarsherlock/src/main/res/color/abs__primary_text_disable_only_holo_dark.xml diff --git a/actionbarsherlock/library/res/color/abs__primary_text_disable_only_holo_light.xml b/actionbarsherlock/src/main/res/color/abs__primary_text_disable_only_holo_light.xml similarity index 100% rename from actionbarsherlock/library/res/color/abs__primary_text_disable_only_holo_light.xml rename to actionbarsherlock/src/main/res/color/abs__primary_text_disable_only_holo_light.xml diff --git a/actionbarsherlock/library/res/color/abs__primary_text_holo_dark.xml b/actionbarsherlock/src/main/res/color/abs__primary_text_holo_dark.xml similarity index 100% rename from actionbarsherlock/library/res/color/abs__primary_text_holo_dark.xml rename to actionbarsherlock/src/main/res/color/abs__primary_text_holo_dark.xml diff --git a/actionbarsherlock/library/res/color/abs__primary_text_holo_light.xml b/actionbarsherlock/src/main/res/color/abs__primary_text_holo_light.xml similarity index 100% rename from actionbarsherlock/library/res/color/abs__primary_text_holo_light.xml rename to actionbarsherlock/src/main/res/color/abs__primary_text_holo_light.xml diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__ab_solid_light_holo.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__ab_solid_light_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__ab_solid_light_holo.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__ab_solid_light_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__dialog_full_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__dialog_full_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__dialog_full_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__dialog_full_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__ic_ab_back_holo_light.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_ab_back_holo_light.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__ic_ab_back_holo_light.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_ab_back_holo_light.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__ic_cab_done_holo_light.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_cab_done_holo_light.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__ic_cab_done_holo_light.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_cab_done_holo_light.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__ic_clear_disabled.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_clear_disabled.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__ic_clear_disabled.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_clear_disabled.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__ic_clear_normal.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_clear_normal.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__ic_clear_normal.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_clear_normal.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__ic_clear_search_api_disabled_holo_light.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_clear_search_api_disabled_holo_light.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__ic_clear_search_api_disabled_holo_light.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_clear_search_api_disabled_holo_light.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__ic_clear_search_api_holo_light.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_clear_search_api_holo_light.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__ic_clear_search_api_holo_light.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_clear_search_api_holo_light.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__ic_go.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_go.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__ic_go.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_go.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__ic_go_search_api_holo_light.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_go_search_api_holo_light.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__ic_go_search_api_holo_light.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_go_search_api_holo_light.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__ic_menu_share_holo_light.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_menu_share_holo_light.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__ic_menu_share_holo_light.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_menu_share_holo_light.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__ic_search.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_search.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__ic_search.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_search.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__ic_search_api_holo_light.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_search_api_holo_light.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__ic_search_api_holo_light.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_search_api_holo_light.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__ic_voice_search.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_voice_search.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__ic_voice_search.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_voice_search.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__ic_voice_search_api_holo_light.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_voice_search_api_holo_light.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__ic_voice_search_api_holo_light.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__ic_voice_search_api_holo_light.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__list_activated_holo.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__list_activated_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__list_activated_holo.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__list_activated_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__list_divider_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__list_divider_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__list_divider_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__list_divider_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__list_divider_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__list_divider_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__list_divider_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__list_divider_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__list_focused_holo.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__list_focused_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__list_focused_holo.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__list_focused_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__list_longpressed_holo.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__list_longpressed_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__list_longpressed_holo.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__list_longpressed_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__list_pressed_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__list_pressed_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__list_pressed_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__list_pressed_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__progress_bg_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__progress_bg_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__progress_bg_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__progress_bg_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__progress_primary_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__progress_primary_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__progress_primary_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__progress_primary_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__spinner_48_inner_holo.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__spinner_48_inner_holo.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__spinner_48_inner_holo.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__spinner_48_inner_holo.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__spinner_48_outer_holo.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__spinner_48_outer_holo.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__spinner_48_outer_holo.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__spinner_48_outer_holo.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__tab_selected_holo.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__tab_selected_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__tab_selected_holo.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__tab_selected_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__textfield_search_default_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__textfield_search_default_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__textfield_search_default_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__textfield_search_default_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__textfield_search_default_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__textfield_search_default_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__textfield_search_default_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__textfield_search_default_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__textfield_search_right_default_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__textfield_search_right_default_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__textfield_search_right_default_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__textfield_search_right_default_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__textfield_search_right_default_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__textfield_search_right_default_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__textfield_search_right_default_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__textfield_search_right_default_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__textfield_search_right_selected_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__textfield_search_right_selected_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__textfield_search_right_selected_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__textfield_search_right_selected_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__textfield_search_right_selected_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__textfield_search_right_selected_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__textfield_search_right_selected_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__textfield_search_right_selected_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__textfield_search_selected_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__textfield_search_selected_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__textfield_search_selected_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__textfield_search_selected_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-hdpi/abs__textfield_search_selected_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-hdpi/abs__textfield_search_selected_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-hdpi/abs__textfield_search_selected_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-hdpi/abs__textfield_search_selected_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__ab_solid_light_holo.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__ab_solid_light_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__ab_solid_light_holo.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__ab_solid_light_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__dialog_full_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__dialog_full_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__dialog_full_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__dialog_full_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__ic_ab_back_holo_light.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_ab_back_holo_light.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__ic_ab_back_holo_light.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_ab_back_holo_light.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__ic_cab_done_holo_light.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_cab_done_holo_light.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__ic_cab_done_holo_light.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_cab_done_holo_light.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__ic_clear_disabled.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_clear_disabled.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__ic_clear_disabled.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_clear_disabled.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__ic_clear_normal.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_clear_normal.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__ic_clear_normal.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_clear_normal.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__ic_clear_search_api_disabled_holo_light.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_clear_search_api_disabled_holo_light.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__ic_clear_search_api_disabled_holo_light.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_clear_search_api_disabled_holo_light.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__ic_clear_search_api_holo_light.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_clear_search_api_holo_light.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__ic_clear_search_api_holo_light.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_clear_search_api_holo_light.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__ic_go.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_go.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__ic_go.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_go.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__ic_go_search_api_holo_light.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_go_search_api_holo_light.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__ic_go_search_api_holo_light.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_go_search_api_holo_light.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__ic_menu_share_holo_light.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_menu_share_holo_light.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__ic_menu_share_holo_light.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_menu_share_holo_light.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__ic_search.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_search.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__ic_search.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_search.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__ic_search_api_holo_light.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_search_api_holo_light.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__ic_search_api_holo_light.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_search_api_holo_light.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__ic_voice_search.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_voice_search.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__ic_voice_search.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_voice_search.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__ic_voice_search_api_holo_light.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_voice_search_api_holo_light.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__ic_voice_search_api_holo_light.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__ic_voice_search_api_holo_light.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__list_activated_holo.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__list_activated_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__list_activated_holo.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__list_activated_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__list_divider_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__list_divider_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__list_divider_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__list_divider_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__list_divider_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__list_divider_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__list_divider_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__list_divider_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__list_focused_holo.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__list_focused_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__list_focused_holo.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__list_focused_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__list_longpressed_holo.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__list_longpressed_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__list_longpressed_holo.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__list_longpressed_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__list_pressed_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__list_pressed_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__list_pressed_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__list_pressed_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__progress_bg_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__progress_bg_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__progress_bg_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__progress_bg_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__progress_primary_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__progress_primary_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__progress_primary_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__progress_primary_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__spinner_48_inner_holo.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__spinner_48_inner_holo.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__spinner_48_inner_holo.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__spinner_48_inner_holo.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__spinner_48_outer_holo.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__spinner_48_outer_holo.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__spinner_48_outer_holo.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__spinner_48_outer_holo.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__tab_selected_holo.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__tab_selected_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__tab_selected_holo.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__tab_selected_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__textfield_search_default_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__textfield_search_default_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__textfield_search_default_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__textfield_search_default_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__textfield_search_default_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__textfield_search_default_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__textfield_search_default_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__textfield_search_default_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__textfield_search_right_default_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__textfield_search_right_default_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__textfield_search_right_default_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__textfield_search_right_default_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__textfield_search_right_default_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__textfield_search_right_default_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__textfield_search_right_default_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__textfield_search_right_default_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__textfield_search_right_selected_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__textfield_search_right_selected_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__textfield_search_right_selected_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__textfield_search_right_selected_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__textfield_search_right_selected_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__textfield_search_right_selected_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__textfield_search_right_selected_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__textfield_search_right_selected_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__textfield_search_selected_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__textfield_search_selected_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__textfield_search_selected_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__textfield_search_selected_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-mdpi/abs__textfield_search_selected_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-mdpi/abs__textfield_search_selected_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-mdpi/abs__textfield_search_selected_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-mdpi/abs__textfield_search_selected_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-v11/abs__progress_medium_holo.xml b/actionbarsherlock/src/main/res/drawable-v11/abs__progress_medium_holo.xml similarity index 100% rename from actionbarsherlock/library/res/drawable-v11/abs__progress_medium_holo.xml rename to actionbarsherlock/src/main/res/drawable-v11/abs__progress_medium_holo.xml diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__ic_clear_disabled.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__ic_clear_disabled.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__ic_clear_disabled.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__ic_clear_disabled.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__ic_clear_search_api_disabled_holo_light.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__ic_clear_search_api_disabled_holo_light.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__ic_clear_search_api_disabled_holo_light.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__ic_clear_search_api_disabled_holo_light.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__ic_clear_search_api_holo_light.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__ic_clear_search_api_holo_light.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__ic_clear_search_api_holo_light.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__ic_clear_search_api_holo_light.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__ic_go.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__ic_go.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__ic_go.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__ic_go.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__ic_go_search_api_holo_light.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__ic_go_search_api_holo_light.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__ic_go_search_api_holo_light.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__ic_go_search_api_holo_light.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__ic_search.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__ic_search.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__ic_search.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__ic_search.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__ic_search_api_holo_light.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__ic_search_api_holo_light.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__ic_search_api_holo_light.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__ic_search_api_holo_light.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__ic_voice_search.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__ic_voice_search.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__ic_voice_search.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__ic_voice_search.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__ic_voice_search_api_holo_light.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__ic_voice_search_api_holo_light.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__ic_voice_search_api_holo_light.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__ic_voice_search_api_holo_light.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__list_activated_holo.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__list_activated_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__list_activated_holo.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__list_activated_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__list_divider_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__list_divider_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__list_divider_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__list_divider_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__list_focused_holo.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__list_focused_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__list_focused_holo.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__list_focused_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__list_longpressed_holo.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__list_longpressed_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__list_longpressed_holo.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__list_longpressed_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__spinner_48_inner_holo.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__spinner_48_inner_holo.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__spinner_48_inner_holo.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__spinner_48_inner_holo.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__spinner_48_outer_holo.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__spinner_48_outer_holo.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__spinner_48_outer_holo.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__spinner_48_outer_holo.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__tab_selected_holo.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__tab_selected_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__tab_selected_holo.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__tab_selected_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__textfield_search_default_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__textfield_search_default_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__textfield_search_default_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__textfield_search_default_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__textfield_search_default_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__textfield_search_default_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__textfield_search_default_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__textfield_search_default_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__textfield_search_right_default_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__textfield_search_right_default_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__textfield_search_right_default_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__textfield_search_right_default_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__textfield_search_right_default_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__textfield_search_right_default_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__textfield_search_right_default_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__textfield_search_right_default_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__textfield_search_selected_holo_dark.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__textfield_search_selected_holo_dark.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__textfield_search_selected_holo_dark.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__textfield_search_selected_holo_dark.9.png diff --git a/actionbarsherlock/library/res/drawable-xhdpi/abs__textfield_search_selected_holo_light.9.png b/actionbarsherlock/src/main/res/drawable-xhdpi/abs__textfield_search_selected_holo_light.9.png similarity index 100% rename from actionbarsherlock/library/res/drawable-xhdpi/abs__textfield_search_selected_holo_light.9.png rename to actionbarsherlock/src/main/res/drawable-xhdpi/abs__textfield_search_selected_holo_light.9.png diff --git a/actionbarsherlock/library/res/drawable/abs__activated_background_holo_dark.xml b/actionbarsherlock/src/main/res/drawable/abs__activated_background_holo_dark.xml similarity index 100% rename from actionbarsherlock/library/res/drawable/abs__activated_background_holo_dark.xml rename to actionbarsherlock/src/main/res/drawable/abs__activated_background_holo_dark.xml diff --git a/actionbarsherlock/library/res/drawable/abs__activated_background_holo_light.xml b/actionbarsherlock/src/main/res/drawable/abs__activated_background_holo_light.xml similarity index 100% rename from actionbarsherlock/library/res/drawable/abs__activated_background_holo_light.xml rename to actionbarsherlock/src/main/res/drawable/abs__activated_background_holo_light.xml diff --git a/actionbarsherlock/library/res/drawable/abs__btn_cab_done_holo_dark.xml b/actionbarsherlock/src/main/res/drawable/abs__btn_cab_done_holo_dark.xml similarity index 100% rename from actionbarsherlock/library/res/drawable/abs__btn_cab_done_holo_dark.xml rename to actionbarsherlock/src/main/res/drawable/abs__btn_cab_done_holo_dark.xml diff --git a/actionbarsherlock/library/res/drawable/abs__btn_cab_done_holo_light.xml b/actionbarsherlock/src/main/res/drawable/abs__btn_cab_done_holo_light.xml similarity index 100% rename from actionbarsherlock/library/res/drawable/abs__btn_cab_done_holo_light.xml rename to actionbarsherlock/src/main/res/drawable/abs__btn_cab_done_holo_light.xml diff --git a/actionbarsherlock/library/res/drawable/abs__ic_clear.xml b/actionbarsherlock/src/main/res/drawable/abs__ic_clear.xml similarity index 100% rename from actionbarsherlock/library/res/drawable/abs__ic_clear.xml rename to actionbarsherlock/src/main/res/drawable/abs__ic_clear.xml diff --git a/actionbarsherlock/library/res/drawable/abs__ic_clear_holo_light.xml b/actionbarsherlock/src/main/res/drawable/abs__ic_clear_holo_light.xml similarity index 100% rename from actionbarsherlock/library/res/drawable/abs__ic_clear_holo_light.xml rename to actionbarsherlock/src/main/res/drawable/abs__ic_clear_holo_light.xml diff --git a/actionbarsherlock/library/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml b/actionbarsherlock/src/main/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml similarity index 100% rename from actionbarsherlock/library/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml rename to actionbarsherlock/src/main/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml diff --git a/actionbarsherlock/library/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml b/actionbarsherlock/src/main/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml similarity index 100% rename from actionbarsherlock/library/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml rename to actionbarsherlock/src/main/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml diff --git a/actionbarsherlock/library/res/drawable/abs__item_background_holo_dark.xml b/actionbarsherlock/src/main/res/drawable/abs__item_background_holo_dark.xml similarity index 100% rename from actionbarsherlock/library/res/drawable/abs__item_background_holo_dark.xml rename to actionbarsherlock/src/main/res/drawable/abs__item_background_holo_dark.xml diff --git a/actionbarsherlock/library/res/drawable/abs__item_background_holo_light.xml b/actionbarsherlock/src/main/res/drawable/abs__item_background_holo_light.xml similarity index 100% rename from actionbarsherlock/library/res/drawable/abs__item_background_holo_light.xml rename to actionbarsherlock/src/main/res/drawable/abs__item_background_holo_light.xml diff --git a/actionbarsherlock/library/res/drawable/abs__list_selector_background_transition_holo_dark.xml b/actionbarsherlock/src/main/res/drawable/abs__list_selector_background_transition_holo_dark.xml similarity index 100% rename from actionbarsherlock/library/res/drawable/abs__list_selector_background_transition_holo_dark.xml rename to actionbarsherlock/src/main/res/drawable/abs__list_selector_background_transition_holo_dark.xml diff --git a/actionbarsherlock/library/res/drawable/abs__list_selector_background_transition_holo_light.xml b/actionbarsherlock/src/main/res/drawable/abs__list_selector_background_transition_holo_light.xml similarity index 100% rename from actionbarsherlock/library/res/drawable/abs__list_selector_background_transition_holo_light.xml rename to actionbarsherlock/src/main/res/drawable/abs__list_selector_background_transition_holo_light.xml diff --git a/actionbarsherlock/library/res/drawable/abs__list_selector_holo_dark.xml b/actionbarsherlock/src/main/res/drawable/abs__list_selector_holo_dark.xml similarity index 100% rename from actionbarsherlock/library/res/drawable/abs__list_selector_holo_dark.xml rename to actionbarsherlock/src/main/res/drawable/abs__list_selector_holo_dark.xml diff --git a/actionbarsherlock/library/res/drawable/abs__list_selector_holo_light.xml b/actionbarsherlock/src/main/res/drawable/abs__list_selector_holo_light.xml similarity index 100% rename from actionbarsherlock/library/res/drawable/abs__list_selector_holo_light.xml rename to actionbarsherlock/src/main/res/drawable/abs__list_selector_holo_light.xml diff --git a/actionbarsherlock/library/res/drawable/abs__progress_horizontal_holo_dark.xml b/actionbarsherlock/src/main/res/drawable/abs__progress_horizontal_holo_dark.xml similarity index 100% rename from actionbarsherlock/library/res/drawable/abs__progress_horizontal_holo_dark.xml rename to actionbarsherlock/src/main/res/drawable/abs__progress_horizontal_holo_dark.xml diff --git a/actionbarsherlock/library/res/drawable/abs__progress_horizontal_holo_light.xml b/actionbarsherlock/src/main/res/drawable/abs__progress_horizontal_holo_light.xml similarity index 100% rename from actionbarsherlock/library/res/drawable/abs__progress_horizontal_holo_light.xml rename to actionbarsherlock/src/main/res/drawable/abs__progress_horizontal_holo_light.xml diff --git a/actionbarsherlock/library/res/drawable/abs__progress_medium_holo.xml b/actionbarsherlock/src/main/res/drawable/abs__progress_medium_holo.xml similarity index 100% rename from actionbarsherlock/library/res/drawable/abs__progress_medium_holo.xml rename to actionbarsherlock/src/main/res/drawable/abs__progress_medium_holo.xml diff --git a/actionbarsherlock/library/res/drawable/abs__search_dropdown_dark.xml b/actionbarsherlock/src/main/res/drawable/abs__search_dropdown_dark.xml similarity index 100% rename from actionbarsherlock/library/res/drawable/abs__search_dropdown_dark.xml rename to actionbarsherlock/src/main/res/drawable/abs__search_dropdown_dark.xml diff --git a/actionbarsherlock/library/res/drawable/abs__search_dropdown_light.xml b/actionbarsherlock/src/main/res/drawable/abs__search_dropdown_light.xml similarity index 100% rename from actionbarsherlock/library/res/drawable/abs__search_dropdown_light.xml rename to actionbarsherlock/src/main/res/drawable/abs__search_dropdown_light.xml diff --git a/actionbarsherlock/library/res/drawable/abs__spinner_ab_holo_dark.xml b/actionbarsherlock/src/main/res/drawable/abs__spinner_ab_holo_dark.xml similarity index 100% rename from actionbarsherlock/library/res/drawable/abs__spinner_ab_holo_dark.xml rename to actionbarsherlock/src/main/res/drawable/abs__spinner_ab_holo_dark.xml diff --git a/actionbarsherlock/library/res/drawable/abs__spinner_ab_holo_light.xml b/actionbarsherlock/src/main/res/drawable/abs__spinner_ab_holo_light.xml similarity index 100% rename from actionbarsherlock/library/res/drawable/abs__spinner_ab_holo_light.xml rename to actionbarsherlock/src/main/res/drawable/abs__spinner_ab_holo_light.xml diff --git a/actionbarsherlock/library/res/drawable/abs__tab_indicator_ab_holo.xml b/actionbarsherlock/src/main/res/drawable/abs__tab_indicator_ab_holo.xml similarity index 100% rename from actionbarsherlock/library/res/drawable/abs__tab_indicator_ab_holo.xml rename to actionbarsherlock/src/main/res/drawable/abs__tab_indicator_ab_holo.xml diff --git a/actionbarsherlock/library/res/drawable/abs__textfield_searchview_holo_dark.xml b/actionbarsherlock/src/main/res/drawable/abs__textfield_searchview_holo_dark.xml similarity index 100% rename from actionbarsherlock/library/res/drawable/abs__textfield_searchview_holo_dark.xml rename to actionbarsherlock/src/main/res/drawable/abs__textfield_searchview_holo_dark.xml diff --git a/actionbarsherlock/library/res/drawable/abs__textfield_searchview_holo_light.xml b/actionbarsherlock/src/main/res/drawable/abs__textfield_searchview_holo_light.xml similarity index 100% rename from actionbarsherlock/library/res/drawable/abs__textfield_searchview_holo_light.xml rename to actionbarsherlock/src/main/res/drawable/abs__textfield_searchview_holo_light.xml diff --git a/actionbarsherlock/library/res/drawable/abs__textfield_searchview_right_holo_dark.xml b/actionbarsherlock/src/main/res/drawable/abs__textfield_searchview_right_holo_dark.xml similarity index 100% rename from actionbarsherlock/library/res/drawable/abs__textfield_searchview_right_holo_dark.xml rename to actionbarsherlock/src/main/res/drawable/abs__textfield_searchview_right_holo_dark.xml diff --git a/actionbarsherlock/library/res/drawable/abs__textfield_searchview_right_holo_light.xml b/actionbarsherlock/src/main/res/drawable/abs__textfield_searchview_right_holo_light.xml similarity index 100% rename from actionbarsherlock/library/res/drawable/abs__textfield_searchview_right_holo_light.xml rename to actionbarsherlock/src/main/res/drawable/abs__textfield_searchview_right_holo_light.xml diff --git a/actionbarsherlock/library/res/layout-large/abs__action_mode_close_item.xml b/actionbarsherlock/src/main/res/layout-large/abs__action_mode_close_item.xml similarity index 100% rename from actionbarsherlock/library/res/layout-large/abs__action_mode_close_item.xml rename to actionbarsherlock/src/main/res/layout-large/abs__action_mode_close_item.xml diff --git a/actionbarsherlock/library/res/layout-v14/sherlock_spinner_dropdown_item.xml b/actionbarsherlock/src/main/res/layout-v14/sherlock_spinner_dropdown_item.xml similarity index 100% rename from actionbarsherlock/library/res/layout-v14/sherlock_spinner_dropdown_item.xml rename to actionbarsherlock/src/main/res/layout-v14/sherlock_spinner_dropdown_item.xml diff --git a/actionbarsherlock/library/res/layout-v14/sherlock_spinner_item.xml b/actionbarsherlock/src/main/res/layout-v14/sherlock_spinner_item.xml similarity index 100% rename from actionbarsherlock/library/res/layout-v14/sherlock_spinner_item.xml rename to actionbarsherlock/src/main/res/layout-v14/sherlock_spinner_item.xml diff --git a/actionbarsherlock/library/res/layout-xlarge/abs__screen_action_bar.xml b/actionbarsherlock/src/main/res/layout-xlarge/abs__screen_action_bar.xml similarity index 100% rename from actionbarsherlock/library/res/layout-xlarge/abs__screen_action_bar.xml rename to actionbarsherlock/src/main/res/layout-xlarge/abs__screen_action_bar.xml diff --git a/actionbarsherlock/library/res/layout-xlarge/abs__screen_action_bar_overlay.xml b/actionbarsherlock/src/main/res/layout-xlarge/abs__screen_action_bar_overlay.xml similarity index 100% rename from actionbarsherlock/library/res/layout-xlarge/abs__screen_action_bar_overlay.xml rename to actionbarsherlock/src/main/res/layout-xlarge/abs__screen_action_bar_overlay.xml diff --git a/actionbarsherlock/library/res/layout/abs__action_bar_home.xml b/actionbarsherlock/src/main/res/layout/abs__action_bar_home.xml similarity index 100% rename from actionbarsherlock/library/res/layout/abs__action_bar_home.xml rename to actionbarsherlock/src/main/res/layout/abs__action_bar_home.xml diff --git a/actionbarsherlock/library/res/layout/abs__action_bar_tab.xml b/actionbarsherlock/src/main/res/layout/abs__action_bar_tab.xml similarity index 100% rename from actionbarsherlock/library/res/layout/abs__action_bar_tab.xml rename to actionbarsherlock/src/main/res/layout/abs__action_bar_tab.xml diff --git a/actionbarsherlock/library/res/layout/abs__action_bar_tab_bar_view.xml b/actionbarsherlock/src/main/res/layout/abs__action_bar_tab_bar_view.xml similarity index 100% rename from actionbarsherlock/library/res/layout/abs__action_bar_tab_bar_view.xml rename to actionbarsherlock/src/main/res/layout/abs__action_bar_tab_bar_view.xml diff --git a/actionbarsherlock/library/res/layout/abs__action_bar_title_item.xml b/actionbarsherlock/src/main/res/layout/abs__action_bar_title_item.xml similarity index 100% rename from actionbarsherlock/library/res/layout/abs__action_bar_title_item.xml rename to actionbarsherlock/src/main/res/layout/abs__action_bar_title_item.xml diff --git a/actionbarsherlock/library/res/layout/abs__action_menu_item_layout.xml b/actionbarsherlock/src/main/res/layout/abs__action_menu_item_layout.xml similarity index 100% rename from actionbarsherlock/library/res/layout/abs__action_menu_item_layout.xml rename to actionbarsherlock/src/main/res/layout/abs__action_menu_item_layout.xml diff --git a/actionbarsherlock/library/res/layout/abs__action_menu_layout.xml b/actionbarsherlock/src/main/res/layout/abs__action_menu_layout.xml similarity index 100% rename from actionbarsherlock/library/res/layout/abs__action_menu_layout.xml rename to actionbarsherlock/src/main/res/layout/abs__action_menu_layout.xml diff --git a/actionbarsherlock/library/res/layout/abs__action_mode_bar.xml b/actionbarsherlock/src/main/res/layout/abs__action_mode_bar.xml similarity index 100% rename from actionbarsherlock/library/res/layout/abs__action_mode_bar.xml rename to actionbarsherlock/src/main/res/layout/abs__action_mode_bar.xml diff --git a/actionbarsherlock/library/res/layout/abs__action_mode_close_item.xml b/actionbarsherlock/src/main/res/layout/abs__action_mode_close_item.xml similarity index 100% rename from actionbarsherlock/library/res/layout/abs__action_mode_close_item.xml rename to actionbarsherlock/src/main/res/layout/abs__action_mode_close_item.xml diff --git a/actionbarsherlock/library/res/layout/abs__activity_chooser_view.xml b/actionbarsherlock/src/main/res/layout/abs__activity_chooser_view.xml similarity index 100% rename from actionbarsherlock/library/res/layout/abs__activity_chooser_view.xml rename to actionbarsherlock/src/main/res/layout/abs__activity_chooser_view.xml diff --git a/actionbarsherlock/library/res/layout/abs__activity_chooser_view_list_item.xml b/actionbarsherlock/src/main/res/layout/abs__activity_chooser_view_list_item.xml similarity index 100% rename from actionbarsherlock/library/res/layout/abs__activity_chooser_view_list_item.xml rename to actionbarsherlock/src/main/res/layout/abs__activity_chooser_view_list_item.xml diff --git a/actionbarsherlock/library/res/layout/abs__dialog_title_holo.xml b/actionbarsherlock/src/main/res/layout/abs__dialog_title_holo.xml similarity index 100% rename from actionbarsherlock/library/res/layout/abs__dialog_title_holo.xml rename to actionbarsherlock/src/main/res/layout/abs__dialog_title_holo.xml diff --git a/actionbarsherlock/library/res/layout/abs__list_menu_item_checkbox.xml b/actionbarsherlock/src/main/res/layout/abs__list_menu_item_checkbox.xml similarity index 100% rename from actionbarsherlock/library/res/layout/abs__list_menu_item_checkbox.xml rename to actionbarsherlock/src/main/res/layout/abs__list_menu_item_checkbox.xml diff --git a/actionbarsherlock/library/res/layout/abs__list_menu_item_icon.xml b/actionbarsherlock/src/main/res/layout/abs__list_menu_item_icon.xml similarity index 100% rename from actionbarsherlock/library/res/layout/abs__list_menu_item_icon.xml rename to actionbarsherlock/src/main/res/layout/abs__list_menu_item_icon.xml diff --git a/actionbarsherlock/library/res/layout/abs__list_menu_item_layout.xml b/actionbarsherlock/src/main/res/layout/abs__list_menu_item_layout.xml similarity index 100% rename from actionbarsherlock/library/res/layout/abs__list_menu_item_layout.xml rename to actionbarsherlock/src/main/res/layout/abs__list_menu_item_layout.xml diff --git a/actionbarsherlock/library/res/layout/abs__list_menu_item_radio.xml b/actionbarsherlock/src/main/res/layout/abs__list_menu_item_radio.xml similarity index 100% rename from actionbarsherlock/library/res/layout/abs__list_menu_item_radio.xml rename to actionbarsherlock/src/main/res/layout/abs__list_menu_item_radio.xml diff --git a/actionbarsherlock/library/res/layout/abs__popup_menu_item_layout.xml b/actionbarsherlock/src/main/res/layout/abs__popup_menu_item_layout.xml similarity index 100% rename from actionbarsherlock/library/res/layout/abs__popup_menu_item_layout.xml rename to actionbarsherlock/src/main/res/layout/abs__popup_menu_item_layout.xml diff --git a/actionbarsherlock/library/res/layout/abs__screen_action_bar.xml b/actionbarsherlock/src/main/res/layout/abs__screen_action_bar.xml similarity index 100% rename from actionbarsherlock/library/res/layout/abs__screen_action_bar.xml rename to actionbarsherlock/src/main/res/layout/abs__screen_action_bar.xml diff --git a/actionbarsherlock/library/res/layout/abs__screen_action_bar_overlay.xml b/actionbarsherlock/src/main/res/layout/abs__screen_action_bar_overlay.xml similarity index 100% rename from actionbarsherlock/library/res/layout/abs__screen_action_bar_overlay.xml rename to actionbarsherlock/src/main/res/layout/abs__screen_action_bar_overlay.xml diff --git a/actionbarsherlock/library/res/layout/abs__screen_simple.xml b/actionbarsherlock/src/main/res/layout/abs__screen_simple.xml similarity index 100% rename from actionbarsherlock/library/res/layout/abs__screen_simple.xml rename to actionbarsherlock/src/main/res/layout/abs__screen_simple.xml diff --git a/actionbarsherlock/library/res/layout/abs__screen_simple_overlay_action_mode.xml b/actionbarsherlock/src/main/res/layout/abs__screen_simple_overlay_action_mode.xml similarity index 100% rename from actionbarsherlock/library/res/layout/abs__screen_simple_overlay_action_mode.xml rename to actionbarsherlock/src/main/res/layout/abs__screen_simple_overlay_action_mode.xml diff --git a/actionbarsherlock/library/res/layout/abs__search_dropdown_item_icons_2line.xml b/actionbarsherlock/src/main/res/layout/abs__search_dropdown_item_icons_2line.xml similarity index 100% rename from actionbarsherlock/library/res/layout/abs__search_dropdown_item_icons_2line.xml rename to actionbarsherlock/src/main/res/layout/abs__search_dropdown_item_icons_2line.xml diff --git a/actionbarsherlock/library/res/layout/abs__search_view.xml b/actionbarsherlock/src/main/res/layout/abs__search_view.xml similarity index 100% rename from actionbarsherlock/library/res/layout/abs__search_view.xml rename to actionbarsherlock/src/main/res/layout/abs__search_view.xml diff --git a/actionbarsherlock/library/res/layout/abs__simple_dropdown_hint.xml b/actionbarsherlock/src/main/res/layout/abs__simple_dropdown_hint.xml similarity index 100% rename from actionbarsherlock/library/res/layout/abs__simple_dropdown_hint.xml rename to actionbarsherlock/src/main/res/layout/abs__simple_dropdown_hint.xml diff --git a/actionbarsherlock/library/res/layout/sherlock_spinner_dropdown_item.xml b/actionbarsherlock/src/main/res/layout/sherlock_spinner_dropdown_item.xml similarity index 100% rename from actionbarsherlock/library/res/layout/sherlock_spinner_dropdown_item.xml rename to actionbarsherlock/src/main/res/layout/sherlock_spinner_dropdown_item.xml diff --git a/actionbarsherlock/library/res/layout/sherlock_spinner_item.xml b/actionbarsherlock/src/main/res/layout/sherlock_spinner_item.xml similarity index 100% rename from actionbarsherlock/library/res/layout/sherlock_spinner_item.xml rename to actionbarsherlock/src/main/res/layout/sherlock_spinner_item.xml diff --git a/actionbarsherlock/library/res/values-land/abs__dimens.xml b/actionbarsherlock/src/main/res/values-land/abs__dimens.xml similarity index 100% rename from actionbarsherlock/library/res/values-land/abs__dimens.xml rename to actionbarsherlock/src/main/res/values-land/abs__dimens.xml diff --git a/actionbarsherlock/library/res/values-large-hdpi-1024x600/abs__dimens.xml b/actionbarsherlock/src/main/res/values-large-hdpi-1024x600/abs__dimens.xml similarity index 100% rename from actionbarsherlock/library/res/values-large-hdpi-1024x600/abs__dimens.xml rename to actionbarsherlock/src/main/res/values-large-hdpi-1024x600/abs__dimens.xml diff --git a/actionbarsherlock/library/res/values-large-land-hdpi-1024x600/abs__dimens.xml b/actionbarsherlock/src/main/res/values-large-land-hdpi-1024x600/abs__dimens.xml similarity index 100% rename from actionbarsherlock/library/res/values-large-land-hdpi-1024x600/abs__dimens.xml rename to actionbarsherlock/src/main/res/values-large-land-hdpi-1024x600/abs__dimens.xml diff --git a/actionbarsherlock/library/res/values-large-land-mdpi-1024x600/abs__dimens.xml b/actionbarsherlock/src/main/res/values-large-land-mdpi-1024x600/abs__dimens.xml similarity index 100% rename from actionbarsherlock/library/res/values-large-land-mdpi-1024x600/abs__dimens.xml rename to actionbarsherlock/src/main/res/values-large-land-mdpi-1024x600/abs__dimens.xml diff --git a/actionbarsherlock/library/res/values-large-mdpi-1024x600/abs__dimens.xml b/actionbarsherlock/src/main/res/values-large-mdpi-1024x600/abs__dimens.xml similarity index 100% rename from actionbarsherlock/library/res/values-large-mdpi-1024x600/abs__dimens.xml rename to actionbarsherlock/src/main/res/values-large-mdpi-1024x600/abs__dimens.xml diff --git a/actionbarsherlock/library/res/values-large/abs__dimens.xml b/actionbarsherlock/src/main/res/values-large/abs__dimens.xml similarity index 100% rename from actionbarsherlock/library/res/values-large/abs__dimens.xml rename to actionbarsherlock/src/main/res/values-large/abs__dimens.xml diff --git a/actionbarsherlock/library/res/values-sw600dp/abs__bools.xml b/actionbarsherlock/src/main/res/values-sw600dp/abs__bools.xml similarity index 100% rename from actionbarsherlock/library/res/values-sw600dp/abs__bools.xml rename to actionbarsherlock/src/main/res/values-sw600dp/abs__bools.xml diff --git a/actionbarsherlock/library/res/values-sw600dp/abs__dimens.xml b/actionbarsherlock/src/main/res/values-sw600dp/abs__dimens.xml similarity index 100% rename from actionbarsherlock/library/res/values-sw600dp/abs__dimens.xml rename to actionbarsherlock/src/main/res/values-sw600dp/abs__dimens.xml diff --git a/actionbarsherlock/library/res/values-v11/abs__themes.xml b/actionbarsherlock/src/main/res/values-v11/abs__themes.xml similarity index 100% rename from actionbarsherlock/library/res/values-v11/abs__themes.xml rename to actionbarsherlock/src/main/res/values-v11/abs__themes.xml diff --git a/actionbarsherlock/library/res/values-v14/abs__styles.xml b/actionbarsherlock/src/main/res/values-v14/abs__styles.xml similarity index 100% rename from actionbarsherlock/library/res/values-v14/abs__styles.xml rename to actionbarsherlock/src/main/res/values-v14/abs__styles.xml diff --git a/actionbarsherlock/library/res/values-v14/abs__themes.xml b/actionbarsherlock/src/main/res/values-v14/abs__themes.xml similarity index 100% rename from actionbarsherlock/library/res/values-v14/abs__themes.xml rename to actionbarsherlock/src/main/res/values-v14/abs__themes.xml diff --git a/actionbarsherlock/library/res/values-w360dp/abs__dimens.xml b/actionbarsherlock/src/main/res/values-w360dp/abs__dimens.xml similarity index 100% rename from actionbarsherlock/library/res/values-w360dp/abs__dimens.xml rename to actionbarsherlock/src/main/res/values-w360dp/abs__dimens.xml diff --git a/actionbarsherlock/library/res/values-w480dp/abs__bools.xml b/actionbarsherlock/src/main/res/values-w480dp/abs__bools.xml similarity index 100% rename from actionbarsherlock/library/res/values-w480dp/abs__bools.xml rename to actionbarsherlock/src/main/res/values-w480dp/abs__bools.xml diff --git a/actionbarsherlock/library/res/values-w480dp/abs__config.xml b/actionbarsherlock/src/main/res/values-w480dp/abs__config.xml similarity index 100% rename from actionbarsherlock/library/res/values-w480dp/abs__config.xml rename to actionbarsherlock/src/main/res/values-w480dp/abs__config.xml diff --git a/actionbarsherlock/library/res/values-w500dp/abs__dimens.xml b/actionbarsherlock/src/main/res/values-w500dp/abs__dimens.xml similarity index 100% rename from actionbarsherlock/library/res/values-w500dp/abs__dimens.xml rename to actionbarsherlock/src/main/res/values-w500dp/abs__dimens.xml diff --git a/actionbarsherlock/library/res/values-w600dp/abs__dimens.xml b/actionbarsherlock/src/main/res/values-w600dp/abs__dimens.xml similarity index 100% rename from actionbarsherlock/library/res/values-w600dp/abs__dimens.xml rename to actionbarsherlock/src/main/res/values-w600dp/abs__dimens.xml diff --git a/actionbarsherlock/library/res/values-xlarge/abs__dimens.xml b/actionbarsherlock/src/main/res/values-xlarge/abs__dimens.xml similarity index 100% rename from actionbarsherlock/library/res/values-xlarge/abs__dimens.xml rename to actionbarsherlock/src/main/res/values-xlarge/abs__dimens.xml diff --git a/actionbarsherlock/library/res/values/abs__attrs.xml b/actionbarsherlock/src/main/res/values/abs__attrs.xml similarity index 100% rename from actionbarsherlock/library/res/values/abs__attrs.xml rename to actionbarsherlock/src/main/res/values/abs__attrs.xml diff --git a/actionbarsherlock/library/res/values/abs__bools.xml b/actionbarsherlock/src/main/res/values/abs__bools.xml similarity index 100% rename from actionbarsherlock/library/res/values/abs__bools.xml rename to actionbarsherlock/src/main/res/values/abs__bools.xml diff --git a/actionbarsherlock/library/res/values/abs__colors.xml b/actionbarsherlock/src/main/res/values/abs__colors.xml similarity index 100% rename from actionbarsherlock/library/res/values/abs__colors.xml rename to actionbarsherlock/src/main/res/values/abs__colors.xml diff --git a/actionbarsherlock/library/res/values/abs__config.xml b/actionbarsherlock/src/main/res/values/abs__config.xml similarity index 100% rename from actionbarsherlock/library/res/values/abs__config.xml rename to actionbarsherlock/src/main/res/values/abs__config.xml diff --git a/actionbarsherlock/library/res/values/abs__dimens.xml b/actionbarsherlock/src/main/res/values/abs__dimens.xml similarity index 100% rename from actionbarsherlock/library/res/values/abs__dimens.xml rename to actionbarsherlock/src/main/res/values/abs__dimens.xml diff --git a/actionbarsherlock/library/res/values/abs__ids.xml b/actionbarsherlock/src/main/res/values/abs__ids.xml similarity index 100% rename from actionbarsherlock/library/res/values/abs__ids.xml rename to actionbarsherlock/src/main/res/values/abs__ids.xml diff --git a/actionbarsherlock/library/res/values/abs__strings.xml b/actionbarsherlock/src/main/res/values/abs__strings.xml similarity index 100% rename from actionbarsherlock/library/res/values/abs__strings.xml rename to actionbarsherlock/src/main/res/values/abs__strings.xml diff --git a/actionbarsherlock/library/res/values/abs__styles.xml b/actionbarsherlock/src/main/res/values/abs__styles.xml similarity index 100% rename from actionbarsherlock/library/res/values/abs__styles.xml rename to actionbarsherlock/src/main/res/values/abs__styles.xml diff --git a/actionbarsherlock/library/res/values/abs__themes.xml b/actionbarsherlock/src/main/res/values/abs__themes.xml similarity index 100% rename from actionbarsherlock/library/res/values/abs__themes.xml rename to actionbarsherlock/src/main/res/values/abs__themes.xml diff --git a/actionbarsherlock/library/test/com/actionbarsherlock/internal/ManifestParsingTest.java b/actionbarsherlock/test/com/actionbarsherlock/internal/ManifestParsingTest.java similarity index 100% rename from actionbarsherlock/library/test/com/actionbarsherlock/internal/ManifestParsingTest.java rename to actionbarsherlock/test/com/actionbarsherlock/internal/ManifestParsingTest.java diff --git a/actionbarsherlock/update-version.py b/actionbarsherlock/update-version.py deleted file mode 100644 index a80af1570..000000000 --- a/actionbarsherlock/update-version.py +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env python - -import os -import re -from datetime import date - -repo = os.path.dirname(os.path.realpath(__file__)) -changelog = os.path.join(repo, 'CHANGELOG.md') - -code = 'android:versionCode="%s"' -name = 'android:versionName="%s"' -in_code = code % r'(\d+)' -in_name = name % r'([^"]+)' -new_code = None -new_name = None - -# Update manifest files -for dirpath, dirnames, filenames in os.walk(repo): - for filename in filenames: - if filename == 'AndroidManifest.xml': - filepath = os.path.join(dirpath, filename) - with open(filepath) as f: - contents = f.read() - if new_code is None: - print('Current version code: ' + re.search(in_code, contents).group(1)) - new_code = raw_input('New version code: ') - print('Current version name: ' + re.search(in_name, contents).group(1)) - new_name = raw_input('New version name: ') - contents = re.sub(in_code, code % new_code, contents) - contents = re.sub(in_name, name % new_name, contents) - with open(filepath, 'w') as f: - f.write(contents) - -# Update change log -with open(changelog) as f: - contents = f.read() -if 'In Development' in contents: - contents = contents.replace('In Development', date.today().strftime('%Y-%m-%d')) - with open(changelog, 'w') as f: - f.write(contents) diff --git a/android-aac-enc/android-aac-enc.iml b/android-aac-enc/android-aac-enc.iml index 9ef3aece7..5668cb60f 100644 --- a/android-aac-enc/android-aac-enc.iml +++ b/android-aac-enc/android-aac-enc.iml @@ -1,21 +1,75 @@ - + + + + + + - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + diff --git a/android-aac-enc/build.gradle b/android-aac-enc/build.gradle new file mode 100644 index 000000000..f9c213af4 --- /dev/null +++ b/android-aac-enc/build.gradle @@ -0,0 +1,28 @@ +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:0.5.+' + } +} + +apply plugin: 'android-library' + +repositories { + mavenCentral() +} + +android { + compileSdkVersion 17 + buildToolsVersion "17.0.0" + + defaultConfig { + minSdkVersion 7 + targetSdkVersion 17 + } +} + +dependencies { + compile 'com.android.support:support-v4:18.0.0' +} diff --git a/android-aac-enc/AndroidManifest.xml b/android-aac-enc/src/main/AndroidManifest.xml similarity index 100% rename from android-aac-enc/AndroidManifest.xml rename to android-aac-enc/src/main/AndroidManifest.xml diff --git a/android-aac-enc/src/com/coremedia/iso/AbstractBoxParser.java b/android-aac-enc/src/main/java/com/coremedia/iso/AbstractBoxParser.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/AbstractBoxParser.java rename to android-aac-enc/src/main/java/com/coremedia/iso/AbstractBoxParser.java diff --git a/android-aac-enc/src/com/coremedia/iso/Ascii.java b/android-aac-enc/src/main/java/com/coremedia/iso/Ascii.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/Ascii.java rename to android-aac-enc/src/main/java/com/coremedia/iso/Ascii.java diff --git a/android-aac-enc/src/com/coremedia/iso/BoxParser.java b/android-aac-enc/src/main/java/com/coremedia/iso/BoxParser.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/BoxParser.java rename to android-aac-enc/src/main/java/com/coremedia/iso/BoxParser.java diff --git a/android-aac-enc/src/com/coremedia/iso/ChannelHelper.java b/android-aac-enc/src/main/java/com/coremedia/iso/ChannelHelper.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/ChannelHelper.java rename to android-aac-enc/src/main/java/com/coremedia/iso/ChannelHelper.java diff --git a/android-aac-enc/src/com/coremedia/iso/Hex.java b/android-aac-enc/src/main/java/com/coremedia/iso/Hex.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/Hex.java rename to android-aac-enc/src/main/java/com/coremedia/iso/Hex.java diff --git a/android-aac-enc/src/com/coremedia/iso/IsoFile.java b/android-aac-enc/src/main/java/com/coremedia/iso/IsoFile.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/IsoFile.java rename to android-aac-enc/src/main/java/com/coremedia/iso/IsoFile.java diff --git a/android-aac-enc/src/com/coremedia/iso/IsoFileConvenienceHelper.java b/android-aac-enc/src/main/java/com/coremedia/iso/IsoFileConvenienceHelper.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/IsoFileConvenienceHelper.java rename to android-aac-enc/src/main/java/com/coremedia/iso/IsoFileConvenienceHelper.java diff --git a/android-aac-enc/src/com/coremedia/iso/IsoTypeReader.java b/android-aac-enc/src/main/java/com/coremedia/iso/IsoTypeReader.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/IsoTypeReader.java rename to android-aac-enc/src/main/java/com/coremedia/iso/IsoTypeReader.java diff --git a/android-aac-enc/src/com/coremedia/iso/IsoTypeReaderVariable.java b/android-aac-enc/src/main/java/com/coremedia/iso/IsoTypeReaderVariable.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/IsoTypeReaderVariable.java rename to android-aac-enc/src/main/java/com/coremedia/iso/IsoTypeReaderVariable.java diff --git a/android-aac-enc/src/com/coremedia/iso/IsoTypeWriter.java b/android-aac-enc/src/main/java/com/coremedia/iso/IsoTypeWriter.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/IsoTypeWriter.java rename to android-aac-enc/src/main/java/com/coremedia/iso/IsoTypeWriter.java diff --git a/android-aac-enc/src/com/coremedia/iso/IsoTypeWriterVariable.java b/android-aac-enc/src/main/java/com/coremedia/iso/IsoTypeWriterVariable.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/IsoTypeWriterVariable.java rename to android-aac-enc/src/main/java/com/coremedia/iso/IsoTypeWriterVariable.java diff --git a/android-aac-enc/src/com/coremedia/iso/PropertyBoxParserImpl.java b/android-aac-enc/src/main/java/com/coremedia/iso/PropertyBoxParserImpl.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/PropertyBoxParserImpl.java rename to android-aac-enc/src/main/java/com/coremedia/iso/PropertyBoxParserImpl.java diff --git a/android-aac-enc/src/com/coremedia/iso/Utf8.java b/android-aac-enc/src/main/java/com/coremedia/iso/Utf8.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/Utf8.java rename to android-aac-enc/src/main/java/com/coremedia/iso/Utf8.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/AbstractMediaHeaderBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/AbstractMediaHeaderBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/AbstractMediaHeaderBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/AbstractMediaHeaderBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/AlbumBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/AlbumBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/AlbumBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/AlbumBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/AuthorBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/AuthorBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/AuthorBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/AuthorBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/BitRateBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/BitRateBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/BitRateBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/BitRateBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/Box.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/Box.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/Box.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/Box.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/ChunkOffset64BitBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/ChunkOffset64BitBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/ChunkOffset64BitBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/ChunkOffset64BitBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/ChunkOffsetBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/ChunkOffsetBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/ChunkOffsetBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/ChunkOffsetBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/ClassificationBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/ClassificationBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/ClassificationBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/ClassificationBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/CompositionShiftLeastGreatestAtom.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/CompositionShiftLeastGreatestAtom.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/CompositionShiftLeastGreatestAtom.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/CompositionShiftLeastGreatestAtom.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/CompositionTimeToSample.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/CompositionTimeToSample.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/CompositionTimeToSample.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/CompositionTimeToSample.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/ContainerBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/ContainerBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/ContainerBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/ContainerBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/CopyrightBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/CopyrightBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/CopyrightBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/CopyrightBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/DataEntryUrlBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/DataEntryUrlBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/DataEntryUrlBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/DataEntryUrlBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/DataEntryUrnBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/DataEntryUrnBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/DataEntryUrnBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/DataEntryUrnBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/DataInformationBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/DataInformationBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/DataInformationBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/DataInformationBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/DataReferenceBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/DataReferenceBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/DataReferenceBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/DataReferenceBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/DescriptionBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/DescriptionBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/DescriptionBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/DescriptionBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/EditBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/EditBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/EditBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/EditBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/EditListBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/EditListBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/EditListBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/EditListBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/FileTypeBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/FileTypeBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/FileTypeBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/FileTypeBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/FreeBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/FreeBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/FreeBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/FreeBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/FreeSpaceBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/FreeSpaceBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/FreeSpaceBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/FreeSpaceBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/FullBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/FullBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/FullBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/FullBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/GenericMediaHeaderBoxImpl.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/GenericMediaHeaderBoxImpl.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/GenericMediaHeaderBoxImpl.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/GenericMediaHeaderBoxImpl.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/GenreBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/GenreBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/GenreBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/GenreBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/HandlerBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/HandlerBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/HandlerBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/HandlerBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/HintMediaHeaderBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/HintMediaHeaderBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/HintMediaHeaderBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/HintMediaHeaderBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/ItemDataBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/ItemDataBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/ItemDataBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/ItemDataBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/ItemLocationBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/ItemLocationBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/ItemLocationBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/ItemLocationBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/ItemProtectionBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/ItemProtectionBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/ItemProtectionBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/ItemProtectionBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/KeywordsBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/KeywordsBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/KeywordsBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/KeywordsBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/MediaBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/MediaBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/MediaBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/MediaBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/MediaHeaderBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/MediaHeaderBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/MediaHeaderBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/MediaHeaderBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/MediaInformationBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/MediaInformationBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/MediaInformationBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/MediaInformationBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/MetaBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/MetaBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/MetaBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/MetaBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/MovieBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/MovieBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/MovieBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/MovieBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/MovieHeaderBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/MovieHeaderBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/MovieHeaderBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/MovieHeaderBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/NullMediaHeaderBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/NullMediaHeaderBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/NullMediaHeaderBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/NullMediaHeaderBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/ObjectDescriptorBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/ObjectDescriptorBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/ObjectDescriptorBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/ObjectDescriptorBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/OmaDrmAccessUnitFormatBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/OmaDrmAccessUnitFormatBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/OmaDrmAccessUnitFormatBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/OmaDrmAccessUnitFormatBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/OriginalFormatBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/OriginalFormatBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/OriginalFormatBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/OriginalFormatBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/PerformerBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/PerformerBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/PerformerBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/PerformerBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/ProgressiveDownloadInformationBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/ProgressiveDownloadInformationBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/ProgressiveDownloadInformationBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/ProgressiveDownloadInformationBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/ProtectionSchemeInformationBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/ProtectionSchemeInformationBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/ProtectionSchemeInformationBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/ProtectionSchemeInformationBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/RatingBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/RatingBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/RatingBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/RatingBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/RecordingYearBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/RecordingYearBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/RecordingYearBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/RecordingYearBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/SampleAuxiliaryInformationOffsetsBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/SampleAuxiliaryInformationOffsetsBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/SampleAuxiliaryInformationOffsetsBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/SampleAuxiliaryInformationOffsetsBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/SampleAuxiliaryInformationSizesBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/SampleAuxiliaryInformationSizesBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/SampleAuxiliaryInformationSizesBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/SampleAuxiliaryInformationSizesBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/SampleDependencyTypeBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/SampleDependencyTypeBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/SampleDependencyTypeBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/SampleDependencyTypeBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/SampleDescriptionBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/SampleDescriptionBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/SampleDescriptionBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/SampleDescriptionBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/SampleSizeBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/SampleSizeBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/SampleSizeBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/SampleSizeBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/SampleTableBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/SampleTableBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/SampleTableBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/SampleTableBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/SampleToChunkBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/SampleToChunkBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/SampleToChunkBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/SampleToChunkBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/SampleToGroupBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/SampleToGroupBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/SampleToGroupBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/SampleToGroupBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/SchemeInformationBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/SchemeInformationBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/SchemeInformationBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/SchemeInformationBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/SchemeTypeBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/SchemeTypeBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/SchemeTypeBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/SchemeTypeBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/SoundMediaHeaderBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/SoundMediaHeaderBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/SoundMediaHeaderBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/SoundMediaHeaderBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/StaticChunkOffsetBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/StaticChunkOffsetBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/StaticChunkOffsetBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/StaticChunkOffsetBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/SubSampleInformationBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/SubSampleInformationBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/SubSampleInformationBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/SubSampleInformationBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/SubtitleMediaHeaderBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/SubtitleMediaHeaderBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/SubtitleMediaHeaderBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/SubtitleMediaHeaderBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/SyncSampleBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/SyncSampleBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/SyncSampleBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/SyncSampleBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/TimeToSampleBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/TimeToSampleBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/TimeToSampleBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/TimeToSampleBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/TitleBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/TitleBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/TitleBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/TitleBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/TrackBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/TrackBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/TrackBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/TrackBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/TrackHeaderBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/TrackHeaderBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/TrackHeaderBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/TrackHeaderBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/TrackReferenceBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/TrackReferenceBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/TrackReferenceBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/TrackReferenceBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/TrackReferenceTypeBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/TrackReferenceTypeBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/TrackReferenceTypeBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/TrackReferenceTypeBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/UnknownBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/UnknownBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/UnknownBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/UnknownBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/UserBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/UserBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/UserBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/UserBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/UserDataBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/UserDataBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/UserDataBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/UserDataBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/VideoMediaHeaderBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/VideoMediaHeaderBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/VideoMediaHeaderBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/VideoMediaHeaderBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/WriteListener.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/WriteListener.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/WriteListener.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/WriteListener.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/XmlBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/XmlBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/XmlBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/XmlBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AbstractAppleMetaDataBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AbstractAppleMetaDataBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AbstractAppleMetaDataBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AbstractAppleMetaDataBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleAlbumArtistBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleAlbumArtistBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleAlbumArtistBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleAlbumArtistBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleAlbumBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleAlbumBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleAlbumBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleAlbumBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleArtistBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleArtistBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleArtistBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleArtistBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleCommentBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleCommentBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleCommentBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleCommentBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleCompilationBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleCompilationBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleCompilationBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleCompilationBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleCopyrightBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleCopyrightBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleCopyrightBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleCopyrightBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleCoverBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleCoverBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleCoverBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleCoverBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleCustomGenreBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleCustomGenreBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleCustomGenreBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleCustomGenreBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleDataBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleDataBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleDataBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleDataBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleDataRateBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleDataRateBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleDataRateBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleDataRateBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleDataReferenceBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleDataReferenceBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleDataReferenceBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleDataReferenceBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleDescriptionBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleDescriptionBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleDescriptionBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleDescriptionBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleEncoderBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleEncoderBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleEncoderBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleEncoderBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleGaplessPlaybackBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleGaplessPlaybackBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleGaplessPlaybackBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleGaplessPlaybackBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleGenericBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleGenericBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleGenericBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleGenericBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleGroupingBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleGroupingBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleGroupingBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleGroupingBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleIdBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleIdBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleIdBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleIdBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleItemListBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleItemListBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleItemListBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleItemListBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleLosslessSpecificBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleLosslessSpecificBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleLosslessSpecificBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleLosslessSpecificBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleMeanBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleMeanBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleMeanBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleMeanBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleMediaTypeBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleMediaTypeBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleMediaTypeBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleMediaTypeBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleNameBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleNameBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleNameBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleNameBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleNetworkBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleNetworkBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleNetworkBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleNetworkBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/ApplePurchaseDateBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/ApplePurchaseDateBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/ApplePurchaseDateBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/ApplePurchaseDateBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleRatingBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleRatingBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleRatingBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleRatingBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleRecordingYearBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleRecordingYearBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleRecordingYearBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleRecordingYearBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleReferenceMovieBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleReferenceMovieBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleReferenceMovieBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleReferenceMovieBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleReferenceMovieDescriptorBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleReferenceMovieDescriptorBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleReferenceMovieDescriptorBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleReferenceMovieDescriptorBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleShowBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleShowBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleShowBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleShowBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleSortAlbumBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleSortAlbumBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleSortAlbumBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleSortAlbumBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleStandardGenreBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleStandardGenreBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleStandardGenreBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleStandardGenreBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleStoreAccountTypeBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleStoreAccountTypeBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleStoreAccountTypeBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleStoreAccountTypeBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleStoreCountryCodeBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleStoreCountryCodeBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleStoreCountryCodeBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleStoreCountryCodeBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleSynopsisBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleSynopsisBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleSynopsisBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleSynopsisBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleTempBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleTempBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleTempBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleTempBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleTrackAuthorBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleTrackAuthorBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleTrackAuthorBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleTrackAuthorBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleTrackNumberBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleTrackNumberBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleTrackNumberBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleTrackNumberBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleTrackTitleBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleTrackTitleBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleTrackTitleBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleTrackTitleBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleTvEpisodeBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleTvEpisodeBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleTvEpisodeBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleTvEpisodeBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleTvEpisodeNumberBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleTvEpisodeNumberBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleTvEpisodeNumberBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleTvEpisodeNumberBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleTvSeasonBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleTvSeasonBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleTvSeasonBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleTvSeasonBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleWaveBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleWaveBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/apple/AppleWaveBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/apple/AppleWaveBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/dece/TrickPlayBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/dece/TrickPlayBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/dece/TrickPlayBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/dece/TrickPlayBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/fragment/MovieExtendsBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/fragment/MovieExtendsBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/fragment/MovieExtendsBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/fragment/MovieExtendsBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/fragment/MovieExtendsHeaderBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/fragment/MovieExtendsHeaderBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/fragment/MovieExtendsHeaderBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/fragment/MovieExtendsHeaderBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/fragment/MovieFragmentBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/fragment/MovieFragmentBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/fragment/MovieFragmentBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/fragment/MovieFragmentBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/fragment/MovieFragmentHeaderBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/fragment/MovieFragmentHeaderBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/fragment/MovieFragmentHeaderBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/fragment/MovieFragmentHeaderBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/fragment/MovieFragmentRandomAccessBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/fragment/MovieFragmentRandomAccessBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/fragment/MovieFragmentRandomAccessBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/fragment/MovieFragmentRandomAccessBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/fragment/MovieFragmentRandomAccessOffsetBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/fragment/MovieFragmentRandomAccessOffsetBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/fragment/MovieFragmentRandomAccessOffsetBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/fragment/MovieFragmentRandomAccessOffsetBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/fragment/SampleFlags.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/fragment/SampleFlags.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/fragment/SampleFlags.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/fragment/SampleFlags.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/fragment/TrackExtendsBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/fragment/TrackExtendsBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/fragment/TrackExtendsBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/fragment/TrackExtendsBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/fragment/TrackFragmentBaseMediaDecodeTimeBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/fragment/TrackFragmentBaseMediaDecodeTimeBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/fragment/TrackFragmentBaseMediaDecodeTimeBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/fragment/TrackFragmentBaseMediaDecodeTimeBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/fragment/TrackFragmentBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/fragment/TrackFragmentBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/fragment/TrackFragmentBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/fragment/TrackFragmentBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/fragment/TrackFragmentHeaderBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/fragment/TrackFragmentHeaderBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/fragment/TrackFragmentHeaderBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/fragment/TrackFragmentHeaderBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/fragment/TrackFragmentRandomAccessBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/fragment/TrackFragmentRandomAccessBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/fragment/TrackFragmentRandomAccessBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/fragment/TrackFragmentRandomAccessBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/fragment/TrackRunBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/fragment/TrackRunBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/fragment/TrackRunBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/fragment/TrackRunBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/h264/AvcConfigurationBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/h264/AvcConfigurationBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/h264/AvcConfigurationBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/h264/AvcConfigurationBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/mdat/DummyMap.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/mdat/DummyMap.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/mdat/DummyMap.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/mdat/DummyMap.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/mdat/MediaDataBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/mdat/MediaDataBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/mdat/MediaDataBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/mdat/MediaDataBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/mdat/SampleList.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/mdat/SampleList.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/mdat/SampleList.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/mdat/SampleList.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/mdat/Segment.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/mdat/Segment.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/mdat/Segment.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/mdat/Segment.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/odf-boxes.zip b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/odf-boxes.zip similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/odf-boxes.zip rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/odf-boxes.zip diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/rtp-boxes.zip b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/rtp-boxes.zip similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/rtp-boxes.zip rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/rtp-boxes.zip diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/sampleentry/AmrSpecificBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/sampleentry/AmrSpecificBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/sampleentry/AmrSpecificBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/sampleentry/AmrSpecificBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/sampleentry/AudioSampleEntry.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/sampleentry/AudioSampleEntry.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/sampleentry/AudioSampleEntry.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/sampleentry/AudioSampleEntry.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/sampleentry/MpegSampleEntry.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/sampleentry/MpegSampleEntry.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/sampleentry/MpegSampleEntry.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/sampleentry/MpegSampleEntry.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/sampleentry/Ovc1VisualSampleEntryImpl.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/sampleentry/Ovc1VisualSampleEntryImpl.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/sampleentry/Ovc1VisualSampleEntryImpl.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/sampleentry/Ovc1VisualSampleEntryImpl.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/sampleentry/SampleEntry.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/sampleentry/SampleEntry.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/sampleentry/SampleEntry.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/sampleentry/SampleEntry.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/sampleentry/SubtitleSampleEntry.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/sampleentry/SubtitleSampleEntry.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/sampleentry/SubtitleSampleEntry.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/sampleentry/SubtitleSampleEntry.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/sampleentry/TextSampleEntry.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/sampleentry/TextSampleEntry.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/sampleentry/TextSampleEntry.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/sampleentry/TextSampleEntry.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/sampleentry/VisualSampleEntry.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/sampleentry/VisualSampleEntry.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/sampleentry/VisualSampleEntry.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/sampleentry/VisualSampleEntry.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/threegpp26244/LocationInformationBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/threegpp26244/LocationInformationBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/threegpp26244/LocationInformationBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/threegpp26244/LocationInformationBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/vodafone/AlbumArtistBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/vodafone/AlbumArtistBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/vodafone/AlbumArtistBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/vodafone/AlbumArtistBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/vodafone/ContentDistributorIdBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/vodafone/ContentDistributorIdBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/vodafone/ContentDistributorIdBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/vodafone/ContentDistributorIdBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/vodafone/CoverUriBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/vodafone/CoverUriBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/vodafone/CoverUriBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/vodafone/CoverUriBox.java diff --git a/android-aac-enc/src/com/coremedia/iso/boxes/vodafone/LyricsUriBox.java b/android-aac-enc/src/main/java/com/coremedia/iso/boxes/vodafone/LyricsUriBox.java similarity index 100% rename from android-aac-enc/src/com/coremedia/iso/boxes/vodafone/LyricsUriBox.java rename to android-aac-enc/src/main/java/com/coremedia/iso/boxes/vodafone/LyricsUriBox.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/AbstractBox.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/AbstractBox.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/AbstractBox.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/AbstractBox.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/AbstractContainerBox.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/AbstractContainerBox.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/AbstractContainerBox.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/AbstractContainerBox.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/AbstractFullBox.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/AbstractFullBox.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/AbstractFullBox.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/AbstractFullBox.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/FullContainerBox.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/FullContainerBox.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/FullContainerBox.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/FullContainerBox.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/annotations/DoNotParseDetail.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/annotations/DoNotParseDetail.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/annotations/DoNotParseDetail.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/annotations/DoNotParseDetail.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/annotations/ParseDetail.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/annotations/ParseDetail.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/annotations/ParseDetail.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/annotations/ParseDetail.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/authoring/AbstractTrack.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/AbstractTrack.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/authoring/AbstractTrack.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/AbstractTrack.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/authoring/DateHelper.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/DateHelper.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/authoring/DateHelper.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/DateHelper.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/authoring/Movie.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/Movie.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/authoring/Movie.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/Movie.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/authoring/Mp4TrackImpl.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/Mp4TrackImpl.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/authoring/Mp4TrackImpl.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/Mp4TrackImpl.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/authoring/Track.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/Track.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/authoring/Track.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/Track.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/authoring/TrackMetaData.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/TrackMetaData.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/authoring/TrackMetaData.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/TrackMetaData.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/authoring/builder/ByteBufferHelper.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/builder/ByteBufferHelper.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/authoring/builder/ByteBufferHelper.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/builder/ByteBufferHelper.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/authoring/builder/DefaultMp4Builder.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/builder/DefaultMp4Builder.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/authoring/builder/DefaultMp4Builder.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/builder/DefaultMp4Builder.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/authoring/builder/FragmentIntersectionFinder.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/builder/FragmentIntersectionFinder.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/authoring/builder/FragmentIntersectionFinder.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/builder/FragmentIntersectionFinder.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/authoring/builder/FragmentedMp4Builder.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/builder/FragmentedMp4Builder.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/authoring/builder/FragmentedMp4Builder.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/builder/FragmentedMp4Builder.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/authoring/builder/Mp4Builder.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/builder/Mp4Builder.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/authoring/builder/Mp4Builder.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/builder/Mp4Builder.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/authoring/builder/SyncSampleIntersectFinderImpl.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/builder/SyncSampleIntersectFinderImpl.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/authoring/builder/SyncSampleIntersectFinderImpl.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/builder/SyncSampleIntersectFinderImpl.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/authoring/builder/TwoSecondIntersectionFinder.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/builder/TwoSecondIntersectionFinder.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/authoring/builder/TwoSecondIntersectionFinder.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/builder/TwoSecondIntersectionFinder.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/authoring/builder/smoothstreaming/AudioQuality.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/builder/smoothstreaming/AudioQuality.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/authoring/builder/smoothstreaming/AudioQuality.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/builder/smoothstreaming/AudioQuality.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/authoring/builder/smoothstreaming/ManifestWriter.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/builder/smoothstreaming/ManifestWriter.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/authoring/builder/smoothstreaming/ManifestWriter.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/builder/smoothstreaming/ManifestWriter.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/authoring/builder/smoothstreaming/PackageWriter.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/builder/smoothstreaming/PackageWriter.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/authoring/builder/smoothstreaming/PackageWriter.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/builder/smoothstreaming/PackageWriter.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/authoring/builder/smoothstreaming/VideoQuality.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/builder/smoothstreaming/VideoQuality.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/authoring/builder/smoothstreaming/VideoQuality.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/builder/smoothstreaming/VideoQuality.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/authoring/container/mp4/MovieCreator.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/container/mp4/MovieCreator.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/authoring/container/mp4/MovieCreator.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/container/mp4/MovieCreator.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/authoring/tracks/AACTrackImpl.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/tracks/AACTrackImpl.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/authoring/tracks/AACTrackImpl.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/tracks/AACTrackImpl.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/authoring/tracks/AC3TrackImpl.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/tracks/AC3TrackImpl.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/authoring/tracks/AC3TrackImpl.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/tracks/AC3TrackImpl.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/authoring/tracks/Amf0Track.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/tracks/Amf0Track.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/authoring/tracks/Amf0Track.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/tracks/Amf0Track.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/authoring/tracks/AppendTrack.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/tracks/AppendTrack.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/authoring/tracks/AppendTrack.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/tracks/AppendTrack.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/authoring/tracks/ChangeTimeScaleTrack.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/tracks/ChangeTimeScaleTrack.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/authoring/tracks/ChangeTimeScaleTrack.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/tracks/ChangeTimeScaleTrack.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/authoring/tracks/CroppedTrack.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/tracks/CroppedTrack.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/authoring/tracks/CroppedTrack.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/tracks/CroppedTrack.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/authoring/tracks/DivideTimeScaleTrack.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/tracks/DivideTimeScaleTrack.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/authoring/tracks/DivideTimeScaleTrack.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/tracks/DivideTimeScaleTrack.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/authoring/tracks/EC3TrackImpl.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/tracks/EC3TrackImpl.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/authoring/tracks/EC3TrackImpl.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/tracks/EC3TrackImpl.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/authoring/tracks/H264TrackImpl.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/tracks/H264TrackImpl.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/authoring/tracks/H264TrackImpl.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/tracks/H264TrackImpl.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/authoring/tracks/MultiplyTimeScaleTrack.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/tracks/MultiplyTimeScaleTrack.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/authoring/tracks/MultiplyTimeScaleTrack.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/tracks/MultiplyTimeScaleTrack.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/authoring/tracks/TextTrackImpl.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/tracks/TextTrackImpl.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/authoring/tracks/TextTrackImpl.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/authoring/tracks/TextTrackImpl.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/AC3SpecificBox.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/AC3SpecificBox.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/AC3SpecificBox.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/AC3SpecificBox.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/AbstractSampleEncryptionBox.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/AbstractSampleEncryptionBox.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/AbstractSampleEncryptionBox.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/AbstractSampleEncryptionBox.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/AbstractTrackEncryptionBox.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/AbstractTrackEncryptionBox.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/AbstractTrackEncryptionBox.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/AbstractTrackEncryptionBox.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/DTSSpecificBox.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/DTSSpecificBox.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/DTSSpecificBox.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/DTSSpecificBox.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/EC3SpecificBox.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/EC3SpecificBox.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/EC3SpecificBox.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/EC3SpecificBox.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/MLPSpecificBox.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/MLPSpecificBox.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/MLPSpecificBox.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/MLPSpecificBox.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/adobe/ActionMessageFormat0SampleEntryBox.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/adobe/ActionMessageFormat0SampleEntryBox.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/adobe/ActionMessageFormat0SampleEntryBox.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/adobe/ActionMessageFormat0SampleEntryBox.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/apple/TimeCodeBox.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/apple/TimeCodeBox.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/apple/TimeCodeBox.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/apple/TimeCodeBox.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/basemediaformat/AvcNalUnitStorageBox.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/basemediaformat/AvcNalUnitStorageBox.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/basemediaformat/AvcNalUnitStorageBox.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/basemediaformat/AvcNalUnitStorageBox.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/basemediaformat/SampleEncryptionBox.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/basemediaformat/SampleEncryptionBox.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/basemediaformat/SampleEncryptionBox.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/basemediaformat/SampleEncryptionBox.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/basemediaformat/TrackEncryptionBox.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/basemediaformat/TrackEncryptionBox.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/basemediaformat/TrackEncryptionBox.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/basemediaformat/TrackEncryptionBox.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4-boxes.zip b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4-boxes.zip similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4-boxes.zip rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4-boxes.zip diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/AbstractDescriptorBox.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/AbstractDescriptorBox.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/AbstractDescriptorBox.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/AbstractDescriptorBox.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/ESDescriptorBox.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/ESDescriptorBox.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/ESDescriptorBox.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/ESDescriptorBox.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/ObjectDescriptorBox.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/ObjectDescriptorBox.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/ObjectDescriptorBox.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/ObjectDescriptorBox.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/AudioSpecificConfig.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/AudioSpecificConfig.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/AudioSpecificConfig.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/AudioSpecificConfig.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/BaseDescriptor.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/BaseDescriptor.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/BaseDescriptor.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/BaseDescriptor.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/BitReaderBuffer.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/BitReaderBuffer.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/BitReaderBuffer.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/BitReaderBuffer.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/BitWriterBuffer.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/BitWriterBuffer.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/BitWriterBuffer.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/BitWriterBuffer.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/DecoderConfigDescriptor.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/DecoderConfigDescriptor.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/DecoderConfigDescriptor.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/DecoderConfigDescriptor.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/DecoderSpecificInfo.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/DecoderSpecificInfo.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/DecoderSpecificInfo.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/DecoderSpecificInfo.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/Descriptor.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/Descriptor.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/Descriptor.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/Descriptor.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/ESDescriptor.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/ESDescriptor.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/ESDescriptor.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/ESDescriptor.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/ExtensionDescriptor.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/ExtensionDescriptor.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/ExtensionDescriptor.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/ExtensionDescriptor.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/ExtensionProfileLevelDescriptor.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/ExtensionProfileLevelDescriptor.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/ExtensionProfileLevelDescriptor.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/ExtensionProfileLevelDescriptor.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/InitialObjectDescriptor.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/InitialObjectDescriptor.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/InitialObjectDescriptor.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/InitialObjectDescriptor.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/ObjectDescriptor.java_bak b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/ObjectDescriptor.java_bak similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/ObjectDescriptor.java_bak rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/ObjectDescriptor.java_bak diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/ObjectDescriptorBase.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/ObjectDescriptorBase.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/ObjectDescriptorBase.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/ObjectDescriptorBase.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/ObjectDescriptorFactory.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/ObjectDescriptorFactory.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/ObjectDescriptorFactory.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/ObjectDescriptorFactory.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/ProfileLevelIndicationDescriptor.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/ProfileLevelIndicationDescriptor.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/ProfileLevelIndicationDescriptor.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/ProfileLevelIndicationDescriptor.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/SLConfigDescriptor.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/SLConfigDescriptor.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/SLConfigDescriptor.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/SLConfigDescriptor.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/UnknownDescriptor.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/UnknownDescriptor.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/UnknownDescriptor.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/mp4/objectdescriptors/UnknownDescriptor.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/piff/PiffSampleEncryptionBox.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/piff/PiffSampleEncryptionBox.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/piff/PiffSampleEncryptionBox.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/piff/PiffSampleEncryptionBox.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/piff/PiffTrackEncryptionBox.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/piff/PiffTrackEncryptionBox.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/piff/PiffTrackEncryptionBox.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/piff/PiffTrackEncryptionBox.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/piff/PlayReadyHeader.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/piff/PlayReadyHeader.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/piff/PlayReadyHeader.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/piff/PlayReadyHeader.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/piff/ProtectionSpecificHeader.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/piff/ProtectionSpecificHeader.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/piff/ProtectionSpecificHeader.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/piff/ProtectionSpecificHeader.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/piff/TfrfBox.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/piff/TfrfBox.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/piff/TfrfBox.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/piff/TfrfBox.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/piff/TfxdBox.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/piff/TfxdBox.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/piff/TfxdBox.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/piff/TfxdBox.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/piff/UuidBasedProtectionSystemSpecificHeaderBox.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/piff/UuidBasedProtectionSystemSpecificHeaderBox.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/piff/UuidBasedProtectionSystemSpecificHeaderBox.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/piff/UuidBasedProtectionSystemSpecificHeaderBox.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/threegpp26245/FontTableBox.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/threegpp26245/FontTableBox.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/threegpp26245/FontTableBox.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/threegpp26245/FontTableBox.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/ultraviolet/AssetInformationBox.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/ultraviolet/AssetInformationBox.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/ultraviolet/AssetInformationBox.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/ultraviolet/AssetInformationBox.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/boxes/ultraviolet/BaseLocationBox.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/ultraviolet/BaseLocationBox.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/boxes/ultraviolet/BaseLocationBox.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/boxes/ultraviolet/BaseLocationBox.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/h264/BTree.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/h264/BTree.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/h264/BTree.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/h264/BTree.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/h264/CharCache.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/h264/CharCache.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/h264/CharCache.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/h264/CharCache.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/h264/Debug.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/h264/Debug.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/h264/Debug.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/h264/Debug.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/h264/model/AspectRatio.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/h264/model/AspectRatio.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/h264/model/AspectRatio.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/h264/model/AspectRatio.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/h264/model/BitstreamElement.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/h264/model/BitstreamElement.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/h264/model/BitstreamElement.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/h264/model/BitstreamElement.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/h264/model/ChromaFormat.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/h264/model/ChromaFormat.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/h264/model/ChromaFormat.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/h264/model/ChromaFormat.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/h264/model/HRDParameters.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/h264/model/HRDParameters.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/h264/model/HRDParameters.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/h264/model/HRDParameters.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/h264/model/PictureParameterSet.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/h264/model/PictureParameterSet.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/h264/model/PictureParameterSet.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/h264/model/PictureParameterSet.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/h264/model/ScalingList.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/h264/model/ScalingList.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/h264/model/ScalingList.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/h264/model/ScalingList.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/h264/model/ScalingMatrix.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/h264/model/ScalingMatrix.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/h264/model/ScalingMatrix.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/h264/model/ScalingMatrix.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/h264/model/SeqParameterSet.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/h264/model/SeqParameterSet.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/h264/model/SeqParameterSet.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/h264/model/SeqParameterSet.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/h264/model/VUIParameters.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/h264/model/VUIParameters.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/h264/model/VUIParameters.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/h264/model/VUIParameters.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/h264/read/BitstreamReader.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/h264/read/BitstreamReader.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/h264/read/BitstreamReader.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/h264/read/BitstreamReader.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/h264/read/CAVLCReader.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/h264/read/CAVLCReader.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/h264/read/CAVLCReader.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/h264/read/CAVLCReader.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/h264/write/BitstreamWriter.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/h264/write/BitstreamWriter.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/h264/write/BitstreamWriter.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/h264/write/BitstreamWriter.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/h264/write/CAVLCWriter.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/h264/write/CAVLCWriter.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/h264/write/CAVLCWriter.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/h264/write/CAVLCWriter.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/srt/SrtParser.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/srt/SrtParser.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/srt/SrtParser.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/srt/SrtParser.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/util/ByteBufferByteChannel.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/util/ByteBufferByteChannel.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/util/ByteBufferByteChannel.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/util/ByteBufferByteChannel.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/util/CastUtils.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/util/CastUtils.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/util/CastUtils.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/util/CastUtils.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/util/Math.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/util/Math.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/util/Math.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/util/Math.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/util/Path.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/util/Path.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/util/Path.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/util/Path.java diff --git a/android-aac-enc/src/com/googlecode/mp4parser/util/UUIDConverter.java b/android-aac-enc/src/main/java/com/googlecode/mp4parser/util/UUIDConverter.java similarity index 100% rename from android-aac-enc/src/com/googlecode/mp4parser/util/UUIDConverter.java rename to android-aac-enc/src/main/java/com/googlecode/mp4parser/util/UUIDConverter.java diff --git a/android-aac-enc/src/com/todoroo/aacenc/AACEncoder.java b/android-aac-enc/src/main/java/com/todoroo/aacenc/AACEncoder.java similarity index 100% rename from android-aac-enc/src/com/todoroo/aacenc/AACEncoder.java rename to android-aac-enc/src/main/java/com/todoroo/aacenc/AACEncoder.java diff --git a/android-aac-enc/src/com/todoroo/aacenc/AACRecorder.java b/android-aac-enc/src/main/java/com/todoroo/aacenc/AACRecorder.java similarity index 100% rename from android-aac-enc/src/com/todoroo/aacenc/AACRecorder.java rename to android-aac-enc/src/main/java/com/todoroo/aacenc/AACRecorder.java diff --git a/android-aac-enc/src/com/todoroo/aacenc/AACToM4A.java b/android-aac-enc/src/main/java/com/todoroo/aacenc/AACToM4A.java similarity index 100% rename from android-aac-enc/src/com/todoroo/aacenc/AACToM4A.java rename to android-aac-enc/src/main/java/com/todoroo/aacenc/AACToM4A.java diff --git a/android-aac-enc/src/com/todoroo/aacenc/ContextManager.java b/android-aac-enc/src/main/java/com/todoroo/aacenc/ContextManager.java similarity index 100% rename from android-aac-enc/src/com/todoroo/aacenc/ContextManager.java rename to android-aac-enc/src/main/java/com/todoroo/aacenc/ContextManager.java diff --git a/android-aac-enc/src/com/todoroo/aacenc/RecognizerApi.java b/android-aac-enc/src/main/java/com/todoroo/aacenc/RecognizerApi.java similarity index 100% rename from android-aac-enc/src/com/todoroo/aacenc/RecognizerApi.java rename to android-aac-enc/src/main/java/com/todoroo/aacenc/RecognizerApi.java diff --git a/android-aac-enc/res/drawable-hdpi/ic_launcher.png b/android-aac-enc/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from android-aac-enc/res/drawable-hdpi/ic_launcher.png rename to android-aac-enc/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/android-aac-enc/res/drawable-ldpi/ic_launcher.png b/android-aac-enc/src/main/res/drawable-ldpi/ic_launcher.png similarity index 100% rename from android-aac-enc/res/drawable-ldpi/ic_launcher.png rename to android-aac-enc/src/main/res/drawable-ldpi/ic_launcher.png diff --git a/android-aac-enc/res/drawable-mdpi/ic_launcher.png b/android-aac-enc/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from android-aac-enc/res/drawable-mdpi/ic_launcher.png rename to android-aac-enc/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/android-aac-enc/res/layout/main.xml b/android-aac-enc/src/main/res/layout/main.xml similarity index 100% rename from android-aac-enc/res/layout/main.xml rename to android-aac-enc/src/main/res/layout/main.xml diff --git a/android-aac-enc/res/raw/isoparser.properties b/android-aac-enc/src/main/res/raw/isoparser.properties similarity index 100% rename from android-aac-enc/res/raw/isoparser.properties rename to android-aac-enc/src/main/res/raw/isoparser.properties diff --git a/android-aac-enc/res/values/strings.xml b/android-aac-enc/src/main/res/values/strings.xml similarity index 100% rename from android-aac-enc/res/values/strings.xml rename to android-aac-enc/src/main/res/values/strings.xml diff --git a/api/api.iml b/api/api.iml index 9ef3aece7..033b717a1 100644 --- a/api/api.iml +++ b/api/api.iml @@ -1,21 +1,75 @@ - + + + + + + - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + diff --git a/api/build.gradle b/api/build.gradle new file mode 100644 index 000000000..f9c213af4 --- /dev/null +++ b/api/build.gradle @@ -0,0 +1,28 @@ +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:0.5.+' + } +} + +apply plugin: 'android-library' + +repositories { + mavenCentral() +} + +android { + compileSdkVersion 17 + buildToolsVersion "17.0.0" + + defaultConfig { + minSdkVersion 7 + targetSdkVersion 17 + } +} + +dependencies { + compile 'com.android.support:support-v4:18.0.0' +} diff --git a/api/AndroidManifest.xml b/api/src/main/AndroidManifest.xml similarity index 100% rename from api/AndroidManifest.xml rename to api/src/main/AndroidManifest.xml diff --git a/api/src/com/todoroo/andlib/data/AbstractDatabase.java b/api/src/main/java/com/todoroo/andlib/data/AbstractDatabase.java similarity index 100% rename from api/src/com/todoroo/andlib/data/AbstractDatabase.java rename to api/src/main/java/com/todoroo/andlib/data/AbstractDatabase.java diff --git a/api/src/com/todoroo/andlib/data/AbstractModel.java b/api/src/main/java/com/todoroo/andlib/data/AbstractModel.java similarity index 100% rename from api/src/com/todoroo/andlib/data/AbstractModel.java rename to api/src/main/java/com/todoroo/andlib/data/AbstractModel.java diff --git a/api/src/com/todoroo/andlib/data/ContentResolverDao.java b/api/src/main/java/com/todoroo/andlib/data/ContentResolverDao.java similarity index 100% rename from api/src/com/todoroo/andlib/data/ContentResolverDao.java rename to api/src/main/java/com/todoroo/andlib/data/ContentResolverDao.java diff --git a/api/src/com/todoroo/andlib/data/DatabaseDao.java b/api/src/main/java/com/todoroo/andlib/data/DatabaseDao.java similarity index 100% rename from api/src/com/todoroo/andlib/data/DatabaseDao.java rename to api/src/main/java/com/todoroo/andlib/data/DatabaseDao.java diff --git a/api/src/com/todoroo/andlib/data/Property.java b/api/src/main/java/com/todoroo/andlib/data/Property.java similarity index 100% rename from api/src/com/todoroo/andlib/data/Property.java rename to api/src/main/java/com/todoroo/andlib/data/Property.java diff --git a/api/src/com/todoroo/andlib/data/Table.java b/api/src/main/java/com/todoroo/andlib/data/Table.java similarity index 100% rename from api/src/com/todoroo/andlib/data/Table.java rename to api/src/main/java/com/todoroo/andlib/data/Table.java diff --git a/api/src/com/todoroo/andlib/data/TodorooCursor.java b/api/src/main/java/com/todoroo/andlib/data/TodorooCursor.java similarity index 100% rename from api/src/com/todoroo/andlib/data/TodorooCursor.java rename to api/src/main/java/com/todoroo/andlib/data/TodorooCursor.java diff --git a/api/src/com/todoroo/andlib/data/package-info.java b/api/src/main/java/com/todoroo/andlib/data/package-info.java similarity index 100% rename from api/src/com/todoroo/andlib/data/package-info.java rename to api/src/main/java/com/todoroo/andlib/data/package-info.java diff --git a/api/src/com/todoroo/andlib/service/AbstractDependencyInjector.java b/api/src/main/java/com/todoroo/andlib/service/AbstractDependencyInjector.java similarity index 100% rename from api/src/com/todoroo/andlib/service/AbstractDependencyInjector.java rename to api/src/main/java/com/todoroo/andlib/service/AbstractDependencyInjector.java diff --git a/api/src/com/todoroo/andlib/service/Autowired.java b/api/src/main/java/com/todoroo/andlib/service/Autowired.java similarity index 100% rename from api/src/com/todoroo/andlib/service/Autowired.java rename to api/src/main/java/com/todoroo/andlib/service/Autowired.java diff --git a/api/src/com/todoroo/andlib/service/ContextManager.java b/api/src/main/java/com/todoroo/andlib/service/ContextManager.java similarity index 100% rename from api/src/com/todoroo/andlib/service/ContextManager.java rename to api/src/main/java/com/todoroo/andlib/service/ContextManager.java diff --git a/api/src/com/todoroo/andlib/service/DependencyInjectionService.java b/api/src/main/java/com/todoroo/andlib/service/DependencyInjectionService.java similarity index 100% rename from api/src/com/todoroo/andlib/service/DependencyInjectionService.java rename to api/src/main/java/com/todoroo/andlib/service/DependencyInjectionService.java diff --git a/api/src/com/todoroo/andlib/service/ExceptionService.java b/api/src/main/java/com/todoroo/andlib/service/ExceptionService.java similarity index 100% rename from api/src/com/todoroo/andlib/service/ExceptionService.java rename to api/src/main/java/com/todoroo/andlib/service/ExceptionService.java diff --git a/api/src/com/todoroo/andlib/service/HttpErrorException.java b/api/src/main/java/com/todoroo/andlib/service/HttpErrorException.java similarity index 100% rename from api/src/com/todoroo/andlib/service/HttpErrorException.java rename to api/src/main/java/com/todoroo/andlib/service/HttpErrorException.java diff --git a/api/src/com/todoroo/andlib/service/HttpRestClient.java b/api/src/main/java/com/todoroo/andlib/service/HttpRestClient.java similarity index 100% rename from api/src/com/todoroo/andlib/service/HttpRestClient.java rename to api/src/main/java/com/todoroo/andlib/service/HttpRestClient.java diff --git a/api/src/com/todoroo/andlib/service/HttpUnavailableException.java b/api/src/main/java/com/todoroo/andlib/service/HttpUnavailableException.java similarity index 100% rename from api/src/com/todoroo/andlib/service/HttpUnavailableException.java rename to api/src/main/java/com/todoroo/andlib/service/HttpUnavailableException.java diff --git a/api/src/com/todoroo/andlib/service/NotificationManager.java b/api/src/main/java/com/todoroo/andlib/service/NotificationManager.java similarity index 100% rename from api/src/com/todoroo/andlib/service/NotificationManager.java rename to api/src/main/java/com/todoroo/andlib/service/NotificationManager.java diff --git a/api/src/com/todoroo/andlib/service/RestClient.java b/api/src/main/java/com/todoroo/andlib/service/RestClient.java similarity index 100% rename from api/src/com/todoroo/andlib/service/RestClient.java rename to api/src/main/java/com/todoroo/andlib/service/RestClient.java diff --git a/api/src/com/todoroo/andlib/service/package-info.java b/api/src/main/java/com/todoroo/andlib/service/package-info.java similarity index 100% rename from api/src/com/todoroo/andlib/service/package-info.java rename to api/src/main/java/com/todoroo/andlib/service/package-info.java diff --git a/api/src/com/todoroo/andlib/sql/Criterion.java b/api/src/main/java/com/todoroo/andlib/sql/Criterion.java similarity index 100% rename from api/src/com/todoroo/andlib/sql/Criterion.java rename to api/src/main/java/com/todoroo/andlib/sql/Criterion.java diff --git a/api/src/com/todoroo/andlib/sql/DBObject.java b/api/src/main/java/com/todoroo/andlib/sql/DBObject.java similarity index 100% rename from api/src/com/todoroo/andlib/sql/DBObject.java rename to api/src/main/java/com/todoroo/andlib/sql/DBObject.java diff --git a/api/src/com/todoroo/andlib/sql/EqCriterion.java b/api/src/main/java/com/todoroo/andlib/sql/EqCriterion.java similarity index 100% rename from api/src/com/todoroo/andlib/sql/EqCriterion.java rename to api/src/main/java/com/todoroo/andlib/sql/EqCriterion.java diff --git a/api/src/com/todoroo/andlib/sql/Field.java b/api/src/main/java/com/todoroo/andlib/sql/Field.java similarity index 100% rename from api/src/com/todoroo/andlib/sql/Field.java rename to api/src/main/java/com/todoroo/andlib/sql/Field.java diff --git a/api/src/com/todoroo/andlib/sql/Functions.java b/api/src/main/java/com/todoroo/andlib/sql/Functions.java similarity index 100% rename from api/src/com/todoroo/andlib/sql/Functions.java rename to api/src/main/java/com/todoroo/andlib/sql/Functions.java diff --git a/api/src/com/todoroo/andlib/sql/GroupBy.java b/api/src/main/java/com/todoroo/andlib/sql/GroupBy.java similarity index 100% rename from api/src/com/todoroo/andlib/sql/GroupBy.java rename to api/src/main/java/com/todoroo/andlib/sql/GroupBy.java diff --git a/api/src/com/todoroo/andlib/sql/Join.java b/api/src/main/java/com/todoroo/andlib/sql/Join.java similarity index 100% rename from api/src/com/todoroo/andlib/sql/Join.java rename to api/src/main/java/com/todoroo/andlib/sql/Join.java diff --git a/api/src/com/todoroo/andlib/sql/JoinType.java b/api/src/main/java/com/todoroo/andlib/sql/JoinType.java similarity index 100% rename from api/src/com/todoroo/andlib/sql/JoinType.java rename to api/src/main/java/com/todoroo/andlib/sql/JoinType.java diff --git a/api/src/com/todoroo/andlib/sql/Operator.java b/api/src/main/java/com/todoroo/andlib/sql/Operator.java similarity index 100% rename from api/src/com/todoroo/andlib/sql/Operator.java rename to api/src/main/java/com/todoroo/andlib/sql/Operator.java diff --git a/api/src/com/todoroo/andlib/sql/Order.java b/api/src/main/java/com/todoroo/andlib/sql/Order.java similarity index 100% rename from api/src/com/todoroo/andlib/sql/Order.java rename to api/src/main/java/com/todoroo/andlib/sql/Order.java diff --git a/api/src/com/todoroo/andlib/sql/OrderType.java b/api/src/main/java/com/todoroo/andlib/sql/OrderType.java similarity index 100% rename from api/src/com/todoroo/andlib/sql/OrderType.java rename to api/src/main/java/com/todoroo/andlib/sql/OrderType.java diff --git a/api/src/com/todoroo/andlib/sql/Query.java b/api/src/main/java/com/todoroo/andlib/sql/Query.java similarity index 100% rename from api/src/com/todoroo/andlib/sql/Query.java rename to api/src/main/java/com/todoroo/andlib/sql/Query.java diff --git a/api/src/com/todoroo/andlib/sql/QueryTemplate.java b/api/src/main/java/com/todoroo/andlib/sql/QueryTemplate.java similarity index 100% rename from api/src/com/todoroo/andlib/sql/QueryTemplate.java rename to api/src/main/java/com/todoroo/andlib/sql/QueryTemplate.java diff --git a/api/src/com/todoroo/andlib/sql/SqlConstants.java b/api/src/main/java/com/todoroo/andlib/sql/SqlConstants.java similarity index 100% rename from api/src/com/todoroo/andlib/sql/SqlConstants.java rename to api/src/main/java/com/todoroo/andlib/sql/SqlConstants.java diff --git a/api/src/com/todoroo/andlib/sql/SqlTable.java b/api/src/main/java/com/todoroo/andlib/sql/SqlTable.java similarity index 100% rename from api/src/com/todoroo/andlib/sql/SqlTable.java rename to api/src/main/java/com/todoroo/andlib/sql/SqlTable.java diff --git a/api/src/com/todoroo/andlib/sql/UnaryCriterion.java b/api/src/main/java/com/todoroo/andlib/sql/UnaryCriterion.java similarity index 100% rename from api/src/com/todoroo/andlib/sql/UnaryCriterion.java rename to api/src/main/java/com/todoroo/andlib/sql/UnaryCriterion.java diff --git a/api/src/com/todoroo/andlib/sql/package-info.java b/api/src/main/java/com/todoroo/andlib/sql/package-info.java similarity index 100% rename from api/src/com/todoroo/andlib/sql/package-info.java rename to api/src/main/java/com/todoroo/andlib/sql/package-info.java diff --git a/api/src/com/todoroo/andlib/utility/AndroidUtilities.java b/api/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java similarity index 100% rename from api/src/com/todoroo/andlib/utility/AndroidUtilities.java rename to api/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java diff --git a/api/src/com/todoroo/andlib/utility/DateUtilities.java b/api/src/main/java/com/todoroo/andlib/utility/DateUtilities.java similarity index 100% rename from api/src/com/todoroo/andlib/utility/DateUtilities.java rename to api/src/main/java/com/todoroo/andlib/utility/DateUtilities.java diff --git a/api/src/com/todoroo/andlib/utility/DialogUtilities.java b/api/src/main/java/com/todoroo/andlib/utility/DialogUtilities.java similarity index 100% rename from api/src/com/todoroo/andlib/utility/DialogUtilities.java rename to api/src/main/java/com/todoroo/andlib/utility/DialogUtilities.java diff --git a/api/src/com/todoroo/andlib/utility/Pair.java b/api/src/main/java/com/todoroo/andlib/utility/Pair.java similarity index 100% rename from api/src/com/todoroo/andlib/utility/Pair.java rename to api/src/main/java/com/todoroo/andlib/utility/Pair.java diff --git a/api/src/com/todoroo/andlib/utility/Preferences.java b/api/src/main/java/com/todoroo/andlib/utility/Preferences.java similarity index 100% rename from api/src/com/todoroo/andlib/utility/Preferences.java rename to api/src/main/java/com/todoroo/andlib/utility/Preferences.java diff --git a/api/src/com/todoroo/andlib/utility/TodorooPreferenceActivity.java b/api/src/main/java/com/todoroo/andlib/utility/TodorooPreferenceActivity.java similarity index 100% rename from api/src/com/todoroo/andlib/utility/TodorooPreferenceActivity.java rename to api/src/main/java/com/todoroo/andlib/utility/TodorooPreferenceActivity.java diff --git a/api/src/com/todoroo/andlib/utility/package-info.java b/api/src/main/java/com/todoroo/andlib/utility/package-info.java similarity index 100% rename from api/src/com/todoroo/andlib/utility/package-info.java rename to api/src/main/java/com/todoroo/andlib/utility/package-info.java diff --git a/api/src/com/todoroo/astrid/api/Addon.java b/api/src/main/java/com/todoroo/astrid/api/Addon.java similarity index 100% rename from api/src/com/todoroo/astrid/api/Addon.java rename to api/src/main/java/com/todoroo/astrid/api/Addon.java diff --git a/api/src/com/todoroo/astrid/api/AstridApiConstants.java b/api/src/main/java/com/todoroo/astrid/api/AstridApiConstants.java similarity index 100% rename from api/src/com/todoroo/astrid/api/AstridApiConstants.java rename to api/src/main/java/com/todoroo/astrid/api/AstridApiConstants.java diff --git a/api/src/com/todoroo/astrid/api/AstridFilterExposer.java b/api/src/main/java/com/todoroo/astrid/api/AstridFilterExposer.java similarity index 100% rename from api/src/com/todoroo/astrid/api/AstridFilterExposer.java rename to api/src/main/java/com/todoroo/astrid/api/AstridFilterExposer.java diff --git a/api/src/com/todoroo/astrid/api/CustomFilterCriterion.java b/api/src/main/java/com/todoroo/astrid/api/CustomFilterCriterion.java similarity index 100% rename from api/src/com/todoroo/astrid/api/CustomFilterCriterion.java rename to api/src/main/java/com/todoroo/astrid/api/CustomFilterCriterion.java diff --git a/api/src/com/todoroo/astrid/api/Filter.java b/api/src/main/java/com/todoroo/astrid/api/Filter.java similarity index 100% rename from api/src/com/todoroo/astrid/api/Filter.java rename to api/src/main/java/com/todoroo/astrid/api/Filter.java diff --git a/api/src/com/todoroo/astrid/api/FilterCategory.java b/api/src/main/java/com/todoroo/astrid/api/FilterCategory.java similarity index 100% rename from api/src/com/todoroo/astrid/api/FilterCategory.java rename to api/src/main/java/com/todoroo/astrid/api/FilterCategory.java diff --git a/api/src/com/todoroo/astrid/api/FilterCategoryWithNewButton.java b/api/src/main/java/com/todoroo/astrid/api/FilterCategoryWithNewButton.java similarity index 100% rename from api/src/com/todoroo/astrid/api/FilterCategoryWithNewButton.java rename to api/src/main/java/com/todoroo/astrid/api/FilterCategoryWithNewButton.java diff --git a/api/src/com/todoroo/astrid/api/FilterListHeader.java b/api/src/main/java/com/todoroo/astrid/api/FilterListHeader.java similarity index 100% rename from api/src/com/todoroo/astrid/api/FilterListHeader.java rename to api/src/main/java/com/todoroo/astrid/api/FilterListHeader.java diff --git a/api/src/com/todoroo/astrid/api/FilterListItem.java b/api/src/main/java/com/todoroo/astrid/api/FilterListItem.java similarity index 100% rename from api/src/com/todoroo/astrid/api/FilterListItem.java rename to api/src/main/java/com/todoroo/astrid/api/FilterListItem.java diff --git a/api/src/com/todoroo/astrid/api/FilterWithCustomIntent.java b/api/src/main/java/com/todoroo/astrid/api/FilterWithCustomIntent.java similarity index 100% rename from api/src/com/todoroo/astrid/api/FilterWithCustomIntent.java rename to api/src/main/java/com/todoroo/astrid/api/FilterWithCustomIntent.java diff --git a/api/src/com/todoroo/astrid/api/FilterWithUpdate.java b/api/src/main/java/com/todoroo/astrid/api/FilterWithUpdate.java similarity index 100% rename from api/src/com/todoroo/astrid/api/FilterWithUpdate.java rename to api/src/main/java/com/todoroo/astrid/api/FilterWithUpdate.java diff --git a/api/src/com/todoroo/astrid/api/IntentFilter.java b/api/src/main/java/com/todoroo/astrid/api/IntentFilter.java similarity index 100% rename from api/src/com/todoroo/astrid/api/IntentFilter.java rename to api/src/main/java/com/todoroo/astrid/api/IntentFilter.java diff --git a/api/src/com/todoroo/astrid/api/MultipleSelectCriterion.java b/api/src/main/java/com/todoroo/astrid/api/MultipleSelectCriterion.java similarity index 100% rename from api/src/com/todoroo/astrid/api/MultipleSelectCriterion.java rename to api/src/main/java/com/todoroo/astrid/api/MultipleSelectCriterion.java diff --git a/api/src/com/todoroo/astrid/api/PermaSql.java b/api/src/main/java/com/todoroo/astrid/api/PermaSql.java similarity index 100% rename from api/src/com/todoroo/astrid/api/PermaSql.java rename to api/src/main/java/com/todoroo/astrid/api/PermaSql.java diff --git a/api/src/com/todoroo/astrid/api/SyncAction.java b/api/src/main/java/com/todoroo/astrid/api/SyncAction.java similarity index 100% rename from api/src/com/todoroo/astrid/api/SyncAction.java rename to api/src/main/java/com/todoroo/astrid/api/SyncAction.java diff --git a/api/src/com/todoroo/astrid/api/TaskAction.java b/api/src/main/java/com/todoroo/astrid/api/TaskAction.java similarity index 100% rename from api/src/com/todoroo/astrid/api/TaskAction.java rename to api/src/main/java/com/todoroo/astrid/api/TaskAction.java diff --git a/api/src/com/todoroo/astrid/api/TaskDecoration.java b/api/src/main/java/com/todoroo/astrid/api/TaskDecoration.java similarity index 100% rename from api/src/com/todoroo/astrid/api/TaskDecoration.java rename to api/src/main/java/com/todoroo/astrid/api/TaskDecoration.java diff --git a/api/src/com/todoroo/astrid/api/TextInputCriterion.java b/api/src/main/java/com/todoroo/astrid/api/TextInputCriterion.java similarity index 100% rename from api/src/com/todoroo/astrid/api/TextInputCriterion.java rename to api/src/main/java/com/todoroo/astrid/api/TextInputCriterion.java diff --git a/api/src/com/todoroo/astrid/api/package-info.java b/api/src/main/java/com/todoroo/astrid/api/package-info.java similarity index 100% rename from api/src/com/todoroo/astrid/api/package-info.java rename to api/src/main/java/com/todoroo/astrid/api/package-info.java diff --git a/api/src/com/todoroo/astrid/core/SearchFilter.java b/api/src/main/java/com/todoroo/astrid/core/SearchFilter.java similarity index 100% rename from api/src/com/todoroo/astrid/core/SearchFilter.java rename to api/src/main/java/com/todoroo/astrid/core/SearchFilter.java diff --git a/api/src/com/todoroo/astrid/core/SortHelper.java b/api/src/main/java/com/todoroo/astrid/core/SortHelper.java similarity index 100% rename from api/src/com/todoroo/astrid/core/SortHelper.java rename to api/src/main/java/com/todoroo/astrid/core/SortHelper.java diff --git a/api/src/com/todoroo/astrid/data/History.java b/api/src/main/java/com/todoroo/astrid/data/History.java similarity index 100% rename from api/src/com/todoroo/astrid/data/History.java rename to api/src/main/java/com/todoroo/astrid/data/History.java diff --git a/api/src/com/todoroo/astrid/data/Metadata.java b/api/src/main/java/com/todoroo/astrid/data/Metadata.java similarity index 100% rename from api/src/com/todoroo/astrid/data/Metadata.java rename to api/src/main/java/com/todoroo/astrid/data/Metadata.java diff --git a/api/src/com/todoroo/astrid/data/MetadataApiDao.java b/api/src/main/java/com/todoroo/astrid/data/MetadataApiDao.java similarity index 100% rename from api/src/com/todoroo/astrid/data/MetadataApiDao.java rename to api/src/main/java/com/todoroo/astrid/data/MetadataApiDao.java diff --git a/api/src/com/todoroo/astrid/data/OutstandingEntry.java b/api/src/main/java/com/todoroo/astrid/data/OutstandingEntry.java similarity index 100% rename from api/src/com/todoroo/astrid/data/OutstandingEntry.java rename to api/src/main/java/com/todoroo/astrid/data/OutstandingEntry.java diff --git a/api/src/com/todoroo/astrid/data/RemoteModel.java b/api/src/main/java/com/todoroo/astrid/data/RemoteModel.java similarity index 100% rename from api/src/com/todoroo/astrid/data/RemoteModel.java rename to api/src/main/java/com/todoroo/astrid/data/RemoteModel.java diff --git a/api/src/com/todoroo/astrid/data/StoreObject.java b/api/src/main/java/com/todoroo/astrid/data/StoreObject.java similarity index 100% rename from api/src/com/todoroo/astrid/data/StoreObject.java rename to api/src/main/java/com/todoroo/astrid/data/StoreObject.java diff --git a/api/src/com/todoroo/astrid/data/StoreObjectApiDao.java b/api/src/main/java/com/todoroo/astrid/data/StoreObjectApiDao.java similarity index 100% rename from api/src/com/todoroo/astrid/data/StoreObjectApiDao.java rename to api/src/main/java/com/todoroo/astrid/data/StoreObjectApiDao.java diff --git a/api/src/com/todoroo/astrid/data/SyncFlags.java b/api/src/main/java/com/todoroo/astrid/data/SyncFlags.java similarity index 100% rename from api/src/com/todoroo/astrid/data/SyncFlags.java rename to api/src/main/java/com/todoroo/astrid/data/SyncFlags.java diff --git a/api/src/com/todoroo/astrid/data/TagData.java b/api/src/main/java/com/todoroo/astrid/data/TagData.java similarity index 100% rename from api/src/com/todoroo/astrid/data/TagData.java rename to api/src/main/java/com/todoroo/astrid/data/TagData.java diff --git a/api/src/com/todoroo/astrid/data/TagMetadata.java b/api/src/main/java/com/todoroo/astrid/data/TagMetadata.java similarity index 100% rename from api/src/com/todoroo/astrid/data/TagMetadata.java rename to api/src/main/java/com/todoroo/astrid/data/TagMetadata.java diff --git a/api/src/com/todoroo/astrid/data/TagOutstanding.java b/api/src/main/java/com/todoroo/astrid/data/TagOutstanding.java similarity index 100% rename from api/src/com/todoroo/astrid/data/TagOutstanding.java rename to api/src/main/java/com/todoroo/astrid/data/TagOutstanding.java diff --git a/api/src/com/todoroo/astrid/data/Task.java b/api/src/main/java/com/todoroo/astrid/data/Task.java similarity index 100% rename from api/src/com/todoroo/astrid/data/Task.java rename to api/src/main/java/com/todoroo/astrid/data/Task.java diff --git a/api/src/com/todoroo/astrid/data/TaskApiDao.java b/api/src/main/java/com/todoroo/astrid/data/TaskApiDao.java similarity index 100% rename from api/src/com/todoroo/astrid/data/TaskApiDao.java rename to api/src/main/java/com/todoroo/astrid/data/TaskApiDao.java diff --git a/api/src/com/todoroo/astrid/data/TaskAttachment.java b/api/src/main/java/com/todoroo/astrid/data/TaskAttachment.java similarity index 100% rename from api/src/com/todoroo/astrid/data/TaskAttachment.java rename to api/src/main/java/com/todoroo/astrid/data/TaskAttachment.java diff --git a/api/src/com/todoroo/astrid/data/TaskAttachmentOutstanding.java b/api/src/main/java/com/todoroo/astrid/data/TaskAttachmentOutstanding.java similarity index 100% rename from api/src/com/todoroo/astrid/data/TaskAttachmentOutstanding.java rename to api/src/main/java/com/todoroo/astrid/data/TaskAttachmentOutstanding.java diff --git a/api/src/com/todoroo/astrid/data/TaskListMetadata.java b/api/src/main/java/com/todoroo/astrid/data/TaskListMetadata.java similarity index 100% rename from api/src/com/todoroo/astrid/data/TaskListMetadata.java rename to api/src/main/java/com/todoroo/astrid/data/TaskListMetadata.java diff --git a/api/src/com/todoroo/astrid/data/TaskListMetadataOutstanding.java b/api/src/main/java/com/todoroo/astrid/data/TaskListMetadataOutstanding.java similarity index 100% rename from api/src/com/todoroo/astrid/data/TaskListMetadataOutstanding.java rename to api/src/main/java/com/todoroo/astrid/data/TaskListMetadataOutstanding.java diff --git a/api/src/com/todoroo/astrid/data/TaskOutstanding.java b/api/src/main/java/com/todoroo/astrid/data/TaskOutstanding.java similarity index 100% rename from api/src/com/todoroo/astrid/data/TaskOutstanding.java rename to api/src/main/java/com/todoroo/astrid/data/TaskOutstanding.java diff --git a/api/src/com/todoroo/astrid/data/Update.java b/api/src/main/java/com/todoroo/astrid/data/Update.java similarity index 100% rename from api/src/com/todoroo/astrid/data/Update.java rename to api/src/main/java/com/todoroo/astrid/data/Update.java diff --git a/api/src/com/todoroo/astrid/data/User.java b/api/src/main/java/com/todoroo/astrid/data/User.java similarity index 100% rename from api/src/com/todoroo/astrid/data/User.java rename to api/src/main/java/com/todoroo/astrid/data/User.java diff --git a/api/src/com/todoroo/astrid/data/UserActivity.java b/api/src/main/java/com/todoroo/astrid/data/UserActivity.java similarity index 100% rename from api/src/com/todoroo/astrid/data/UserActivity.java rename to api/src/main/java/com/todoroo/astrid/data/UserActivity.java diff --git a/api/src/com/todoroo/astrid/data/UserActivityOutstanding.java b/api/src/main/java/com/todoroo/astrid/data/UserActivityOutstanding.java similarity index 100% rename from api/src/com/todoroo/astrid/data/UserActivityOutstanding.java rename to api/src/main/java/com/todoroo/astrid/data/UserActivityOutstanding.java diff --git a/api/src/com/todoroo/astrid/data/package-info.java b/api/src/main/java/com/todoroo/astrid/data/package-info.java similarity index 100% rename from api/src/com/todoroo/astrid/data/package-info.java rename to api/src/main/java/com/todoroo/astrid/data/package-info.java diff --git a/api/src/com/todoroo/astrid/sync/SyncBackgroundService.java b/api/src/main/java/com/todoroo/astrid/sync/SyncBackgroundService.java similarity index 100% rename from api/src/com/todoroo/astrid/sync/SyncBackgroundService.java rename to api/src/main/java/com/todoroo/astrid/sync/SyncBackgroundService.java diff --git a/api/src/com/todoroo/astrid/sync/SyncContainer.java b/api/src/main/java/com/todoroo/astrid/sync/SyncContainer.java similarity index 100% rename from api/src/com/todoroo/astrid/sync/SyncContainer.java rename to api/src/main/java/com/todoroo/astrid/sync/SyncContainer.java diff --git a/api/src/com/todoroo/astrid/sync/SyncProvider.java b/api/src/main/java/com/todoroo/astrid/sync/SyncProvider.java similarity index 100% rename from api/src/com/todoroo/astrid/sync/SyncProvider.java rename to api/src/main/java/com/todoroo/astrid/sync/SyncProvider.java diff --git a/api/src/com/todoroo/astrid/sync/SyncProviderPreferences.java b/api/src/main/java/com/todoroo/astrid/sync/SyncProviderPreferences.java similarity index 100% rename from api/src/com/todoroo/astrid/sync/SyncProviderPreferences.java rename to api/src/main/java/com/todoroo/astrid/sync/SyncProviderPreferences.java diff --git a/api/src/com/todoroo/astrid/sync/SyncProviderUtilities.java b/api/src/main/java/com/todoroo/astrid/sync/SyncProviderUtilities.java similarity index 100% rename from api/src/com/todoroo/astrid/sync/SyncProviderUtilities.java rename to api/src/main/java/com/todoroo/astrid/sync/SyncProviderUtilities.java diff --git a/api/src/com/todoroo/astrid/sync/SyncResultCallback.java b/api/src/main/java/com/todoroo/astrid/sync/SyncResultCallback.java similarity index 100% rename from api/src/com/todoroo/astrid/sync/SyncResultCallback.java rename to api/src/main/java/com/todoroo/astrid/sync/SyncResultCallback.java diff --git a/api/src/com/todoroo/astrid/sync/SyncResultCallbackAdapter.java b/api/src/main/java/com/todoroo/astrid/sync/SyncResultCallbackAdapter.java similarity index 100% rename from api/src/com/todoroo/astrid/sync/SyncResultCallbackAdapter.java rename to api/src/main/java/com/todoroo/astrid/sync/SyncResultCallbackAdapter.java diff --git a/api/src/com/todoroo/astrid/sync/SyncV2BackgroundService.java b/api/src/main/java/com/todoroo/astrid/sync/SyncV2BackgroundService.java similarity index 100% rename from api/src/com/todoroo/astrid/sync/SyncV2BackgroundService.java rename to api/src/main/java/com/todoroo/astrid/sync/SyncV2BackgroundService.java diff --git a/api/src/com/todoroo/astrid/sync/SyncV2Provider.java b/api/src/main/java/com/todoroo/astrid/sync/SyncV2Provider.java similarity index 100% rename from api/src/com/todoroo/astrid/sync/SyncV2Provider.java rename to api/src/main/java/com/todoroo/astrid/sync/SyncV2Provider.java diff --git a/api/src/com/todoroo/astrid/sync/package-info.java b/api/src/main/java/com/todoroo/astrid/sync/package-info.java similarity index 100% rename from api/src/com/todoroo/astrid/sync/package-info.java rename to api/src/main/java/com/todoroo/astrid/sync/package-info.java diff --git a/api/res/drawable/image_placeholder.png b/api/src/main/res/drawable/image_placeholder.png similarity index 100% rename from api/res/drawable/image_placeholder.png rename to api/src/main/res/drawable/image_placeholder.png diff --git a/api/res/layout/status_preference.xml b/api/src/main/res/layout/status_preference.xml similarity index 100% rename from api/res/layout/status_preference.xml rename to api/src/main/res/layout/status_preference.xml diff --git a/api/res/values-ca/strings.xml b/api/src/main/res/values-ca/strings.xml similarity index 100% rename from api/res/values-ca/strings.xml rename to api/src/main/res/values-ca/strings.xml diff --git a/api/res/values-cs/strings.xml b/api/src/main/res/values-cs/strings.xml similarity index 100% rename from api/res/values-cs/strings.xml rename to api/src/main/res/values-cs/strings.xml diff --git a/api/res/values-da/strings.xml b/api/src/main/res/values-da/strings.xml similarity index 100% rename from api/res/values-da/strings.xml rename to api/src/main/res/values-da/strings.xml diff --git a/api/res/values-de/strings.xml b/api/src/main/res/values-de/strings.xml similarity index 100% rename from api/res/values-de/strings.xml rename to api/src/main/res/values-de/strings.xml diff --git a/api/res/values-es/strings.xml b/api/src/main/res/values-es/strings.xml similarity index 100% rename from api/res/values-es/strings.xml rename to api/src/main/res/values-es/strings.xml diff --git a/api/res/values-fr/strings.xml b/api/src/main/res/values-fr/strings.xml similarity index 100% rename from api/res/values-fr/strings.xml rename to api/src/main/res/values-fr/strings.xml diff --git a/api/res/values-it/strings.xml b/api/src/main/res/values-it/strings.xml similarity index 100% rename from api/res/values-it/strings.xml rename to api/src/main/res/values-it/strings.xml diff --git a/api/res/values-iw/strings.xml b/api/src/main/res/values-iw/strings.xml similarity index 100% rename from api/res/values-iw/strings.xml rename to api/src/main/res/values-iw/strings.xml diff --git a/api/res/values-ja/strings.xml b/api/src/main/res/values-ja/strings.xml similarity index 100% rename from api/res/values-ja/strings.xml rename to api/src/main/res/values-ja/strings.xml diff --git a/api/res/values-ko/strings.xml b/api/src/main/res/values-ko/strings.xml similarity index 100% rename from api/res/values-ko/strings.xml rename to api/src/main/res/values-ko/strings.xml diff --git a/api/res/values-nb/strings.xml b/api/src/main/res/values-nb/strings.xml similarity index 100% rename from api/res/values-nb/strings.xml rename to api/src/main/res/values-nb/strings.xml diff --git a/api/res/values-nl/strings.xml b/api/src/main/res/values-nl/strings.xml similarity index 100% rename from api/res/values-nl/strings.xml rename to api/src/main/res/values-nl/strings.xml diff --git a/api/res/values-pl/strings.xml b/api/src/main/res/values-pl/strings.xml similarity index 100% rename from api/res/values-pl/strings.xml rename to api/src/main/res/values-pl/strings.xml diff --git a/api/res/values-pt-rBR/strings.xml b/api/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from api/res/values-pt-rBR/strings.xml rename to api/src/main/res/values-pt-rBR/strings.xml diff --git a/api/res/values-pt/strings.xml b/api/src/main/res/values-pt/strings.xml similarity index 100% rename from api/res/values-pt/strings.xml rename to api/src/main/res/values-pt/strings.xml diff --git a/api/res/values-ru/strings.xml b/api/src/main/res/values-ru/strings.xml similarity index 100% rename from api/res/values-ru/strings.xml rename to api/src/main/res/values-ru/strings.xml diff --git a/api/res/values-sv/strings.xml b/api/src/main/res/values-sv/strings.xml similarity index 100% rename from api/res/values-sv/strings.xml rename to api/src/main/res/values-sv/strings.xml diff --git a/api/res/values-th/strings.xml b/api/src/main/res/values-th/strings.xml similarity index 100% rename from api/res/values-th/strings.xml rename to api/src/main/res/values-th/strings.xml diff --git a/api/res/values-tr/strings.xml b/api/src/main/res/values-tr/strings.xml similarity index 100% rename from api/res/values-tr/strings.xml rename to api/src/main/res/values-tr/strings.xml diff --git a/api/res/values-zh-rCN/strings.xml b/api/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from api/res/values-zh-rCN/strings.xml rename to api/src/main/res/values-zh-rCN/strings.xml diff --git a/api/res/values-zh-rTW/strings.xml b/api/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from api/res/values-zh-rTW/strings.xml rename to api/src/main/res/values-zh-rTW/strings.xml diff --git a/api/res/values/colors.xml b/api/src/main/res/values/colors.xml similarity index 100% rename from api/res/values/colors.xml rename to api/src/main/res/values/colors.xml diff --git a/api/res/values/keys.xml b/api/src/main/res/values/keys.xml similarity index 100% rename from api/res/values/keys.xml rename to api/src/main/res/values/keys.xml diff --git a/api/res/values/strings.xml b/api/src/main/res/values/strings.xml similarity index 100% rename from api/res/values/strings.xml rename to api/src/main/res/values/strings.xml diff --git a/astrid.iml b/astrid.iml new file mode 100644 index 000000000..e132f0991 --- /dev/null +++ b/astrid.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/astrid/astrid.iml b/astrid/astrid.iml index a2dceede8..cbe5febe1 100644 --- a/astrid/astrid.iml +++ b/astrid/astrid.iml @@ -3,42 +3,98 @@ + + + + + - + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - + + + - - - - - - - - - - + + + + + + + + + + + - + + + + + + + + diff --git a/astrid/build.gradle b/astrid/build.gradle new file mode 100644 index 000000000..0ba875b9d --- /dev/null +++ b/astrid/build.gradle @@ -0,0 +1,32 @@ +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:0.5.+' + } +} + +apply plugin: 'android' + +repositories { + mavenCentral() +} + +android { + compileSdkVersion 17 + buildToolsVersion "17.0.0" + + defaultConfig { + minSdkVersion 7 + targetSdkVersion 17 + } +} + +dependencies { + compile 'com.android.support:support-v4:18.0.0' + compile project(":android-aac-enc") + compile project(":greendroid") + compile project(":api") + compile fileTree(dir: "../libs", includes: ["*.jar"]) +} diff --git a/astrid/project.properties b/astrid/project.properties index 0b87ecf9b..0ab2fc935 100644 --- a/astrid/project.properties +++ b/astrid/project.properties @@ -12,7 +12,6 @@ split.density=false # Project target. target=android-17 apk-configurations= -android.library.reference.1=../greendroid/GreenDroid -android.library.reference.2=../actionbarsherlock/library +android.library.reference.1=../android-aac-enc +android.library.reference.2=../greendroid android.library.reference.3=../api -android.library.reference.4=../android-aac-enc diff --git a/astrid/res/values-ru/strings-opencrx.xml b/astrid/res/values-ru/strings-opencrx.xml deleted file mode 100644 index 550628e25..000000000 --- a/astrid/res/values-ru/strings-opencrx.xml +++ /dev/null @@ -1,146 +0,0 @@ - - - - - - - - OpenCRX - - - Создатели деятельности - - - Ответственный - - - Ответственный \'%s\' - - - от %s - - - Добавить комментарий - - - - - OpenCRX - - - Не синхронизировать - - - Создатель деятельности по умолчанию - - - Добавлять новые задачи в %s - - - Новые задачи не будут синхонизированы по умолчанию - - - Адрес OpenCRX - - - Адрес - - - Адрес OpenCRX - - - Например: mydomain.com/opencrx-rest-CRX - - - Сегмент - - - Синхронизируемый сегмент - - - Например: Standard - - - Standard - - - Provider - - - OpenCRX data provider - - - Например: CRX - - - CRX - - - - - - Войти в OpenCRX - - - Войдите в OpenCRX, используя существующую учётную запись! - - - Войти - - - Имя пользователя - - - Пароль - - - Ошибка: заполните все поля! - - - Ошибка: неправильное имя пользователя или пароль! - - - - - OpenCRX - - - %s задач обновлено / кликните для подробностей - - - Ошибка соединения! Проверьте подключение к интернету. - - - Не указано имя пользователя! - - - Не указан пароль! - - - - - Назначить эту задачу этому человеку: - - - <Без назначения> - - - Назначить эту задачу этому создателю деятельности: - - - <По умолчанию> - - в среде: ? - - в среде... - - Присвоено: ? - - Присвоено ... - - - diff --git a/astrid/AndroidManifest.xml b/astrid/src/main/AndroidManifest.xml similarity index 100% rename from astrid/AndroidManifest.xml rename to astrid/src/main/AndroidManifest.xml diff --git a/astrid/src/com/commonsware/cwac/merge/MergeAdapter.java b/astrid/src/main/java/com/commonsware/cwac/merge/MergeAdapter.java similarity index 100% rename from astrid/src/com/commonsware/cwac/merge/MergeAdapter.java rename to astrid/src/main/java/com/commonsware/cwac/merge/MergeAdapter.java diff --git a/astrid/src/com/commonsware/cwac/merge/MergeSpinnerAdapter.java b/astrid/src/main/java/com/commonsware/cwac/merge/MergeSpinnerAdapter.java similarity index 100% rename from astrid/src/com/commonsware/cwac/merge/MergeSpinnerAdapter.java rename to astrid/src/main/java/com/commonsware/cwac/merge/MergeSpinnerAdapter.java diff --git a/astrid/src/com/commonsware/cwac/tlv/TouchListView.java b/astrid/src/main/java/com/commonsware/cwac/tlv/TouchListView.java similarity index 100% rename from astrid/src/com/commonsware/cwac/tlv/TouchListView.java rename to astrid/src/main/java/com/commonsware/cwac/tlv/TouchListView.java diff --git a/astrid/src/com/mdimension/jchronic/AstridChronic.java b/astrid/src/main/java/com/mdimension/jchronic/AstridChronic.java similarity index 100% rename from astrid/src/com/mdimension/jchronic/AstridChronic.java rename to astrid/src/main/java/com/mdimension/jchronic/AstridChronic.java diff --git a/astrid/src/com/timsu/astrid/activities/TaskList.java b/astrid/src/main/java/com/timsu/astrid/activities/TaskList.java similarity index 100% rename from astrid/src/com/timsu/astrid/activities/TaskList.java rename to astrid/src/main/java/com/timsu/astrid/activities/TaskList.java diff --git a/astrid/src/com/timsu/astrid/data/Identifier.java b/astrid/src/main/java/com/timsu/astrid/data/Identifier.java similarity index 100% rename from astrid/src/com/timsu/astrid/data/Identifier.java rename to astrid/src/main/java/com/timsu/astrid/data/Identifier.java diff --git a/astrid/src/com/timsu/astrid/data/LegacyAbstractController.java b/astrid/src/main/java/com/timsu/astrid/data/LegacyAbstractController.java similarity index 100% rename from astrid/src/com/timsu/astrid/data/LegacyAbstractController.java rename to astrid/src/main/java/com/timsu/astrid/data/LegacyAbstractController.java diff --git a/astrid/src/com/timsu/astrid/data/LegacyAbstractModel.java b/astrid/src/main/java/com/timsu/astrid/data/LegacyAbstractModel.java similarity index 100% rename from astrid/src/com/timsu/astrid/data/LegacyAbstractModel.java rename to astrid/src/main/java/com/timsu/astrid/data/LegacyAbstractModel.java diff --git a/astrid/src/com/timsu/astrid/data/alerts/Alert.java b/astrid/src/main/java/com/timsu/astrid/data/alerts/Alert.java similarity index 100% rename from astrid/src/com/timsu/astrid/data/alerts/Alert.java rename to astrid/src/main/java/com/timsu/astrid/data/alerts/Alert.java diff --git a/astrid/src/com/timsu/astrid/data/alerts/AlertController.java b/astrid/src/main/java/com/timsu/astrid/data/alerts/AlertController.java similarity index 100% rename from astrid/src/com/timsu/astrid/data/alerts/AlertController.java rename to astrid/src/main/java/com/timsu/astrid/data/alerts/AlertController.java diff --git a/astrid/src/com/timsu/astrid/data/enums/Importance.java b/astrid/src/main/java/com/timsu/astrid/data/enums/Importance.java similarity index 100% rename from astrid/src/com/timsu/astrid/data/enums/Importance.java rename to astrid/src/main/java/com/timsu/astrid/data/enums/Importance.java diff --git a/astrid/src/com/timsu/astrid/data/enums/RepeatInterval.java b/astrid/src/main/java/com/timsu/astrid/data/enums/RepeatInterval.java similarity index 100% rename from astrid/src/com/timsu/astrid/data/enums/RepeatInterval.java rename to astrid/src/main/java/com/timsu/astrid/data/enums/RepeatInterval.java diff --git a/astrid/src/com/timsu/astrid/data/location/GeoPoint.java b/astrid/src/main/java/com/timsu/astrid/data/location/GeoPoint.java similarity index 100% rename from astrid/src/com/timsu/astrid/data/location/GeoPoint.java rename to astrid/src/main/java/com/timsu/astrid/data/location/GeoPoint.java diff --git a/astrid/src/com/timsu/astrid/data/sync/SyncDataController.java b/astrid/src/main/java/com/timsu/astrid/data/sync/SyncDataController.java similarity index 100% rename from astrid/src/com/timsu/astrid/data/sync/SyncDataController.java rename to astrid/src/main/java/com/timsu/astrid/data/sync/SyncDataController.java diff --git a/astrid/src/com/timsu/astrid/data/sync/SyncMapping.java b/astrid/src/main/java/com/timsu/astrid/data/sync/SyncMapping.java similarity index 100% rename from astrid/src/com/timsu/astrid/data/sync/SyncMapping.java rename to astrid/src/main/java/com/timsu/astrid/data/sync/SyncMapping.java diff --git a/astrid/src/com/timsu/astrid/data/tag/AbstractTagModel.java b/astrid/src/main/java/com/timsu/astrid/data/tag/AbstractTagModel.java similarity index 100% rename from astrid/src/com/timsu/astrid/data/tag/AbstractTagModel.java rename to astrid/src/main/java/com/timsu/astrid/data/tag/AbstractTagModel.java diff --git a/astrid/src/com/timsu/astrid/data/tag/TagController.java b/astrid/src/main/java/com/timsu/astrid/data/tag/TagController.java similarity index 100% rename from astrid/src/com/timsu/astrid/data/tag/TagController.java rename to astrid/src/main/java/com/timsu/astrid/data/tag/TagController.java diff --git a/astrid/src/com/timsu/astrid/data/tag/TagIdentifier.java b/astrid/src/main/java/com/timsu/astrid/data/tag/TagIdentifier.java similarity index 100% rename from astrid/src/com/timsu/astrid/data/tag/TagIdentifier.java rename to astrid/src/main/java/com/timsu/astrid/data/tag/TagIdentifier.java diff --git a/astrid/src/com/timsu/astrid/data/tag/TagModelForView.java b/astrid/src/main/java/com/timsu/astrid/data/tag/TagModelForView.java similarity index 100% rename from astrid/src/com/timsu/astrid/data/tag/TagModelForView.java rename to astrid/src/main/java/com/timsu/astrid/data/tag/TagModelForView.java diff --git a/astrid/src/com/timsu/astrid/data/tag/TagToTaskMapping.java b/astrid/src/main/java/com/timsu/astrid/data/tag/TagToTaskMapping.java similarity index 100% rename from astrid/src/com/timsu/astrid/data/tag/TagToTaskMapping.java rename to astrid/src/main/java/com/timsu/astrid/data/tag/TagToTaskMapping.java diff --git a/astrid/src/com/timsu/astrid/data/task/AbstractTaskModel.java b/astrid/src/main/java/com/timsu/astrid/data/task/AbstractTaskModel.java similarity index 100% rename from astrid/src/com/timsu/astrid/data/task/AbstractTaskModel.java rename to astrid/src/main/java/com/timsu/astrid/data/task/AbstractTaskModel.java diff --git a/astrid/src/com/timsu/astrid/data/task/TaskController.java b/astrid/src/main/java/com/timsu/astrid/data/task/TaskController.java similarity index 100% rename from astrid/src/com/timsu/astrid/data/task/TaskController.java rename to astrid/src/main/java/com/timsu/astrid/data/task/TaskController.java diff --git a/astrid/src/com/timsu/astrid/data/task/TaskIdentifier.java b/astrid/src/main/java/com/timsu/astrid/data/task/TaskIdentifier.java similarity index 100% rename from astrid/src/com/timsu/astrid/data/task/TaskIdentifier.java rename to astrid/src/main/java/com/timsu/astrid/data/task/TaskIdentifier.java diff --git a/astrid/src/com/timsu/astrid/data/task/TaskModelForEdit.java b/astrid/src/main/java/com/timsu/astrid/data/task/TaskModelForEdit.java similarity index 100% rename from astrid/src/com/timsu/astrid/data/task/TaskModelForEdit.java rename to astrid/src/main/java/com/timsu/astrid/data/task/TaskModelForEdit.java diff --git a/astrid/src/com/timsu/astrid/data/task/TaskModelForHandlers.java b/astrid/src/main/java/com/timsu/astrid/data/task/TaskModelForHandlers.java similarity index 100% rename from astrid/src/com/timsu/astrid/data/task/TaskModelForHandlers.java rename to astrid/src/main/java/com/timsu/astrid/data/task/TaskModelForHandlers.java diff --git a/astrid/src/com/timsu/astrid/data/task/TaskModelForList.java b/astrid/src/main/java/com/timsu/astrid/data/task/TaskModelForList.java similarity index 100% rename from astrid/src/com/timsu/astrid/data/task/TaskModelForList.java rename to astrid/src/main/java/com/timsu/astrid/data/task/TaskModelForList.java diff --git a/astrid/src/com/timsu/astrid/data/task/TaskModelForNotify.java b/astrid/src/main/java/com/timsu/astrid/data/task/TaskModelForNotify.java similarity index 100% rename from astrid/src/com/timsu/astrid/data/task/TaskModelForNotify.java rename to astrid/src/main/java/com/timsu/astrid/data/task/TaskModelForNotify.java diff --git a/astrid/src/com/timsu/astrid/data/task/TaskModelForProvider.java b/astrid/src/main/java/com/timsu/astrid/data/task/TaskModelForProvider.java similarity index 100% rename from astrid/src/com/timsu/astrid/data/task/TaskModelForProvider.java rename to astrid/src/main/java/com/timsu/astrid/data/task/TaskModelForProvider.java diff --git a/astrid/src/com/timsu/astrid/data/task/TaskModelForReminder.java b/astrid/src/main/java/com/timsu/astrid/data/task/TaskModelForReminder.java similarity index 100% rename from astrid/src/com/timsu/astrid/data/task/TaskModelForReminder.java rename to astrid/src/main/java/com/timsu/astrid/data/task/TaskModelForReminder.java diff --git a/astrid/src/com/timsu/astrid/data/task/TaskModelForSync.java b/astrid/src/main/java/com/timsu/astrid/data/task/TaskModelForSync.java similarity index 100% rename from astrid/src/com/timsu/astrid/data/task/TaskModelForSync.java rename to astrid/src/main/java/com/timsu/astrid/data/task/TaskModelForSync.java diff --git a/astrid/src/com/timsu/astrid/data/task/TaskModelForWidget.java b/astrid/src/main/java/com/timsu/astrid/data/task/TaskModelForWidget.java similarity index 100% rename from astrid/src/com/timsu/astrid/data/task/TaskModelForWidget.java rename to astrid/src/main/java/com/timsu/astrid/data/task/TaskModelForWidget.java diff --git a/astrid/src/com/timsu/astrid/data/task/TaskModelForXml.java b/astrid/src/main/java/com/timsu/astrid/data/task/TaskModelForXml.java similarity index 100% rename from astrid/src/com/timsu/astrid/data/task/TaskModelForXml.java rename to astrid/src/main/java/com/timsu/astrid/data/task/TaskModelForXml.java diff --git a/astrid/src/com/timsu/astrid/utilities/LegacyTasksXmlExporter.java b/astrid/src/main/java/com/timsu/astrid/utilities/LegacyTasksXmlExporter.java similarity index 100% rename from astrid/src/com/timsu/astrid/utilities/LegacyTasksXmlExporter.java rename to astrid/src/main/java/com/timsu/astrid/utilities/LegacyTasksXmlExporter.java diff --git a/astrid/src/com/todoroo/astrid/actfm/ActFmCameraModule.java b/astrid/src/main/java/com/todoroo/astrid/actfm/ActFmCameraModule.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/ActFmCameraModule.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/ActFmCameraModule.java diff --git a/astrid/src/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java b/astrid/src/main/java/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java diff --git a/astrid/src/com/todoroo/astrid/actfm/ActFmSyncActionExposer.java b/astrid/src/main/java/com/todoroo/astrid/actfm/ActFmSyncActionExposer.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/ActFmSyncActionExposer.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/ActFmSyncActionExposer.java diff --git a/astrid/src/com/todoroo/astrid/actfm/CommentsActivity.java b/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsActivity.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/CommentsActivity.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/CommentsActivity.java diff --git a/astrid/src/com/todoroo/astrid/actfm/CommentsFragment.java b/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsFragment.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/CommentsFragment.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/CommentsFragment.java diff --git a/astrid/src/com/todoroo/astrid/actfm/TagCommentsFragment.java b/astrid/src/main/java/com/todoroo/astrid/actfm/TagCommentsFragment.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/TagCommentsFragment.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/TagCommentsFragment.java diff --git a/astrid/src/com/todoroo/astrid/actfm/TagSettingsActivity.java b/astrid/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/TagSettingsActivity.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java diff --git a/astrid/src/com/todoroo/astrid/actfm/TagSettingsActivityTablet.java b/astrid/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivityTablet.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/TagSettingsActivityTablet.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivityTablet.java diff --git a/astrid/src/com/todoroo/astrid/actfm/TagViewFragment.java b/astrid/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/TagViewFragment.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java diff --git a/astrid/src/com/todoroo/astrid/actfm/TaskCommentsFragment.java b/astrid/src/main/java/com/todoroo/astrid/actfm/TaskCommentsFragment.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/TaskCommentsFragment.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/TaskCommentsFragment.java diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/ActFmInvoker.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/sync/ActFmInvoker.java diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/ActFmPreferenceService.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/ActFmPreferenceService.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/sync/ActFmPreferenceService.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/sync/ActFmPreferenceService.java diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/ActFmServiceException.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/ActFmServiceException.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/sync/ActFmServiceException.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/sync/ActFmServiceException.java diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/ActFmSyncMonitor.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/ActFmSyncMonitor.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/sync/ActFmSyncMonitor.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/sync/ActFmSyncMonitor.java diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/ActFmSyncService.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/sync/ActFmSyncService.java diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/ActFmSyncWaitingPool.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/ActFmSyncWaitingPool.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/sync/ActFmSyncWaitingPool.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/sync/ActFmSyncWaitingPool.java diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/AstridNewSyncMigrator.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/AstridNewSyncMigrator.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/sync/AstridNewSyncMigrator.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/sync/AstridNewSyncMigrator.java diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/EmptyTitleOutstandingEntryMigration.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/EmptyTitleOutstandingEntryMigration.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/sync/EmptyTitleOutstandingEntryMigration.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/sync/EmptyTitleOutstandingEntryMigration.java diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/SyncDatabaseListener.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/SyncDatabaseListener.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/sync/SyncDatabaseListener.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/sync/SyncDatabaseListener.java diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/TaskListMetadataSyncDatabaseListener.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/TaskListMetadataSyncDatabaseListener.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/sync/TaskListMetadataSyncDatabaseListener.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/sync/TaskListMetadataSyncDatabaseListener.java diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/messages/AcknowledgeChange.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/AcknowledgeChange.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/sync/messages/AcknowledgeChange.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/AcknowledgeChange.java diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/messages/BriefMe.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/BriefMe.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/sync/messages/BriefMe.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/BriefMe.java diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/messages/ChangesHappened.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/ChangesHappened.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/sync/messages/ChangesHappened.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/ChangesHappened.java diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/messages/ClientToServerMessage.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/ClientToServerMessage.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/sync/messages/ClientToServerMessage.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/ClientToServerMessage.java diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/messages/ConstructOutstandingTableFromMasterTable.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/ConstructOutstandingTableFromMasterTable.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/sync/messages/ConstructOutstandingTableFromMasterTable.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/ConstructOutstandingTableFromMasterTable.java diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/messages/ConstructTaskOutstandingTableFromMasterTable.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/ConstructTaskOutstandingTableFromMasterTable.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/sync/messages/ConstructTaskOutstandingTableFromMasterTable.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/ConstructTaskOutstandingTableFromMasterTable.java diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/messages/ConvertSelfUserIdsToZero.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/ConvertSelfUserIdsToZero.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/sync/messages/ConvertSelfUserIdsToZero.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/ConvertSelfUserIdsToZero.java diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/messages/Debug.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/Debug.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/sync/messages/Debug.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/Debug.java diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/messages/DoubleCheck.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/DoubleCheck.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/sync/messages/DoubleCheck.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/DoubleCheck.java diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/messages/FetchHistory.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/FetchHistory.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/sync/messages/FetchHistory.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/FetchHistory.java diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/messages/JSONChangeToPropertyVisitor.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/JSONChangeToPropertyVisitor.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/sync/messages/JSONChangeToPropertyVisitor.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/JSONChangeToPropertyVisitor.java diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/messages/JSONPayloadBuilder.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/JSONPayloadBuilder.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/sync/messages/JSONPayloadBuilder.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/JSONPayloadBuilder.java diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/messages/NameMaps.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/NameMaps.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/sync/messages/NameMaps.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/NameMaps.java diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/messages/NowBriefed.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/NowBriefed.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/sync/messages/NowBriefed.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/NowBriefed.java diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/messages/ReplayOutstandingEntries.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/ReplayOutstandingEntries.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/sync/messages/ReplayOutstandingEntries.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/ReplayOutstandingEntries.java diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/messages/ReplayTaskListMetadataOutstanding.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/ReplayTaskListMetadataOutstanding.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/sync/messages/ReplayTaskListMetadataOutstanding.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/ReplayTaskListMetadataOutstanding.java diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/messages/RequestDoubleCheck.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/RequestDoubleCheck.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/sync/messages/RequestDoubleCheck.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/RequestDoubleCheck.java diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/messages/ServerToClientMessage.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/ServerToClientMessage.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/sync/messages/ServerToClientMessage.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/ServerToClientMessage.java diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/messages/TaskListMetadataChangesHappened.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/TaskListMetadataChangesHappened.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/sync/messages/TaskListMetadataChangesHappened.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/TaskListMetadataChangesHappened.java diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/messages/UserData.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/UserData.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/sync/messages/UserData.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/UserData.java diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/messages/UserMigrated.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/UserMigrated.java similarity index 100% rename from astrid/src/com/todoroo/astrid/actfm/sync/messages/UserMigrated.java rename to astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/UserMigrated.java diff --git a/astrid/src/com/todoroo/astrid/activity/AboutActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/AboutActivity.java similarity index 100% rename from astrid/src/com/todoroo/astrid/activity/AboutActivity.java rename to astrid/src/main/java/com/todoroo/astrid/activity/AboutActivity.java diff --git a/astrid/src/com/todoroo/astrid/activity/AddOnActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/AddOnActivity.java similarity index 100% rename from astrid/src/com/todoroo/astrid/activity/AddOnActivity.java rename to astrid/src/main/java/com/todoroo/astrid/activity/AddOnActivity.java diff --git a/astrid/src/com/todoroo/astrid/activity/AstridActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/AstridActivity.java similarity index 100% rename from astrid/src/com/todoroo/astrid/activity/AstridActivity.java rename to astrid/src/main/java/com/todoroo/astrid/activity/AstridActivity.java diff --git a/astrid/src/com/todoroo/astrid/activity/BeastModePreferences.java b/astrid/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java similarity index 100% rename from astrid/src/com/todoroo/astrid/activity/BeastModePreferences.java rename to astrid/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java diff --git a/astrid/src/com/todoroo/astrid/activity/DefaultFilterMode.java b/astrid/src/main/java/com/todoroo/astrid/activity/DefaultFilterMode.java similarity index 100% rename from astrid/src/com/todoroo/astrid/activity/DefaultFilterMode.java rename to astrid/src/main/java/com/todoroo/astrid/activity/DefaultFilterMode.java diff --git a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/main/java/com/todoroo/astrid/activity/EditPreferences.java similarity index 100% rename from astrid/src/com/todoroo/astrid/activity/EditPreferences.java rename to astrid/src/main/java/com/todoroo/astrid/activity/EditPreferences.java diff --git a/astrid/src/com/todoroo/astrid/activity/Eula.java b/astrid/src/main/java/com/todoroo/astrid/activity/Eula.java similarity index 100% rename from astrid/src/com/todoroo/astrid/activity/Eula.java rename to astrid/src/main/java/com/todoroo/astrid/activity/Eula.java diff --git a/astrid/src/com/todoroo/astrid/activity/ExpandableListFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/ExpandableListFragment.java similarity index 100% rename from astrid/src/com/todoroo/astrid/activity/ExpandableListFragment.java rename to astrid/src/main/java/com/todoroo/astrid/activity/ExpandableListFragment.java diff --git a/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/FilterListFragment.java similarity index 100% rename from astrid/src/com/todoroo/astrid/activity/FilterListFragment.java rename to astrid/src/main/java/com/todoroo/astrid/activity/FilterListFragment.java diff --git a/astrid/src/com/todoroo/astrid/activity/FilterModeSpec.java b/astrid/src/main/java/com/todoroo/astrid/activity/FilterModeSpec.java similarity index 100% rename from astrid/src/com/todoroo/astrid/activity/FilterModeSpec.java rename to astrid/src/main/java/com/todoroo/astrid/activity/FilterModeSpec.java diff --git a/astrid/src/com/todoroo/astrid/activity/FilterShortcutActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/FilterShortcutActivity.java similarity index 100% rename from astrid/src/com/todoroo/astrid/activity/FilterShortcutActivity.java rename to astrid/src/main/java/com/todoroo/astrid/activity/FilterShortcutActivity.java diff --git a/astrid/src/com/todoroo/astrid/activity/ShareLinkActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java similarity index 100% rename from astrid/src/com/todoroo/astrid/activity/ShareLinkActivity.java rename to astrid/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java diff --git a/astrid/src/com/todoroo/astrid/activity/ShortcutActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/ShortcutActivity.java similarity index 100% rename from astrid/src/com/todoroo/astrid/activity/ShortcutActivity.java rename to astrid/src/main/java/com/todoroo/astrid/activity/ShortcutActivity.java diff --git a/astrid/src/com/todoroo/astrid/activity/SortSelectionActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/SortSelectionActivity.java similarity index 100% rename from astrid/src/com/todoroo/astrid/activity/SortSelectionActivity.java rename to astrid/src/main/java/com/todoroo/astrid/activity/SortSelectionActivity.java diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java similarity index 100% rename from astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java rename to astrid/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java similarity index 100% rename from astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java rename to astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditViewPager.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditViewPager.java similarity index 100% rename from astrid/src/com/todoroo/astrid/activity/TaskEditViewPager.java rename to astrid/src/main/java/com/todoroo/astrid/activity/TaskEditViewPager.java diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java similarity index 100% rename from astrid/src/com/todoroo/astrid/activity/TaskListActivity.java rename to astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java similarity index 100% rename from astrid/src/com/todoroo/astrid/activity/TaskListFragment.java rename to astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java diff --git a/astrid/src/com/todoroo/astrid/adapter/AddOnAdapter.java b/astrid/src/main/java/com/todoroo/astrid/adapter/AddOnAdapter.java similarity index 100% rename from astrid/src/com/todoroo/astrid/adapter/AddOnAdapter.java rename to astrid/src/main/java/com/todoroo/astrid/adapter/AddOnAdapter.java diff --git a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java b/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java similarity index 100% rename from astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java rename to astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java similarity index 100% rename from astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java rename to astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskListFragmentPagerAdapter.java b/astrid/src/main/java/com/todoroo/astrid/adapter/TaskListFragmentPagerAdapter.java similarity index 100% rename from astrid/src/com/todoroo/astrid/adapter/TaskListFragmentPagerAdapter.java rename to astrid/src/main/java/com/todoroo/astrid/adapter/TaskListFragmentPagerAdapter.java diff --git a/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java b/astrid/src/main/java/com/todoroo/astrid/adapter/UpdateAdapter.java similarity index 100% rename from astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java rename to astrid/src/main/java/com/todoroo/astrid/adapter/UpdateAdapter.java diff --git a/astrid/src/com/todoroo/astrid/alarms/AlarmControlSet.java b/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmControlSet.java similarity index 100% rename from astrid/src/com/todoroo/astrid/alarms/AlarmControlSet.java rename to astrid/src/main/java/com/todoroo/astrid/alarms/AlarmControlSet.java diff --git a/astrid/src/com/todoroo/astrid/alarms/AlarmDetailExposer.java b/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmDetailExposer.java similarity index 100% rename from astrid/src/com/todoroo/astrid/alarms/AlarmDetailExposer.java rename to astrid/src/main/java/com/todoroo/astrid/alarms/AlarmDetailExposer.java diff --git a/astrid/src/com/todoroo/astrid/alarms/AlarmFields.java b/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmFields.java similarity index 100% rename from astrid/src/com/todoroo/astrid/alarms/AlarmFields.java rename to astrid/src/main/java/com/todoroo/astrid/alarms/AlarmFields.java diff --git a/astrid/src/com/todoroo/astrid/alarms/AlarmService.java b/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmService.java similarity index 100% rename from astrid/src/com/todoroo/astrid/alarms/AlarmService.java rename to astrid/src/main/java/com/todoroo/astrid/alarms/AlarmService.java diff --git a/astrid/src/com/todoroo/astrid/alarms/AlarmTaskRepeatListener.java b/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmTaskRepeatListener.java similarity index 100% rename from astrid/src/com/todoroo/astrid/alarms/AlarmTaskRepeatListener.java rename to astrid/src/main/java/com/todoroo/astrid/alarms/AlarmTaskRepeatListener.java diff --git a/astrid/src/com/todoroo/astrid/api/TaskContextActionExposer.java b/astrid/src/main/java/com/todoroo/astrid/api/TaskContextActionExposer.java similarity index 100% rename from astrid/src/com/todoroo/astrid/api/TaskContextActionExposer.java rename to astrid/src/main/java/com/todoroo/astrid/api/TaskContextActionExposer.java diff --git a/astrid/src/com/todoroo/astrid/api/TaskDecorationExposer.java b/astrid/src/main/java/com/todoroo/astrid/api/TaskDecorationExposer.java similarity index 100% rename from astrid/src/com/todoroo/astrid/api/TaskDecorationExposer.java rename to astrid/src/main/java/com/todoroo/astrid/api/TaskDecorationExposer.java diff --git a/astrid/src/com/todoroo/astrid/backup/BackupActivity.java b/astrid/src/main/java/com/todoroo/astrid/backup/BackupActivity.java similarity index 100% rename from astrid/src/com/todoroo/astrid/backup/BackupActivity.java rename to astrid/src/main/java/com/todoroo/astrid/backup/BackupActivity.java diff --git a/astrid/src/com/todoroo/astrid/backup/BackupConstants.java b/astrid/src/main/java/com/todoroo/astrid/backup/BackupConstants.java similarity index 100% rename from astrid/src/com/todoroo/astrid/backup/BackupConstants.java rename to astrid/src/main/java/com/todoroo/astrid/backup/BackupConstants.java diff --git a/astrid/src/com/todoroo/astrid/backup/BackupDateUtilities.java b/astrid/src/main/java/com/todoroo/astrid/backup/BackupDateUtilities.java similarity index 100% rename from astrid/src/com/todoroo/astrid/backup/BackupDateUtilities.java rename to astrid/src/main/java/com/todoroo/astrid/backup/BackupDateUtilities.java diff --git a/astrid/src/com/todoroo/astrid/backup/BackupPreferences.java b/astrid/src/main/java/com/todoroo/astrid/backup/BackupPreferences.java similarity index 100% rename from astrid/src/com/todoroo/astrid/backup/BackupPreferences.java rename to astrid/src/main/java/com/todoroo/astrid/backup/BackupPreferences.java diff --git a/astrid/src/com/todoroo/astrid/backup/BackupService.java b/astrid/src/main/java/com/todoroo/astrid/backup/BackupService.java similarity index 100% rename from astrid/src/com/todoroo/astrid/backup/BackupService.java rename to astrid/src/main/java/com/todoroo/astrid/backup/BackupService.java diff --git a/astrid/src/com/todoroo/astrid/backup/BackupStartupReceiver.java b/astrid/src/main/java/com/todoroo/astrid/backup/BackupStartupReceiver.java similarity index 100% rename from astrid/src/com/todoroo/astrid/backup/BackupStartupReceiver.java rename to astrid/src/main/java/com/todoroo/astrid/backup/BackupStartupReceiver.java diff --git a/astrid/src/com/todoroo/astrid/backup/FilePickerBuilder.java b/astrid/src/main/java/com/todoroo/astrid/backup/FilePickerBuilder.java similarity index 100% rename from astrid/src/com/todoroo/astrid/backup/FilePickerBuilder.java rename to astrid/src/main/java/com/todoroo/astrid/backup/FilePickerBuilder.java diff --git a/astrid/src/com/todoroo/astrid/backup/TasksXmlExporter.java b/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java similarity index 100% rename from astrid/src/com/todoroo/astrid/backup/TasksXmlExporter.java rename to astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java diff --git a/astrid/src/com/todoroo/astrid/backup/TasksXmlImporter.java b/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java similarity index 100% rename from astrid/src/com/todoroo/astrid/backup/TasksXmlImporter.java rename to astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java diff --git a/astrid/src/com/todoroo/astrid/calls/MissedCallActivity.java b/astrid/src/main/java/com/todoroo/astrid/calls/MissedCallActivity.java similarity index 100% rename from astrid/src/com/todoroo/astrid/calls/MissedCallActivity.java rename to astrid/src/main/java/com/todoroo/astrid/calls/MissedCallActivity.java diff --git a/astrid/src/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java b/astrid/src/main/java/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java similarity index 100% rename from astrid/src/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java rename to astrid/src/main/java/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java diff --git a/astrid/src/com/todoroo/astrid/core/CoreFilterExposer.java b/astrid/src/main/java/com/todoroo/astrid/core/CoreFilterExposer.java similarity index 100% rename from astrid/src/com/todoroo/astrid/core/CoreFilterExposer.java rename to astrid/src/main/java/com/todoroo/astrid/core/CoreFilterExposer.java diff --git a/astrid/src/com/todoroo/astrid/core/CorePlugin.java b/astrid/src/main/java/com/todoroo/astrid/core/CorePlugin.java similarity index 100% rename from astrid/src/com/todoroo/astrid/core/CorePlugin.java rename to astrid/src/main/java/com/todoroo/astrid/core/CorePlugin.java diff --git a/astrid/src/com/todoroo/astrid/core/CustomFilterActivity.java b/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java similarity index 100% rename from astrid/src/com/todoroo/astrid/core/CustomFilterActivity.java rename to astrid/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java diff --git a/astrid/src/com/todoroo/astrid/core/CustomFilterAdapter.java b/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java similarity index 100% rename from astrid/src/com/todoroo/astrid/core/CustomFilterAdapter.java rename to astrid/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java diff --git a/astrid/src/com/todoroo/astrid/core/CustomFilterExposer.java b/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java similarity index 100% rename from astrid/src/com/todoroo/astrid/core/CustomFilterExposer.java rename to astrid/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java diff --git a/astrid/src/com/todoroo/astrid/core/DefaultsPreferences.java b/astrid/src/main/java/com/todoroo/astrid/core/DefaultsPreferences.java similarity index 100% rename from astrid/src/com/todoroo/astrid/core/DefaultsPreferences.java rename to astrid/src/main/java/com/todoroo/astrid/core/DefaultsPreferences.java diff --git a/astrid/src/com/todoroo/astrid/core/FilterView.java b/astrid/src/main/java/com/todoroo/astrid/core/FilterView.java similarity index 100% rename from astrid/src/com/todoroo/astrid/core/FilterView.java rename to astrid/src/main/java/com/todoroo/astrid/core/FilterView.java diff --git a/astrid/src/com/todoroo/astrid/core/LinkActionExposer.java b/astrid/src/main/java/com/todoroo/astrid/core/LinkActionExposer.java similarity index 100% rename from astrid/src/com/todoroo/astrid/core/LinkActionExposer.java rename to astrid/src/main/java/com/todoroo/astrid/core/LinkActionExposer.java diff --git a/astrid/src/com/todoroo/astrid/core/OldTaskPreferences.java b/astrid/src/main/java/com/todoroo/astrid/core/OldTaskPreferences.java similarity index 100% rename from astrid/src/com/todoroo/astrid/core/OldTaskPreferences.java rename to astrid/src/main/java/com/todoroo/astrid/core/OldTaskPreferences.java diff --git a/astrid/src/com/todoroo/astrid/core/PluginServices.java b/astrid/src/main/java/com/todoroo/astrid/core/PluginServices.java similarity index 100% rename from astrid/src/com/todoroo/astrid/core/PluginServices.java rename to astrid/src/main/java/com/todoroo/astrid/core/PluginServices.java diff --git a/astrid/src/com/todoroo/astrid/core/SavedFilter.java b/astrid/src/main/java/com/todoroo/astrid/core/SavedFilter.java similarity index 100% rename from astrid/src/com/todoroo/astrid/core/SavedFilter.java rename to astrid/src/main/java/com/todoroo/astrid/core/SavedFilter.java diff --git a/astrid/src/com/todoroo/astrid/dao/DaoReflectionHelpers.java b/astrid/src/main/java/com/todoroo/astrid/dao/DaoReflectionHelpers.java similarity index 100% rename from astrid/src/com/todoroo/astrid/dao/DaoReflectionHelpers.java rename to astrid/src/main/java/com/todoroo/astrid/dao/DaoReflectionHelpers.java diff --git a/astrid/src/com/todoroo/astrid/dao/Database.java b/astrid/src/main/java/com/todoroo/astrid/dao/Database.java similarity index 100% rename from astrid/src/com/todoroo/astrid/dao/Database.java rename to astrid/src/main/java/com/todoroo/astrid/dao/Database.java diff --git a/astrid/src/com/todoroo/astrid/dao/HistoryDao.java b/astrid/src/main/java/com/todoroo/astrid/dao/HistoryDao.java similarity index 100% rename from astrid/src/com/todoroo/astrid/dao/HistoryDao.java rename to astrid/src/main/java/com/todoroo/astrid/dao/HistoryDao.java diff --git a/astrid/src/com/todoroo/astrid/dao/MetadataDao.java b/astrid/src/main/java/com/todoroo/astrid/dao/MetadataDao.java similarity index 100% rename from astrid/src/com/todoroo/astrid/dao/MetadataDao.java rename to astrid/src/main/java/com/todoroo/astrid/dao/MetadataDao.java diff --git a/astrid/src/com/todoroo/astrid/dao/OutstandingEntryDao.java b/astrid/src/main/java/com/todoroo/astrid/dao/OutstandingEntryDao.java similarity index 100% rename from astrid/src/com/todoroo/astrid/dao/OutstandingEntryDao.java rename to astrid/src/main/java/com/todoroo/astrid/dao/OutstandingEntryDao.java diff --git a/astrid/src/com/todoroo/astrid/dao/RemoteModelDao.java b/astrid/src/main/java/com/todoroo/astrid/dao/RemoteModelDao.java similarity index 100% rename from astrid/src/com/todoroo/astrid/dao/RemoteModelDao.java rename to astrid/src/main/java/com/todoroo/astrid/dao/RemoteModelDao.java diff --git a/astrid/src/com/todoroo/astrid/dao/StoreObjectDao.java b/astrid/src/main/java/com/todoroo/astrid/dao/StoreObjectDao.java similarity index 100% rename from astrid/src/com/todoroo/astrid/dao/StoreObjectDao.java rename to astrid/src/main/java/com/todoroo/astrid/dao/StoreObjectDao.java diff --git a/astrid/src/com/todoroo/astrid/dao/TagDataDao.java b/astrid/src/main/java/com/todoroo/astrid/dao/TagDataDao.java similarity index 100% rename from astrid/src/com/todoroo/astrid/dao/TagDataDao.java rename to astrid/src/main/java/com/todoroo/astrid/dao/TagDataDao.java diff --git a/astrid/src/com/todoroo/astrid/dao/TagMetadataDao.java b/astrid/src/main/java/com/todoroo/astrid/dao/TagMetadataDao.java similarity index 100% rename from astrid/src/com/todoroo/astrid/dao/TagMetadataDao.java rename to astrid/src/main/java/com/todoroo/astrid/dao/TagMetadataDao.java diff --git a/astrid/src/com/todoroo/astrid/dao/TagOutstandingDao.java b/astrid/src/main/java/com/todoroo/astrid/dao/TagOutstandingDao.java similarity index 100% rename from astrid/src/com/todoroo/astrid/dao/TagOutstandingDao.java rename to astrid/src/main/java/com/todoroo/astrid/dao/TagOutstandingDao.java diff --git a/astrid/src/com/todoroo/astrid/dao/TaskAttachmentDao.java b/astrid/src/main/java/com/todoroo/astrid/dao/TaskAttachmentDao.java similarity index 100% rename from astrid/src/com/todoroo/astrid/dao/TaskAttachmentDao.java rename to astrid/src/main/java/com/todoroo/astrid/dao/TaskAttachmentDao.java diff --git a/astrid/src/com/todoroo/astrid/dao/TaskAttachmentOutstandingDao.java b/astrid/src/main/java/com/todoroo/astrid/dao/TaskAttachmentOutstandingDao.java similarity index 100% rename from astrid/src/com/todoroo/astrid/dao/TaskAttachmentOutstandingDao.java rename to astrid/src/main/java/com/todoroo/astrid/dao/TaskAttachmentOutstandingDao.java diff --git a/astrid/src/com/todoroo/astrid/dao/TaskDao.java b/astrid/src/main/java/com/todoroo/astrid/dao/TaskDao.java similarity index 100% rename from astrid/src/com/todoroo/astrid/dao/TaskDao.java rename to astrid/src/main/java/com/todoroo/astrid/dao/TaskDao.java diff --git a/astrid/src/com/todoroo/astrid/dao/TaskListMetadataDao.java b/astrid/src/main/java/com/todoroo/astrid/dao/TaskListMetadataDao.java similarity index 100% rename from astrid/src/com/todoroo/astrid/dao/TaskListMetadataDao.java rename to astrid/src/main/java/com/todoroo/astrid/dao/TaskListMetadataDao.java diff --git a/astrid/src/com/todoroo/astrid/dao/TaskListMetadataOutstandingDao.java b/astrid/src/main/java/com/todoroo/astrid/dao/TaskListMetadataOutstandingDao.java similarity index 100% rename from astrid/src/com/todoroo/astrid/dao/TaskListMetadataOutstandingDao.java rename to astrid/src/main/java/com/todoroo/astrid/dao/TaskListMetadataOutstandingDao.java diff --git a/astrid/src/com/todoroo/astrid/dao/TaskOutstandingDao.java b/astrid/src/main/java/com/todoroo/astrid/dao/TaskOutstandingDao.java similarity index 100% rename from astrid/src/com/todoroo/astrid/dao/TaskOutstandingDao.java rename to astrid/src/main/java/com/todoroo/astrid/dao/TaskOutstandingDao.java diff --git a/astrid/src/com/todoroo/astrid/dao/UpdateDao.java b/astrid/src/main/java/com/todoroo/astrid/dao/UpdateDao.java similarity index 100% rename from astrid/src/com/todoroo/astrid/dao/UpdateDao.java rename to astrid/src/main/java/com/todoroo/astrid/dao/UpdateDao.java diff --git a/astrid/src/com/todoroo/astrid/dao/UserActivityDao.java b/astrid/src/main/java/com/todoroo/astrid/dao/UserActivityDao.java similarity index 100% rename from astrid/src/com/todoroo/astrid/dao/UserActivityDao.java rename to astrid/src/main/java/com/todoroo/astrid/dao/UserActivityDao.java diff --git a/astrid/src/com/todoroo/astrid/dao/UserActivityOutstandingDao.java b/astrid/src/main/java/com/todoroo/astrid/dao/UserActivityOutstandingDao.java similarity index 100% rename from astrid/src/com/todoroo/astrid/dao/UserActivityOutstandingDao.java rename to astrid/src/main/java/com/todoroo/astrid/dao/UserActivityOutstandingDao.java diff --git a/astrid/src/com/todoroo/astrid/dao/UserDao.java b/astrid/src/main/java/com/todoroo/astrid/dao/UserDao.java similarity index 100% rename from astrid/src/com/todoroo/astrid/dao/UserDao.java rename to astrid/src/main/java/com/todoroo/astrid/dao/UserDao.java diff --git a/astrid/src/com/todoroo/astrid/data/AddOn.java b/astrid/src/main/java/com/todoroo/astrid/data/AddOn.java similarity index 100% rename from astrid/src/com/todoroo/astrid/data/AddOn.java rename to astrid/src/main/java/com/todoroo/astrid/data/AddOn.java diff --git a/astrid/src/com/todoroo/astrid/files/AACRecordingActivity.java b/astrid/src/main/java/com/todoroo/astrid/files/AACRecordingActivity.java similarity index 100% rename from astrid/src/com/todoroo/astrid/files/AACRecordingActivity.java rename to astrid/src/main/java/com/todoroo/astrid/files/AACRecordingActivity.java diff --git a/astrid/src/com/todoroo/astrid/files/FileExplore.java b/astrid/src/main/java/com/todoroo/astrid/files/FileExplore.java similarity index 100% rename from astrid/src/com/todoroo/astrid/files/FileExplore.java rename to astrid/src/main/java/com/todoroo/astrid/files/FileExplore.java diff --git a/astrid/src/com/todoroo/astrid/files/FileMetadata.java b/astrid/src/main/java/com/todoroo/astrid/files/FileMetadata.java similarity index 100% rename from astrid/src/com/todoroo/astrid/files/FileMetadata.java rename to astrid/src/main/java/com/todoroo/astrid/files/FileMetadata.java diff --git a/astrid/src/com/todoroo/astrid/files/FileUtilities.java b/astrid/src/main/java/com/todoroo/astrid/files/FileUtilities.java similarity index 100% rename from astrid/src/com/todoroo/astrid/files/FileUtilities.java rename to astrid/src/main/java/com/todoroo/astrid/files/FileUtilities.java diff --git a/astrid/src/com/todoroo/astrid/files/FilesAction.java b/astrid/src/main/java/com/todoroo/astrid/files/FilesAction.java similarity index 100% rename from astrid/src/com/todoroo/astrid/files/FilesAction.java rename to astrid/src/main/java/com/todoroo/astrid/files/FilesAction.java diff --git a/astrid/src/com/todoroo/astrid/files/FilesControlSet.java b/astrid/src/main/java/com/todoroo/astrid/files/FilesControlSet.java similarity index 100% rename from astrid/src/com/todoroo/astrid/files/FilesControlSet.java rename to astrid/src/main/java/com/todoroo/astrid/files/FilesControlSet.java diff --git a/astrid/src/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java b/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java rename to astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java diff --git a/astrid/src/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java b/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java rename to astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java diff --git a/astrid/src/com/todoroo/astrid/gcal/CalendarAlarmScheduler.java b/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmScheduler.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gcal/CalendarAlarmScheduler.java rename to astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmScheduler.java diff --git a/astrid/src/com/todoroo/astrid/gcal/CalendarReminderActivity.java b/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gcal/CalendarReminderActivity.java rename to astrid/src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java diff --git a/astrid/src/com/todoroo/astrid/gcal/CalendarStartupReceiver.java b/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarStartupReceiver.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gcal/CalendarStartupReceiver.java rename to astrid/src/main/java/com/todoroo/astrid/gcal/CalendarStartupReceiver.java diff --git a/astrid/src/com/todoroo/astrid/gcal/Calendars.java b/astrid/src/main/java/com/todoroo/astrid/gcal/Calendars.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gcal/Calendars.java rename to astrid/src/main/java/com/todoroo/astrid/gcal/Calendars.java diff --git a/astrid/src/com/todoroo/astrid/gcal/GCalControlSet.java b/astrid/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gcal/GCalControlSet.java rename to astrid/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java diff --git a/astrid/src/com/todoroo/astrid/gcal/GCalHelper.java b/astrid/src/main/java/com/todoroo/astrid/gcal/GCalHelper.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gcal/GCalHelper.java rename to astrid/src/main/java/com/todoroo/astrid/gcal/GCalHelper.java diff --git a/astrid/src/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java b/astrid/src/main/java/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java rename to astrid/src/main/java/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java diff --git a/astrid/src/com/todoroo/astrid/gtasks/GtasksBackgroundService.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksBackgroundService.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gtasks/GtasksBackgroundService.java rename to astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksBackgroundService.java diff --git a/astrid/src/com/todoroo/astrid/gtasks/GtasksCustomFilterCriteriaExposer.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksCustomFilterCriteriaExposer.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gtasks/GtasksCustomFilterCriteriaExposer.java rename to astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksCustomFilterCriteriaExposer.java diff --git a/astrid/src/com/todoroo/astrid/gtasks/GtasksDetailExposer.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksDetailExposer.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gtasks/GtasksDetailExposer.java rename to astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksDetailExposer.java diff --git a/astrid/src/com/todoroo/astrid/gtasks/GtasksFilterExposer.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gtasks/GtasksFilterExposer.java rename to astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java diff --git a/astrid/src/com/todoroo/astrid/gtasks/GtasksList.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksList.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gtasks/GtasksList.java rename to astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksList.java diff --git a/astrid/src/com/todoroo/astrid/gtasks/GtasksListAdder.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListAdder.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gtasks/GtasksListAdder.java rename to astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListAdder.java diff --git a/astrid/src/com/todoroo/astrid/gtasks/GtasksListFragment.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListFragment.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gtasks/GtasksListFragment.java rename to astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListFragment.java diff --git a/astrid/src/com/todoroo/astrid/gtasks/GtasksListService.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListService.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gtasks/GtasksListService.java rename to astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListService.java diff --git a/astrid/src/com/todoroo/astrid/gtasks/GtasksMetadata.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksMetadata.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gtasks/GtasksMetadata.java rename to astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksMetadata.java diff --git a/astrid/src/com/todoroo/astrid/gtasks/GtasksMetadataService.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksMetadataService.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gtasks/GtasksMetadataService.java rename to astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksMetadataService.java diff --git a/astrid/src/com/todoroo/astrid/gtasks/GtasksPreferenceService.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksPreferenceService.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gtasks/GtasksPreferenceService.java rename to astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksPreferenceService.java diff --git a/astrid/src/com/todoroo/astrid/gtasks/GtasksPreferences.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksPreferences.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gtasks/GtasksPreferences.java rename to astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksPreferences.java diff --git a/astrid/src/com/todoroo/astrid/gtasks/GtasksStartupReceiver.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksStartupReceiver.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gtasks/GtasksStartupReceiver.java rename to astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksStartupReceiver.java diff --git a/astrid/src/com/todoroo/astrid/gtasks/GtasksSyncActionExposer.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksSyncActionExposer.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gtasks/GtasksSyncActionExposer.java rename to astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksSyncActionExposer.java diff --git a/astrid/src/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java rename to astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java diff --git a/astrid/src/com/todoroo/astrid/gtasks/api/CreateRequest.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/api/CreateRequest.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gtasks/api/CreateRequest.java rename to astrid/src/main/java/com/todoroo/astrid/gtasks/api/CreateRequest.java diff --git a/astrid/src/com/todoroo/astrid/gtasks/api/GoogleTasksException.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/api/GoogleTasksException.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gtasks/api/GoogleTasksException.java rename to astrid/src/main/java/com/todoroo/astrid/gtasks/api/GoogleTasksException.java diff --git a/astrid/src/com/todoroo/astrid/gtasks/api/GtasksApiUtilities.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/api/GtasksApiUtilities.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gtasks/api/GtasksApiUtilities.java rename to astrid/src/main/java/com/todoroo/astrid/gtasks/api/GtasksApiUtilities.java diff --git a/astrid/src/com/todoroo/astrid/gtasks/api/GtasksInvoker.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gtasks/api/GtasksInvoker.java rename to astrid/src/main/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.java diff --git a/astrid/src/com/todoroo/astrid/gtasks/api/MoveListRequest.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/api/MoveListRequest.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gtasks/api/MoveListRequest.java rename to astrid/src/main/java/com/todoroo/astrid/gtasks/api/MoveListRequest.java diff --git a/astrid/src/com/todoroo/astrid/gtasks/api/MoveRequest.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/api/MoveRequest.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gtasks/api/MoveRequest.java rename to astrid/src/main/java/com/todoroo/astrid/gtasks/api/MoveRequest.java diff --git a/astrid/src/com/todoroo/astrid/gtasks/api/PushRequest.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/api/PushRequest.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gtasks/api/PushRequest.java rename to astrid/src/main/java/com/todoroo/astrid/gtasks/api/PushRequest.java diff --git a/astrid/src/com/todoroo/astrid/gtasks/api/UpdateRequest.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/api/UpdateRequest.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gtasks/api/UpdateRequest.java rename to astrid/src/main/java/com/todoroo/astrid/gtasks/api/UpdateRequest.java diff --git a/astrid/src/com/todoroo/astrid/gtasks/auth/AccountChooser.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/auth/AccountChooser.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gtasks/auth/AccountChooser.java rename to astrid/src/main/java/com/todoroo/astrid/gtasks/auth/AccountChooser.java diff --git a/astrid/src/com/todoroo/astrid/gtasks/auth/AuthManager.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/auth/AuthManager.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gtasks/auth/AuthManager.java rename to astrid/src/main/java/com/todoroo/astrid/gtasks/auth/AuthManager.java diff --git a/astrid/src/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java rename to astrid/src/main/java/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java diff --git a/astrid/src/com/todoroo/astrid/gtasks/auth/GtasksTokenValidator.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/auth/GtasksTokenValidator.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gtasks/auth/GtasksTokenValidator.java rename to astrid/src/main/java/com/todoroo/astrid/gtasks/auth/GtasksTokenValidator.java diff --git a/astrid/src/com/todoroo/astrid/gtasks/auth/ModernAuthManager.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/auth/ModernAuthManager.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gtasks/auth/ModernAuthManager.java rename to astrid/src/main/java/com/todoroo/astrid/gtasks/auth/ModernAuthManager.java diff --git a/astrid/src/com/todoroo/astrid/gtasks/sync/GtasksLegacyMigrator.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksLegacyMigrator.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gtasks/sync/GtasksLegacyMigrator.java rename to astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksLegacyMigrator.java diff --git a/astrid/src/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java rename to astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java diff --git a/astrid/src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java rename to astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java diff --git a/astrid/src/com/todoroo/astrid/gtasks/sync/GtasksTaskContainer.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksTaskContainer.java similarity index 100% rename from astrid/src/com/todoroo/astrid/gtasks/sync/GtasksTaskContainer.java rename to astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksTaskContainer.java diff --git a/astrid/src/com/todoroo/astrid/helper/AsyncImageView.java b/astrid/src/main/java/com/todoroo/astrid/helper/AsyncImageView.java similarity index 100% rename from astrid/src/com/todoroo/astrid/helper/AsyncImageView.java rename to astrid/src/main/java/com/todoroo/astrid/helper/AsyncImageView.java diff --git a/astrid/src/com/todoroo/astrid/helper/DueDateTimeMigrator.java b/astrid/src/main/java/com/todoroo/astrid/helper/DueDateTimeMigrator.java similarity index 100% rename from astrid/src/com/todoroo/astrid/helper/DueDateTimeMigrator.java rename to astrid/src/main/java/com/todoroo/astrid/helper/DueDateTimeMigrator.java diff --git a/astrid/src/com/todoroo/astrid/helper/MetadataHelper.java b/astrid/src/main/java/com/todoroo/astrid/helper/MetadataHelper.java similarity index 100% rename from astrid/src/com/todoroo/astrid/helper/MetadataHelper.java rename to astrid/src/main/java/com/todoroo/astrid/helper/MetadataHelper.java diff --git a/astrid/src/com/todoroo/astrid/helper/ProgressBarSyncResultCallback.java b/astrid/src/main/java/com/todoroo/astrid/helper/ProgressBarSyncResultCallback.java similarity index 100% rename from astrid/src/com/todoroo/astrid/helper/ProgressBarSyncResultCallback.java rename to astrid/src/main/java/com/todoroo/astrid/helper/ProgressBarSyncResultCallback.java diff --git a/astrid/src/com/todoroo/astrid/helper/SyncActionHelper.java b/astrid/src/main/java/com/todoroo/astrid/helper/SyncActionHelper.java similarity index 100% rename from astrid/src/com/todoroo/astrid/helper/SyncActionHelper.java rename to astrid/src/main/java/com/todoroo/astrid/helper/SyncActionHelper.java diff --git a/astrid/src/com/todoroo/astrid/helper/TaskAdapterAddOnManager.java b/astrid/src/main/java/com/todoroo/astrid/helper/TaskAdapterAddOnManager.java similarity index 100% rename from astrid/src/com/todoroo/astrid/helper/TaskAdapterAddOnManager.java rename to astrid/src/main/java/com/todoroo/astrid/helper/TaskAdapterAddOnManager.java diff --git a/astrid/src/com/todoroo/astrid/helper/TaskEditControlSet.java b/astrid/src/main/java/com/todoroo/astrid/helper/TaskEditControlSet.java similarity index 100% rename from astrid/src/com/todoroo/astrid/helper/TaskEditControlSet.java rename to astrid/src/main/java/com/todoroo/astrid/helper/TaskEditControlSet.java diff --git a/astrid/src/com/todoroo/astrid/helper/TaskListContextMenuExtensionLoader.java b/astrid/src/main/java/com/todoroo/astrid/helper/TaskListContextMenuExtensionLoader.java similarity index 100% rename from astrid/src/com/todoroo/astrid/helper/TaskListContextMenuExtensionLoader.java rename to astrid/src/main/java/com/todoroo/astrid/helper/TaskListContextMenuExtensionLoader.java diff --git a/astrid/src/com/todoroo/astrid/helper/UUIDHelper.java b/astrid/src/main/java/com/todoroo/astrid/helper/UUIDHelper.java similarity index 100% rename from astrid/src/com/todoroo/astrid/helper/UUIDHelper.java rename to astrid/src/main/java/com/todoroo/astrid/helper/UUIDHelper.java diff --git a/astrid/src/com/todoroo/astrid/legacy/AlarmDatabase.java b/astrid/src/main/java/com/todoroo/astrid/legacy/AlarmDatabase.java similarity index 100% rename from astrid/src/com/todoroo/astrid/legacy/AlarmDatabase.java rename to astrid/src/main/java/com/todoroo/astrid/legacy/AlarmDatabase.java diff --git a/astrid/src/com/todoroo/astrid/legacy/LegacyAlertModel.java b/astrid/src/main/java/com/todoroo/astrid/legacy/LegacyAlertModel.java similarity index 100% rename from astrid/src/com/todoroo/astrid/legacy/LegacyAlertModel.java rename to astrid/src/main/java/com/todoroo/astrid/legacy/LegacyAlertModel.java diff --git a/astrid/src/com/todoroo/astrid/legacy/LegacyImportance.java b/astrid/src/main/java/com/todoroo/astrid/legacy/LegacyImportance.java similarity index 100% rename from astrid/src/com/todoroo/astrid/legacy/LegacyImportance.java rename to astrid/src/main/java/com/todoroo/astrid/legacy/LegacyImportance.java diff --git a/astrid/src/com/todoroo/astrid/legacy/LegacyRepeatInfo.java b/astrid/src/main/java/com/todoroo/astrid/legacy/LegacyRepeatInfo.java similarity index 100% rename from astrid/src/com/todoroo/astrid/legacy/LegacyRepeatInfo.java rename to astrid/src/main/java/com/todoroo/astrid/legacy/LegacyRepeatInfo.java diff --git a/astrid/src/com/todoroo/astrid/legacy/LegacyTagModel.java b/astrid/src/main/java/com/todoroo/astrid/legacy/LegacyTagModel.java similarity index 100% rename from astrid/src/com/todoroo/astrid/legacy/LegacyTagModel.java rename to astrid/src/main/java/com/todoroo/astrid/legacy/LegacyTagModel.java diff --git a/astrid/src/com/todoroo/astrid/legacy/LegacyTaskModel.java b/astrid/src/main/java/com/todoroo/astrid/legacy/LegacyTaskModel.java similarity index 100% rename from astrid/src/com/todoroo/astrid/legacy/LegacyTaskModel.java rename to astrid/src/main/java/com/todoroo/astrid/legacy/LegacyTaskModel.java diff --git a/astrid/src/com/todoroo/astrid/legacy/TransitionalAlarm.java b/astrid/src/main/java/com/todoroo/astrid/legacy/TransitionalAlarm.java similarity index 100% rename from astrid/src/com/todoroo/astrid/legacy/TransitionalAlarm.java rename to astrid/src/main/java/com/todoroo/astrid/legacy/TransitionalAlarm.java diff --git a/astrid/src/com/todoroo/astrid/locale/LocaleEditAlerts.java b/astrid/src/main/java/com/todoroo/astrid/locale/LocaleEditAlerts.java similarity index 100% rename from astrid/src/com/todoroo/astrid/locale/LocaleEditAlerts.java rename to astrid/src/main/java/com/todoroo/astrid/locale/LocaleEditAlerts.java diff --git a/astrid/src/com/todoroo/astrid/locale/LocaleReceiver.java b/astrid/src/main/java/com/todoroo/astrid/locale/LocaleReceiver.java similarity index 100% rename from astrid/src/com/todoroo/astrid/locale/LocaleReceiver.java rename to astrid/src/main/java/com/todoroo/astrid/locale/LocaleReceiver.java diff --git a/astrid/src/com/todoroo/astrid/notes/EditNoteActivity.java b/astrid/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java similarity index 100% rename from astrid/src/com/todoroo/astrid/notes/EditNoteActivity.java rename to astrid/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java diff --git a/astrid/src/com/todoroo/astrid/notes/NoteMetadata.java b/astrid/src/main/java/com/todoroo/astrid/notes/NoteMetadata.java similarity index 100% rename from astrid/src/com/todoroo/astrid/notes/NoteMetadata.java rename to astrid/src/main/java/com/todoroo/astrid/notes/NoteMetadata.java diff --git a/astrid/src/com/todoroo/astrid/notes/NotesAction.java b/astrid/src/main/java/com/todoroo/astrid/notes/NotesAction.java similarity index 100% rename from astrid/src/com/todoroo/astrid/notes/NotesAction.java rename to astrid/src/main/java/com/todoroo/astrid/notes/NotesAction.java diff --git a/astrid/src/com/todoroo/astrid/notes/NotesDecorationExposer.java b/astrid/src/main/java/com/todoroo/astrid/notes/NotesDecorationExposer.java similarity index 100% rename from astrid/src/com/todoroo/astrid/notes/NotesDecorationExposer.java rename to astrid/src/main/java/com/todoroo/astrid/notes/NotesDecorationExposer.java diff --git a/astrid/src/com/todoroo/astrid/notes/NotesDetailExposer.java b/astrid/src/main/java/com/todoroo/astrid/notes/NotesDetailExposer.java similarity index 100% rename from astrid/src/com/todoroo/astrid/notes/NotesDetailExposer.java rename to astrid/src/main/java/com/todoroo/astrid/notes/NotesDetailExposer.java diff --git a/astrid/src/com/todoroo/astrid/notes/NotesPlugin.java b/astrid/src/main/java/com/todoroo/astrid/notes/NotesPlugin.java similarity index 100% rename from astrid/src/com/todoroo/astrid/notes/NotesPlugin.java rename to astrid/src/main/java/com/todoroo/astrid/notes/NotesPlugin.java diff --git a/astrid/src/com/todoroo/astrid/opencrx/OpencrxControlSet.java b/astrid/src/main/java/com/todoroo/astrid/opencrx/OpencrxControlSet.java similarity index 100% rename from astrid/src/com/todoroo/astrid/opencrx/OpencrxControlSet.java rename to astrid/src/main/java/com/todoroo/astrid/opencrx/OpencrxControlSet.java diff --git a/astrid/src/com/todoroo/astrid/opencrx/OpencrxCoreUtils.java b/astrid/src/main/java/com/todoroo/astrid/opencrx/OpencrxCoreUtils.java similarity index 100% rename from astrid/src/com/todoroo/astrid/opencrx/OpencrxCoreUtils.java rename to astrid/src/main/java/com/todoroo/astrid/opencrx/OpencrxCoreUtils.java diff --git a/astrid/src/com/todoroo/astrid/people/PeopleFilterAdapter.java b/astrid/src/main/java/com/todoroo/astrid/people/PeopleFilterAdapter.java similarity index 100% rename from astrid/src/com/todoroo/astrid/people/PeopleFilterAdapter.java rename to astrid/src/main/java/com/todoroo/astrid/people/PeopleFilterAdapter.java diff --git a/astrid/src/com/todoroo/astrid/people/PeopleFilterExposer.java b/astrid/src/main/java/com/todoroo/astrid/people/PeopleFilterExposer.java similarity index 100% rename from astrid/src/com/todoroo/astrid/people/PeopleFilterExposer.java rename to astrid/src/main/java/com/todoroo/astrid/people/PeopleFilterExposer.java diff --git a/astrid/src/com/todoroo/astrid/people/PeopleFilterMode.java b/astrid/src/main/java/com/todoroo/astrid/people/PeopleFilterMode.java similarity index 100% rename from astrid/src/com/todoroo/astrid/people/PeopleFilterMode.java rename to astrid/src/main/java/com/todoroo/astrid/people/PeopleFilterMode.java diff --git a/astrid/src/com/todoroo/astrid/people/PeopleListFragment.java b/astrid/src/main/java/com/todoroo/astrid/people/PeopleListFragment.java similarity index 100% rename from astrid/src/com/todoroo/astrid/people/PeopleListFragment.java rename to astrid/src/main/java/com/todoroo/astrid/people/PeopleListFragment.java diff --git a/astrid/src/com/todoroo/astrid/people/PersonViewFragment.java b/astrid/src/main/java/com/todoroo/astrid/people/PersonViewFragment.java similarity index 100% rename from astrid/src/com/todoroo/astrid/people/PersonViewFragment.java rename to astrid/src/main/java/com/todoroo/astrid/people/PersonViewFragment.java diff --git a/astrid/src/com/todoroo/astrid/provider/Astrid2TaskProvider.java b/astrid/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java similarity index 100% rename from astrid/src/com/todoroo/astrid/provider/Astrid2TaskProvider.java rename to astrid/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java diff --git a/astrid/src/com/todoroo/astrid/provider/Astrid3ContentProvider.java b/astrid/src/main/java/com/todoroo/astrid/provider/Astrid3ContentProvider.java similarity index 100% rename from astrid/src/com/todoroo/astrid/provider/Astrid3ContentProvider.java rename to astrid/src/main/java/com/todoroo/astrid/provider/Astrid3ContentProvider.java diff --git a/astrid/src/com/todoroo/astrid/provider/SqlContentProvider.java b/astrid/src/main/java/com/todoroo/astrid/provider/SqlContentProvider.java similarity index 100% rename from astrid/src/com/todoroo/astrid/provider/SqlContentProvider.java rename to astrid/src/main/java/com/todoroo/astrid/provider/SqlContentProvider.java diff --git a/astrid/src/com/todoroo/astrid/reminders/NotificationFragment.java b/astrid/src/main/java/com/todoroo/astrid/reminders/NotificationFragment.java similarity index 100% rename from astrid/src/com/todoroo/astrid/reminders/NotificationFragment.java rename to astrid/src/main/java/com/todoroo/astrid/reminders/NotificationFragment.java diff --git a/astrid/src/com/todoroo/astrid/reminders/Notifications.java b/astrid/src/main/java/com/todoroo/astrid/reminders/Notifications.java similarity index 100% rename from astrid/src/com/todoroo/astrid/reminders/Notifications.java rename to astrid/src/main/java/com/todoroo/astrid/reminders/Notifications.java diff --git a/astrid/src/com/todoroo/astrid/reminders/ReengagementFragment.java b/astrid/src/main/java/com/todoroo/astrid/reminders/ReengagementFragment.java similarity index 100% rename from astrid/src/com/todoroo/astrid/reminders/ReengagementFragment.java rename to astrid/src/main/java/com/todoroo/astrid/reminders/ReengagementFragment.java diff --git a/astrid/src/com/todoroo/astrid/reminders/ReengagementReceiver.java b/astrid/src/main/java/com/todoroo/astrid/reminders/ReengagementReceiver.java similarity index 100% rename from astrid/src/com/todoroo/astrid/reminders/ReengagementReceiver.java rename to astrid/src/main/java/com/todoroo/astrid/reminders/ReengagementReceiver.java diff --git a/astrid/src/com/todoroo/astrid/reminders/ReengagementService.java b/astrid/src/main/java/com/todoroo/astrid/reminders/ReengagementService.java similarity index 100% rename from astrid/src/com/todoroo/astrid/reminders/ReengagementService.java rename to astrid/src/main/java/com/todoroo/astrid/reminders/ReengagementService.java diff --git a/astrid/src/com/todoroo/astrid/reminders/ReminderDebugContextActions.java b/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderDebugContextActions.java similarity index 100% rename from astrid/src/com/todoroo/astrid/reminders/ReminderDebugContextActions.java rename to astrid/src/main/java/com/todoroo/astrid/reminders/ReminderDebugContextActions.java diff --git a/astrid/src/com/todoroo/astrid/reminders/ReminderDialog.java b/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderDialog.java similarity index 100% rename from astrid/src/com/todoroo/astrid/reminders/ReminderDialog.java rename to astrid/src/main/java/com/todoroo/astrid/reminders/ReminderDialog.java diff --git a/astrid/src/com/todoroo/astrid/reminders/ReminderPlugin.java b/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderPlugin.java similarity index 100% rename from astrid/src/com/todoroo/astrid/reminders/ReminderPlugin.java rename to astrid/src/main/java/com/todoroo/astrid/reminders/ReminderPlugin.java diff --git a/astrid/src/com/todoroo/astrid/reminders/ReminderPreferences.java b/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java similarity index 100% rename from astrid/src/com/todoroo/astrid/reminders/ReminderPreferences.java rename to astrid/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java diff --git a/astrid/src/com/todoroo/astrid/reminders/ReminderSchedulingService.java b/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderSchedulingService.java similarity index 100% rename from astrid/src/com/todoroo/astrid/reminders/ReminderSchedulingService.java rename to astrid/src/main/java/com/todoroo/astrid/reminders/ReminderSchedulingService.java diff --git a/astrid/src/com/todoroo/astrid/reminders/ReminderService.java b/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderService.java similarity index 100% rename from astrid/src/com/todoroo/astrid/reminders/ReminderService.java rename to astrid/src/main/java/com/todoroo/astrid/reminders/ReminderService.java diff --git a/astrid/src/com/todoroo/astrid/reminders/ReminderStartupReceiver.java b/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderStartupReceiver.java similarity index 100% rename from astrid/src/com/todoroo/astrid/reminders/ReminderStartupReceiver.java rename to astrid/src/main/java/com/todoroo/astrid/reminders/ReminderStartupReceiver.java diff --git a/astrid/src/com/todoroo/astrid/reminders/SnoozeCallback.java b/astrid/src/main/java/com/todoroo/astrid/reminders/SnoozeCallback.java similarity index 100% rename from astrid/src/com/todoroo/astrid/reminders/SnoozeCallback.java rename to astrid/src/main/java/com/todoroo/astrid/reminders/SnoozeCallback.java diff --git a/astrid/src/com/todoroo/astrid/repeats/RepeatControlSet.java b/astrid/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java similarity index 100% rename from astrid/src/com/todoroo/astrid/repeats/RepeatControlSet.java rename to astrid/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java diff --git a/astrid/src/com/todoroo/astrid/repeats/RepeatDetailExposer.java b/astrid/src/main/java/com/todoroo/astrid/repeats/RepeatDetailExposer.java similarity index 100% rename from astrid/src/com/todoroo/astrid/repeats/RepeatDetailExposer.java rename to astrid/src/main/java/com/todoroo/astrid/repeats/RepeatDetailExposer.java diff --git a/astrid/src/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java b/astrid/src/main/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java similarity index 100% rename from astrid/src/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java rename to astrid/src/main/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java diff --git a/astrid/src/com/todoroo/astrid/repeats/RepeatsPlugin.java b/astrid/src/main/java/com/todoroo/astrid/repeats/RepeatsPlugin.java similarity index 100% rename from astrid/src/com/todoroo/astrid/repeats/RepeatsPlugin.java rename to astrid/src/main/java/com/todoroo/astrid/repeats/RepeatsPlugin.java diff --git a/astrid/src/com/todoroo/astrid/service/AddOnService.java b/astrid/src/main/java/com/todoroo/astrid/service/AddOnService.java similarity index 100% rename from astrid/src/com/todoroo/astrid/service/AddOnService.java rename to astrid/src/main/java/com/todoroo/astrid/service/AddOnService.java diff --git a/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java b/astrid/src/main/java/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java similarity index 100% rename from astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java rename to astrid/src/main/java/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java diff --git a/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java b/astrid/src/main/java/com/todoroo/astrid/service/AstridDependencyInjector.java similarity index 100% rename from astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java rename to astrid/src/main/java/com/todoroo/astrid/service/AstridDependencyInjector.java diff --git a/astrid/src/com/todoroo/astrid/service/GlobalEventReceiver.java b/astrid/src/main/java/com/todoroo/astrid/service/GlobalEventReceiver.java similarity index 100% rename from astrid/src/com/todoroo/astrid/service/GlobalEventReceiver.java rename to astrid/src/main/java/com/todoroo/astrid/service/GlobalEventReceiver.java diff --git a/astrid/src/com/todoroo/astrid/service/MarketStrategy.java b/astrid/src/main/java/com/todoroo/astrid/service/MarketStrategy.java similarity index 100% rename from astrid/src/com/todoroo/astrid/service/MarketStrategy.java rename to astrid/src/main/java/com/todoroo/astrid/service/MarketStrategy.java diff --git a/astrid/src/com/todoroo/astrid/service/MetadataService.java b/astrid/src/main/java/com/todoroo/astrid/service/MetadataService.java similarity index 100% rename from astrid/src/com/todoroo/astrid/service/MetadataService.java rename to astrid/src/main/java/com/todoroo/astrid/service/MetadataService.java diff --git a/astrid/src/com/todoroo/astrid/service/StartupService.java b/astrid/src/main/java/com/todoroo/astrid/service/StartupService.java similarity index 100% rename from astrid/src/com/todoroo/astrid/service/StartupService.java rename to astrid/src/main/java/com/todoroo/astrid/service/StartupService.java diff --git a/astrid/src/com/todoroo/astrid/service/StatisticsConstants.java b/astrid/src/main/java/com/todoroo/astrid/service/StatisticsConstants.java similarity index 100% rename from astrid/src/com/todoroo/astrid/service/StatisticsConstants.java rename to astrid/src/main/java/com/todoroo/astrid/service/StatisticsConstants.java diff --git a/astrid/src/com/todoroo/astrid/service/SyncResultCallbackWrapper.java b/astrid/src/main/java/com/todoroo/astrid/service/SyncResultCallbackWrapper.java similarity index 100% rename from astrid/src/com/todoroo/astrid/service/SyncResultCallbackWrapper.java rename to astrid/src/main/java/com/todoroo/astrid/service/SyncResultCallbackWrapper.java diff --git a/astrid/src/com/todoroo/astrid/service/SyncV2Service.java b/astrid/src/main/java/com/todoroo/astrid/service/SyncV2Service.java similarity index 100% rename from astrid/src/com/todoroo/astrid/service/SyncV2Service.java rename to astrid/src/main/java/com/todoroo/astrid/service/SyncV2Service.java diff --git a/astrid/src/com/todoroo/astrid/service/TagDataService.java b/astrid/src/main/java/com/todoroo/astrid/service/TagDataService.java similarity index 100% rename from astrid/src/com/todoroo/astrid/service/TagDataService.java rename to astrid/src/main/java/com/todoroo/astrid/service/TagDataService.java diff --git a/astrid/src/com/todoroo/astrid/service/TaskService.java b/astrid/src/main/java/com/todoroo/astrid/service/TaskService.java similarity index 100% rename from astrid/src/com/todoroo/astrid/service/TaskService.java rename to astrid/src/main/java/com/todoroo/astrid/service/TaskService.java diff --git a/astrid/src/com/todoroo/astrid/service/ThemeService.java b/astrid/src/main/java/com/todoroo/astrid/service/ThemeService.java similarity index 100% rename from astrid/src/com/todoroo/astrid/service/ThemeService.java rename to astrid/src/main/java/com/todoroo/astrid/service/ThemeService.java diff --git a/astrid/src/com/todoroo/astrid/service/UpdateMessagePreference.java b/astrid/src/main/java/com/todoroo/astrid/service/UpdateMessagePreference.java similarity index 100% rename from astrid/src/com/todoroo/astrid/service/UpdateMessagePreference.java rename to astrid/src/main/java/com/todoroo/astrid/service/UpdateMessagePreference.java diff --git a/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java b/astrid/src/main/java/com/todoroo/astrid/service/UpdateMessageService.java similarity index 100% rename from astrid/src/com/todoroo/astrid/service/UpdateMessageService.java rename to astrid/src/main/java/com/todoroo/astrid/service/UpdateMessageService.java diff --git a/astrid/src/com/todoroo/astrid/service/UpdateScreenFlow.java b/astrid/src/main/java/com/todoroo/astrid/service/UpdateScreenFlow.java similarity index 100% rename from astrid/src/com/todoroo/astrid/service/UpdateScreenFlow.java rename to astrid/src/main/java/com/todoroo/astrid/service/UpdateScreenFlow.java diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/main/java/com/todoroo/astrid/service/UpgradeService.java similarity index 100% rename from astrid/src/com/todoroo/astrid/service/UpgradeService.java rename to astrid/src/main/java/com/todoroo/astrid/service/UpgradeService.java diff --git a/astrid/src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java similarity index 100% rename from astrid/src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java rename to astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java diff --git a/astrid/src/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java similarity index 100% rename from astrid/src/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java rename to astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java diff --git a/astrid/src/com/todoroo/astrid/subtasks/OrderedListFragmentHelperInterface.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedListFragmentHelperInterface.java similarity index 100% rename from astrid/src/com/todoroo/astrid/subtasks/OrderedListFragmentHelperInterface.java rename to astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedListFragmentHelperInterface.java diff --git a/astrid/src/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java similarity index 100% rename from astrid/src/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java rename to astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java diff --git a/astrid/src/com/todoroo/astrid/subtasks/OrderedMetadataListUpdater.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListUpdater.java similarity index 100% rename from astrid/src/com/todoroo/astrid/subtasks/OrderedMetadataListUpdater.java rename to astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListUpdater.java diff --git a/astrid/src/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.java similarity index 100% rename from astrid/src/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.java rename to astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.java diff --git a/astrid/src/com/todoroo/astrid/subtasks/SubtasksHelper.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java similarity index 100% rename from astrid/src/com/todoroo/astrid/subtasks/SubtasksHelper.java rename to astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java diff --git a/astrid/src/com/todoroo/astrid/subtasks/SubtasksListFragment.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java similarity index 100% rename from astrid/src/com/todoroo/astrid/subtasks/SubtasksListFragment.java rename to astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java diff --git a/astrid/src/com/todoroo/astrid/subtasks/SubtasksMetadata.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksMetadata.java similarity index 100% rename from astrid/src/com/todoroo/astrid/subtasks/SubtasksMetadata.java rename to astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksMetadata.java diff --git a/astrid/src/com/todoroo/astrid/subtasks/SubtasksMetadataMigration.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksMetadataMigration.java similarity index 100% rename from astrid/src/com/todoroo/astrid/subtasks/SubtasksMetadataMigration.java rename to astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksMetadataMigration.java diff --git a/astrid/src/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java similarity index 100% rename from astrid/src/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java rename to astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java diff --git a/astrid/src/com/todoroo/astrid/subtasks/SubtasksTagUpdater.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagUpdater.java similarity index 100% rename from astrid/src/com/todoroo/astrid/subtasks/SubtasksTagUpdater.java rename to astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagUpdater.java diff --git a/astrid/src/com/todoroo/astrid/subtasks/SubtasksUpdater.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksUpdater.java similarity index 100% rename from astrid/src/com/todoroo/astrid/subtasks/SubtasksUpdater.java rename to astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksUpdater.java diff --git a/astrid/src/com/todoroo/astrid/tags/TagCaseMigrator.java b/astrid/src/main/java/com/todoroo/astrid/tags/TagCaseMigrator.java similarity index 100% rename from astrid/src/com/todoroo/astrid/tags/TagCaseMigrator.java rename to astrid/src/main/java/com/todoroo/astrid/tags/TagCaseMigrator.java diff --git a/astrid/src/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java b/astrid/src/main/java/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java similarity index 100% rename from astrid/src/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java rename to astrid/src/main/java/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java diff --git a/astrid/src/com/todoroo/astrid/tags/TagDetailExposer.java b/astrid/src/main/java/com/todoroo/astrid/tags/TagDetailExposer.java similarity index 100% rename from astrid/src/com/todoroo/astrid/tags/TagDetailExposer.java rename to astrid/src/main/java/com/todoroo/astrid/tags/TagDetailExposer.java diff --git a/astrid/src/com/todoroo/astrid/tags/TagFilterExposer.java b/astrid/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java similarity index 100% rename from astrid/src/com/todoroo/astrid/tags/TagFilterExposer.java rename to astrid/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java diff --git a/astrid/src/com/todoroo/astrid/tags/TagMemberMetadata.java b/astrid/src/main/java/com/todoroo/astrid/tags/TagMemberMetadata.java similarity index 100% rename from astrid/src/com/todoroo/astrid/tags/TagMemberMetadata.java rename to astrid/src/main/java/com/todoroo/astrid/tags/TagMemberMetadata.java diff --git a/astrid/src/com/todoroo/astrid/tags/TagService.java b/astrid/src/main/java/com/todoroo/astrid/tags/TagService.java similarity index 100% rename from astrid/src/com/todoroo/astrid/tags/TagService.java rename to astrid/src/main/java/com/todoroo/astrid/tags/TagService.java diff --git a/astrid/src/com/todoroo/astrid/tags/TagsControlSet.java b/astrid/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java similarity index 100% rename from astrid/src/com/todoroo/astrid/tags/TagsControlSet.java rename to astrid/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java diff --git a/astrid/src/com/todoroo/astrid/tags/TagsPlugin.java b/astrid/src/main/java/com/todoroo/astrid/tags/TagsPlugin.java similarity index 100% rename from astrid/src/com/todoroo/astrid/tags/TagsPlugin.java rename to astrid/src/main/java/com/todoroo/astrid/tags/TagsPlugin.java diff --git a/astrid/src/com/todoroo/astrid/tags/TaskToTagMetadata.java b/astrid/src/main/java/com/todoroo/astrid/tags/TaskToTagMetadata.java similarity index 100% rename from astrid/src/com/todoroo/astrid/tags/TaskToTagMetadata.java rename to astrid/src/main/java/com/todoroo/astrid/tags/TaskToTagMetadata.java diff --git a/astrid/src/com/todoroo/astrid/tags/reusable/FeaturedListFilterAdapter.java b/astrid/src/main/java/com/todoroo/astrid/tags/reusable/FeaturedListFilterAdapter.java similarity index 100% rename from astrid/src/com/todoroo/astrid/tags/reusable/FeaturedListFilterAdapter.java rename to astrid/src/main/java/com/todoroo/astrid/tags/reusable/FeaturedListFilterAdapter.java diff --git a/astrid/src/com/todoroo/astrid/tags/reusable/FeaturedListFilterExposer.java b/astrid/src/main/java/com/todoroo/astrid/tags/reusable/FeaturedListFilterExposer.java similarity index 100% rename from astrid/src/com/todoroo/astrid/tags/reusable/FeaturedListFilterExposer.java rename to astrid/src/main/java/com/todoroo/astrid/tags/reusable/FeaturedListFilterExposer.java diff --git a/astrid/src/com/todoroo/astrid/tags/reusable/FeaturedListFilterMode.java b/astrid/src/main/java/com/todoroo/astrid/tags/reusable/FeaturedListFilterMode.java similarity index 100% rename from astrid/src/com/todoroo/astrid/tags/reusable/FeaturedListFilterMode.java rename to astrid/src/main/java/com/todoroo/astrid/tags/reusable/FeaturedListFilterMode.java diff --git a/astrid/src/com/todoroo/astrid/tags/reusable/FeaturedListFragment.java b/astrid/src/main/java/com/todoroo/astrid/tags/reusable/FeaturedListFragment.java similarity index 100% rename from astrid/src/com/todoroo/astrid/tags/reusable/FeaturedListFragment.java rename to astrid/src/main/java/com/todoroo/astrid/tags/reusable/FeaturedListFragment.java diff --git a/astrid/src/com/todoroo/astrid/tags/reusable/FeaturedTaskListFragment.java b/astrid/src/main/java/com/todoroo/astrid/tags/reusable/FeaturedTaskListFragment.java similarity index 100% rename from astrid/src/com/todoroo/astrid/tags/reusable/FeaturedTaskListFragment.java rename to astrid/src/main/java/com/todoroo/astrid/tags/reusable/FeaturedTaskListFragment.java diff --git a/astrid/src/com/todoroo/astrid/tags/reusable/ReusableTaskAdapter.java b/astrid/src/main/java/com/todoroo/astrid/tags/reusable/ReusableTaskAdapter.java similarity index 100% rename from astrid/src/com/todoroo/astrid/tags/reusable/ReusableTaskAdapter.java rename to astrid/src/main/java/com/todoroo/astrid/tags/reusable/ReusableTaskAdapter.java diff --git a/astrid/src/com/todoroo/astrid/timers/TimerActionControlSet.java b/astrid/src/main/java/com/todoroo/astrid/timers/TimerActionControlSet.java similarity index 100% rename from astrid/src/com/todoroo/astrid/timers/TimerActionControlSet.java rename to astrid/src/main/java/com/todoroo/astrid/timers/TimerActionControlSet.java diff --git a/astrid/src/com/todoroo/astrid/timers/TimerControlSet.java b/astrid/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java similarity index 100% rename from astrid/src/com/todoroo/astrid/timers/TimerControlSet.java rename to astrid/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java diff --git a/astrid/src/com/todoroo/astrid/timers/TimerDecorationExposer.java b/astrid/src/main/java/com/todoroo/astrid/timers/TimerDecorationExposer.java similarity index 100% rename from astrid/src/com/todoroo/astrid/timers/TimerDecorationExposer.java rename to astrid/src/main/java/com/todoroo/astrid/timers/TimerDecorationExposer.java diff --git a/astrid/src/com/todoroo/astrid/timers/TimerFilterExposer.java b/astrid/src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java similarity index 100% rename from astrid/src/com/todoroo/astrid/timers/TimerFilterExposer.java rename to astrid/src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java diff --git a/astrid/src/com/todoroo/astrid/timers/TimerPlugin.java b/astrid/src/main/java/com/todoroo/astrid/timers/TimerPlugin.java similarity index 100% rename from astrid/src/com/todoroo/astrid/timers/TimerPlugin.java rename to astrid/src/main/java/com/todoroo/astrid/timers/TimerPlugin.java diff --git a/astrid/src/com/todoroo/astrid/timers/TimerTaskCompleteListener.java b/astrid/src/main/java/com/todoroo/astrid/timers/TimerTaskCompleteListener.java similarity index 100% rename from astrid/src/com/todoroo/astrid/timers/TimerTaskCompleteListener.java rename to astrid/src/main/java/com/todoroo/astrid/timers/TimerTaskCompleteListener.java diff --git a/astrid/src/com/todoroo/astrid/ui/AstridDialog.java b/astrid/src/main/java/com/todoroo/astrid/ui/AstridDialog.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/AstridDialog.java rename to astrid/src/main/java/com/todoroo/astrid/ui/AstridDialog.java diff --git a/astrid/src/com/todoroo/astrid/ui/AstridTimePicker.java b/astrid/src/main/java/com/todoroo/astrid/ui/AstridTimePicker.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/AstridTimePicker.java rename to astrid/src/main/java/com/todoroo/astrid/ui/AstridTimePicker.java diff --git a/astrid/src/com/todoroo/astrid/ui/CalendarDialog.java b/astrid/src/main/java/com/todoroo/astrid/ui/CalendarDialog.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/CalendarDialog.java rename to astrid/src/main/java/com/todoroo/astrid/ui/CalendarDialog.java diff --git a/astrid/src/com/todoroo/astrid/ui/CalendarView.java b/astrid/src/main/java/com/todoroo/astrid/ui/CalendarView.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/CalendarView.java rename to astrid/src/main/java/com/todoroo/astrid/ui/CalendarView.java diff --git a/astrid/src/com/todoroo/astrid/ui/CheckableImageView.java b/astrid/src/main/java/com/todoroo/astrid/ui/CheckableImageView.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/CheckableImageView.java rename to astrid/src/main/java/com/todoroo/astrid/ui/CheckableImageView.java diff --git a/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java b/astrid/src/main/java/com/todoroo/astrid/ui/ContactListAdapter.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java rename to astrid/src/main/java/com/todoroo/astrid/ui/ContactListAdapter.java diff --git a/astrid/src/com/todoroo/astrid/ui/ContactsAutoComplete.java b/astrid/src/main/java/com/todoroo/astrid/ui/ContactsAutoComplete.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/ContactsAutoComplete.java rename to astrid/src/main/java/com/todoroo/astrid/ui/ContactsAutoComplete.java diff --git a/astrid/src/com/todoroo/astrid/ui/CustomBorderDrawable.java b/astrid/src/main/java/com/todoroo/astrid/ui/CustomBorderDrawable.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/CustomBorderDrawable.java rename to astrid/src/main/java/com/todoroo/astrid/ui/CustomBorderDrawable.java diff --git a/astrid/src/com/todoroo/astrid/ui/DateAndTimeDialog.java b/astrid/src/main/java/com/todoroo/astrid/ui/DateAndTimeDialog.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/DateAndTimeDialog.java rename to astrid/src/main/java/com/todoroo/astrid/ui/DateAndTimeDialog.java diff --git a/astrid/src/com/todoroo/astrid/ui/DateAndTimePicker.java b/astrid/src/main/java/com/todoroo/astrid/ui/DateAndTimePicker.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/DateAndTimePicker.java rename to astrid/src/main/java/com/todoroo/astrid/ui/DateAndTimePicker.java diff --git a/astrid/src/com/todoroo/astrid/ui/DateChangedAlerts.java b/astrid/src/main/java/com/todoroo/astrid/ui/DateChangedAlerts.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/DateChangedAlerts.java rename to astrid/src/main/java/com/todoroo/astrid/ui/DateChangedAlerts.java diff --git a/astrid/src/com/todoroo/astrid/ui/DeadlineControlSet.java b/astrid/src/main/java/com/todoroo/astrid/ui/DeadlineControlSet.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/DeadlineControlSet.java rename to astrid/src/main/java/com/todoroo/astrid/ui/DeadlineControlSet.java diff --git a/astrid/src/com/todoroo/astrid/ui/DeadlineNumberPicker.java b/astrid/src/main/java/com/todoroo/astrid/ui/DeadlineNumberPicker.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/DeadlineNumberPicker.java rename to astrid/src/main/java/com/todoroo/astrid/ui/DeadlineNumberPicker.java diff --git a/astrid/src/com/todoroo/astrid/ui/DeadlineTimePickerDialog.java b/astrid/src/main/java/com/todoroo/astrid/ui/DeadlineTimePickerDialog.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/DeadlineTimePickerDialog.java rename to astrid/src/main/java/com/todoroo/astrid/ui/DeadlineTimePickerDialog.java diff --git a/astrid/src/com/todoroo/astrid/ui/DraggableListView.java b/astrid/src/main/java/com/todoroo/astrid/ui/DraggableListView.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/DraggableListView.java rename to astrid/src/main/java/com/todoroo/astrid/ui/DraggableListView.java diff --git a/astrid/src/com/todoroo/astrid/ui/EditDialogOkBackground.java b/astrid/src/main/java/com/todoroo/astrid/ui/EditDialogOkBackground.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/EditDialogOkBackground.java rename to astrid/src/main/java/com/todoroo/astrid/ui/EditDialogOkBackground.java diff --git a/astrid/src/com/todoroo/astrid/ui/EditNotesControlSet.java b/astrid/src/main/java/com/todoroo/astrid/ui/EditNotesControlSet.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/EditNotesControlSet.java rename to astrid/src/main/java/com/todoroo/astrid/ui/EditNotesControlSet.java diff --git a/astrid/src/com/todoroo/astrid/ui/EditTitleControlSet.java b/astrid/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/EditTitleControlSet.java rename to astrid/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java diff --git a/astrid/src/com/todoroo/astrid/ui/ErrorCatchingEditText.java b/astrid/src/main/java/com/todoroo/astrid/ui/ErrorCatchingEditText.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/ErrorCatchingEditText.java rename to astrid/src/main/java/com/todoroo/astrid/ui/ErrorCatchingEditText.java diff --git a/astrid/src/com/todoroo/astrid/ui/ErrorCatchingListView.java b/astrid/src/main/java/com/todoroo/astrid/ui/ErrorCatchingListView.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/ErrorCatchingListView.java rename to astrid/src/main/java/com/todoroo/astrid/ui/ErrorCatchingListView.java diff --git a/astrid/src/com/todoroo/astrid/ui/ErrorCatchingSpinner.java b/astrid/src/main/java/com/todoroo/astrid/ui/ErrorCatchingSpinner.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/ErrorCatchingSpinner.java rename to astrid/src/main/java/com/todoroo/astrid/ui/ErrorCatchingSpinner.java diff --git a/astrid/src/com/todoroo/astrid/ui/FeedbackPromptDialogs.java b/astrid/src/main/java/com/todoroo/astrid/ui/FeedbackPromptDialogs.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/FeedbackPromptDialogs.java rename to astrid/src/main/java/com/todoroo/astrid/ui/FeedbackPromptDialogs.java diff --git a/astrid/src/com/todoroo/astrid/ui/FragmentPopover.java b/astrid/src/main/java/com/todoroo/astrid/ui/FragmentPopover.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/FragmentPopover.java rename to astrid/src/main/java/com/todoroo/astrid/ui/FragmentPopover.java diff --git a/astrid/src/com/todoroo/astrid/ui/HideUntilControlSet.java b/astrid/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/HideUntilControlSet.java rename to astrid/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java diff --git a/astrid/src/com/todoroo/astrid/ui/ImportanceControlSet.java b/astrid/src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/ImportanceControlSet.java rename to astrid/src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java diff --git a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java b/astrid/src/main/java/com/todoroo/astrid/ui/MainMenuPopover.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java rename to astrid/src/main/java/com/todoroo/astrid/ui/MainMenuPopover.java diff --git a/astrid/src/com/todoroo/astrid/ui/MultilineCheckboxPreference.java b/astrid/src/main/java/com/todoroo/astrid/ui/MultilineCheckboxPreference.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/MultilineCheckboxPreference.java rename to astrid/src/main/java/com/todoroo/astrid/ui/MultilineCheckboxPreference.java diff --git a/astrid/src/com/todoroo/astrid/ui/MultilineHelper.java b/astrid/src/main/java/com/todoroo/astrid/ui/MultilineHelper.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/MultilineHelper.java rename to astrid/src/main/java/com/todoroo/astrid/ui/MultilineHelper.java diff --git a/astrid/src/com/todoroo/astrid/ui/MultilineListPreference.java b/astrid/src/main/java/com/todoroo/astrid/ui/MultilineListPreference.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/MultilineListPreference.java rename to astrid/src/main/java/com/todoroo/astrid/ui/MultilineListPreference.java diff --git a/astrid/src/com/todoroo/astrid/ui/MultilinePreference.java b/astrid/src/main/java/com/todoroo/astrid/ui/MultilinePreference.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/MultilinePreference.java rename to astrid/src/main/java/com/todoroo/astrid/ui/MultilinePreference.java diff --git a/astrid/src/com/todoroo/astrid/ui/NNumberPickerDialog.java b/astrid/src/main/java/com/todoroo/astrid/ui/NNumberPickerDialog.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/NNumberPickerDialog.java rename to astrid/src/main/java/com/todoroo/astrid/ui/NNumberPickerDialog.java diff --git a/astrid/src/com/todoroo/astrid/ui/NestableScrollView.java b/astrid/src/main/java/com/todoroo/astrid/ui/NestableScrollView.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/NestableScrollView.java rename to astrid/src/main/java/com/todoroo/astrid/ui/NestableScrollView.java diff --git a/astrid/src/com/todoroo/astrid/ui/NestableViewPager.java b/astrid/src/main/java/com/todoroo/astrid/ui/NestableViewPager.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/NestableViewPager.java rename to astrid/src/main/java/com/todoroo/astrid/ui/NestableViewPager.java diff --git a/astrid/src/com/todoroo/astrid/ui/NestedListView.java b/astrid/src/main/java/com/todoroo/astrid/ui/NestedListView.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/NestedListView.java rename to astrid/src/main/java/com/todoroo/astrid/ui/NestedListView.java diff --git a/astrid/src/com/todoroo/astrid/ui/NumberPicker.java b/astrid/src/main/java/com/todoroo/astrid/ui/NumberPicker.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/NumberPicker.java rename to astrid/src/main/java/com/todoroo/astrid/ui/NumberPicker.java diff --git a/astrid/src/com/todoroo/astrid/ui/NumberPickerButton.java b/astrid/src/main/java/com/todoroo/astrid/ui/NumberPickerButton.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/NumberPickerButton.java rename to astrid/src/main/java/com/todoroo/astrid/ui/NumberPickerButton.java diff --git a/astrid/src/com/todoroo/astrid/ui/NumberPickerDialog.java b/astrid/src/main/java/com/todoroo/astrid/ui/NumberPickerDialog.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/NumberPickerDialog.java rename to astrid/src/main/java/com/todoroo/astrid/ui/NumberPickerDialog.java diff --git a/astrid/src/com/todoroo/astrid/ui/PeopleContainer.java b/astrid/src/main/java/com/todoroo/astrid/ui/PeopleContainer.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/PeopleContainer.java rename to astrid/src/main/java/com/todoroo/astrid/ui/PeopleContainer.java diff --git a/astrid/src/com/todoroo/astrid/ui/PopupControlSet.java b/astrid/src/main/java/com/todoroo/astrid/ui/PopupControlSet.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/PopupControlSet.java rename to astrid/src/main/java/com/todoroo/astrid/ui/PopupControlSet.java diff --git a/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java b/astrid/src/main/java/com/todoroo/astrid/ui/QuickAddBar.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/QuickAddBar.java rename to astrid/src/main/java/com/todoroo/astrid/ui/QuickAddBar.java diff --git a/astrid/src/com/todoroo/astrid/ui/RandomReminderControlSet.java b/astrid/src/main/java/com/todoroo/astrid/ui/RandomReminderControlSet.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/RandomReminderControlSet.java rename to astrid/src/main/java/com/todoroo/astrid/ui/RandomReminderControlSet.java diff --git a/astrid/src/com/todoroo/astrid/ui/ReminderControlSet.java b/astrid/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/ReminderControlSet.java rename to astrid/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java diff --git a/astrid/src/com/todoroo/astrid/ui/TaskListFragmentPager.java b/astrid/src/main/java/com/todoroo/astrid/ui/TaskListFragmentPager.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/TaskListFragmentPager.java rename to astrid/src/main/java/com/todoroo/astrid/ui/TaskListFragmentPager.java diff --git a/astrid/src/com/todoroo/astrid/ui/TextViewWithMeasureListener.java b/astrid/src/main/java/com/todoroo/astrid/ui/TextViewWithMeasureListener.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/TextViewWithMeasureListener.java rename to astrid/src/main/java/com/todoroo/astrid/ui/TextViewWithMeasureListener.java diff --git a/astrid/src/com/todoroo/astrid/ui/TimeDurationControlSet.java b/astrid/src/main/java/com/todoroo/astrid/ui/TimeDurationControlSet.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/TimeDurationControlSet.java rename to astrid/src/main/java/com/todoroo/astrid/ui/TimeDurationControlSet.java diff --git a/astrid/src/com/todoroo/astrid/ui/TouchInterceptingFrameLayout.java b/astrid/src/main/java/com/todoroo/astrid/ui/TouchInterceptingFrameLayout.java similarity index 100% rename from astrid/src/com/todoroo/astrid/ui/TouchInterceptingFrameLayout.java rename to astrid/src/main/java/com/todoroo/astrid/ui/TouchInterceptingFrameLayout.java diff --git a/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java b/astrid/src/main/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java similarity index 100% rename from astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java rename to astrid/src/main/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java diff --git a/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java b/astrid/src/main/java/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java similarity index 100% rename from astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java rename to astrid/src/main/java/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java diff --git a/astrid/src/com/todoroo/astrid/utility/AstridPreferenceSpec.java b/astrid/src/main/java/com/todoroo/astrid/utility/AstridPreferenceSpec.java similarity index 100% rename from astrid/src/com/todoroo/astrid/utility/AstridPreferenceSpec.java rename to astrid/src/main/java/com/todoroo/astrid/utility/AstridPreferenceSpec.java diff --git a/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java b/astrid/src/main/java/com/todoroo/astrid/utility/AstridPreferences.java similarity index 100% rename from astrid/src/com/todoroo/astrid/utility/AstridPreferences.java rename to astrid/src/main/java/com/todoroo/astrid/utility/AstridPreferences.java diff --git a/astrid/src/com/todoroo/astrid/utility/Constants.java b/astrid/src/main/java/com/todoroo/astrid/utility/Constants.java similarity index 100% rename from astrid/src/com/todoroo/astrid/utility/Constants.java rename to astrid/src/main/java/com/todoroo/astrid/utility/Constants.java diff --git a/astrid/src/com/todoroo/astrid/utility/Entities.java b/astrid/src/main/java/com/todoroo/astrid/utility/Entities.java similarity index 100% rename from astrid/src/com/todoroo/astrid/utility/Entities.java rename to astrid/src/main/java/com/todoroo/astrid/utility/Entities.java diff --git a/astrid/src/com/todoroo/astrid/utility/Flags.java b/astrid/src/main/java/com/todoroo/astrid/utility/Flags.java similarity index 100% rename from astrid/src/com/todoroo/astrid/utility/Flags.java rename to astrid/src/main/java/com/todoroo/astrid/utility/Flags.java diff --git a/astrid/src/com/todoroo/astrid/utility/ResourceDrawableCache.java b/astrid/src/main/java/com/todoroo/astrid/utility/ResourceDrawableCache.java similarity index 100% rename from astrid/src/com/todoroo/astrid/utility/ResourceDrawableCache.java rename to astrid/src/main/java/com/todoroo/astrid/utility/ResourceDrawableCache.java diff --git a/astrid/src/com/todoroo/astrid/utility/StringEscapeUtils.java b/astrid/src/main/java/com/todoroo/astrid/utility/StringEscapeUtils.java similarity index 100% rename from astrid/src/com/todoroo/astrid/utility/StringEscapeUtils.java rename to astrid/src/main/java/com/todoroo/astrid/utility/StringEscapeUtils.java diff --git a/astrid/src/com/todoroo/astrid/utility/SyncMetadataService.java b/astrid/src/main/java/com/todoroo/astrid/utility/SyncMetadataService.java similarity index 100% rename from astrid/src/com/todoroo/astrid/utility/SyncMetadataService.java rename to astrid/src/main/java/com/todoroo/astrid/utility/SyncMetadataService.java diff --git a/astrid/src/com/todoroo/astrid/utility/TitleParser.java b/astrid/src/main/java/com/todoroo/astrid/utility/TitleParser.java similarity index 100% rename from astrid/src/com/todoroo/astrid/utility/TitleParser.java rename to astrid/src/main/java/com/todoroo/astrid/utility/TitleParser.java diff --git a/astrid/src/com/todoroo/astrid/voice/Api6VoiceOutputAssistant.java b/astrid/src/main/java/com/todoroo/astrid/voice/Api6VoiceOutputAssistant.java similarity index 100% rename from astrid/src/com/todoroo/astrid/voice/Api6VoiceOutputAssistant.java rename to astrid/src/main/java/com/todoroo/astrid/voice/Api6VoiceOutputAssistant.java diff --git a/astrid/src/com/todoroo/astrid/voice/VoiceInputAssistant.java b/astrid/src/main/java/com/todoroo/astrid/voice/VoiceInputAssistant.java similarity index 100% rename from astrid/src/com/todoroo/astrid/voice/VoiceInputAssistant.java rename to astrid/src/main/java/com/todoroo/astrid/voice/VoiceInputAssistant.java diff --git a/astrid/src/com/todoroo/astrid/voice/VoiceOutputService.java b/astrid/src/main/java/com/todoroo/astrid/voice/VoiceOutputService.java similarity index 100% rename from astrid/src/com/todoroo/astrid/voice/VoiceOutputService.java rename to astrid/src/main/java/com/todoroo/astrid/voice/VoiceOutputService.java diff --git a/astrid/src/com/todoroo/astrid/voice/VoiceRecognizer.java b/astrid/src/main/java/com/todoroo/astrid/voice/VoiceRecognizer.java similarity index 100% rename from astrid/src/com/todoroo/astrid/voice/VoiceRecognizer.java rename to astrid/src/main/java/com/todoroo/astrid/voice/VoiceRecognizer.java diff --git a/astrid/src/com/todoroo/astrid/widget/TasksWidget.java b/astrid/src/main/java/com/todoroo/astrid/widget/TasksWidget.java similarity index 100% rename from astrid/src/com/todoroo/astrid/widget/TasksWidget.java rename to astrid/src/main/java/com/todoroo/astrid/widget/TasksWidget.java diff --git a/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java b/astrid/src/main/java/com/todoroo/astrid/widget/WidgetConfigActivity.java similarity index 100% rename from astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java rename to astrid/src/main/java/com/todoroo/astrid/widget/WidgetConfigActivity.java diff --git a/astrid/src/edu/mit/mobile/android/imagecache/DiskCache.java b/astrid/src/main/java/edu/mit/mobile/android/imagecache/DiskCache.java similarity index 100% rename from astrid/src/edu/mit/mobile/android/imagecache/DiskCache.java rename to astrid/src/main/java/edu/mit/mobile/android/imagecache/DiskCache.java diff --git a/astrid/src/edu/mit/mobile/android/imagecache/DrawableMemCache.java b/astrid/src/main/java/edu/mit/mobile/android/imagecache/DrawableMemCache.java similarity index 100% rename from astrid/src/edu/mit/mobile/android/imagecache/DrawableMemCache.java rename to astrid/src/main/java/edu/mit/mobile/android/imagecache/DrawableMemCache.java diff --git a/astrid/src/edu/mit/mobile/android/imagecache/ImageCache.java b/astrid/src/main/java/edu/mit/mobile/android/imagecache/ImageCache.java similarity index 100% rename from astrid/src/edu/mit/mobile/android/imagecache/ImageCache.java rename to astrid/src/main/java/edu/mit/mobile/android/imagecache/ImageCache.java diff --git a/astrid/src/edu/mit/mobile/android/imagecache/ImageCacheException.java b/astrid/src/main/java/edu/mit/mobile/android/imagecache/ImageCacheException.java similarity index 100% rename from astrid/src/edu/mit/mobile/android/imagecache/ImageCacheException.java rename to astrid/src/main/java/edu/mit/mobile/android/imagecache/ImageCacheException.java diff --git a/astrid/src/edu/mit/mobile/android/imagecache/KeyedLock.java b/astrid/src/main/java/edu/mit/mobile/android/imagecache/KeyedLock.java similarity index 100% rename from astrid/src/edu/mit/mobile/android/imagecache/KeyedLock.java rename to astrid/src/main/java/edu/mit/mobile/android/imagecache/KeyedLock.java diff --git a/astrid/res/anim/slide_bottom_in.xml b/astrid/src/main/res/anim/slide_bottom_in.xml similarity index 100% rename from astrid/res/anim/slide_bottom_in.xml rename to astrid/src/main/res/anim/slide_bottom_in.xml diff --git a/astrid/res/anim/slide_bottom_out.xml b/astrid/src/main/res/anim/slide_bottom_out.xml similarity index 100% rename from astrid/res/anim/slide_bottom_out.xml rename to astrid/src/main/res/anim/slide_bottom_out.xml diff --git a/astrid/res/anim/slide_left_in.xml b/astrid/src/main/res/anim/slide_left_in.xml similarity index 100% rename from astrid/res/anim/slide_left_in.xml rename to astrid/src/main/res/anim/slide_left_in.xml diff --git a/astrid/res/anim/slide_left_out.xml b/astrid/src/main/res/anim/slide_left_out.xml similarity index 100% rename from astrid/res/anim/slide_left_out.xml rename to astrid/src/main/res/anim/slide_left_out.xml diff --git a/astrid/res/anim/slide_none.xml b/astrid/src/main/res/anim/slide_none.xml similarity index 100% rename from astrid/res/anim/slide_none.xml rename to astrid/src/main/res/anim/slide_none.xml diff --git a/astrid/res/anim/slide_right_in.xml b/astrid/src/main/res/anim/slide_right_in.xml similarity index 100% rename from astrid/res/anim/slide_right_in.xml rename to astrid/src/main/res/anim/slide_right_in.xml diff --git a/astrid/res/anim/slide_right_out.xml b/astrid/src/main/res/anim/slide_right_out.xml similarity index 100% rename from astrid/res/anim/slide_right_out.xml rename to astrid/src/main/res/anim/slide_right_out.xml diff --git a/astrid/res/color/new_list_button_text.xml b/astrid/src/main/res/color/new_list_button_text.xml similarity index 100% rename from astrid/res/color/new_list_button_text.xml rename to astrid/src/main/res/color/new_list_button_text.xml diff --git a/astrid/res/color/task_edit_toggle_button_text.xml b/astrid/src/main/res/color/task_edit_toggle_button_text.xml similarity index 100% rename from astrid/res/color/task_edit_toggle_button_text.xml rename to astrid/src/main/res/color/task_edit_toggle_button_text.xml diff --git a/astrid/res/drawable-hdpi/astrid_com_logo_new.png b/astrid/src/main/res/drawable-hdpi/astrid_com_logo_new.png similarity index 100% rename from astrid/res/drawable-hdpi/astrid_com_logo_new.png rename to astrid/src/main/res/drawable-hdpi/astrid_com_logo_new.png diff --git a/astrid/res/drawable-hdpi/btn_dismiss_normal.png b/astrid/src/main/res/drawable-hdpi/btn_dismiss_normal.png similarity index 100% rename from astrid/res/drawable-hdpi/btn_dismiss_normal.png rename to astrid/src/main/res/drawable-hdpi/btn_dismiss_normal.png diff --git a/astrid/res/drawable-hdpi/btn_dismiss_normal_blue_alt.png b/astrid/src/main/res/drawable-hdpi/btn_dismiss_normal_blue_alt.png similarity index 100% rename from astrid/res/drawable-hdpi/btn_dismiss_normal_blue_alt.png rename to astrid/src/main/res/drawable-hdpi/btn_dismiss_normal_blue_alt.png diff --git a/astrid/res/drawable-hdpi/btn_dismiss_pressed.png b/astrid/src/main/res/drawable-hdpi/btn_dismiss_pressed.png similarity index 100% rename from astrid/res/drawable-hdpi/btn_dismiss_pressed.png rename to astrid/src/main/res/drawable-hdpi/btn_dismiss_pressed.png diff --git a/astrid/res/drawable-hdpi/btn_dismiss_pressed_blue_alt.png b/astrid/src/main/res/drawable-hdpi/btn_dismiss_pressed_blue_alt.png similarity index 100% rename from astrid/res/drawable-hdpi/btn_dismiss_pressed_blue_alt.png rename to astrid/src/main/res/drawable-hdpi/btn_dismiss_pressed_blue_alt.png diff --git a/astrid/res/drawable-hdpi/camera_button_normal.png b/astrid/src/main/res/drawable-hdpi/camera_button_normal.png similarity index 100% rename from astrid/res/drawable-hdpi/camera_button_normal.png rename to astrid/src/main/res/drawable-hdpi/camera_button_normal.png diff --git a/astrid/res/drawable-hdpi/camera_button_normal_blue_alt.png b/astrid/src/main/res/drawable-hdpi/camera_button_normal_blue_alt.png similarity index 100% rename from astrid/res/drawable-hdpi/camera_button_normal_blue_alt.png rename to astrid/src/main/res/drawable-hdpi/camera_button_normal_blue_alt.png diff --git a/astrid/res/drawable-hdpi/camera_button_pressed.png b/astrid/src/main/res/drawable-hdpi/camera_button_pressed.png similarity index 100% rename from astrid/res/drawable-hdpi/camera_button_pressed.png rename to astrid/src/main/res/drawable-hdpi/camera_button_pressed.png diff --git a/astrid/res/drawable-hdpi/check_box_1.png b/astrid/src/main/res/drawable-hdpi/check_box_1.png similarity index 100% rename from astrid/res/drawable-hdpi/check_box_1.png rename to astrid/src/main/res/drawable-hdpi/check_box_1.png diff --git a/astrid/res/drawable-hdpi/check_box_2.png b/astrid/src/main/res/drawable-hdpi/check_box_2.png similarity index 100% rename from astrid/res/drawable-hdpi/check_box_2.png rename to astrid/src/main/res/drawable-hdpi/check_box_2.png diff --git a/astrid/res/drawable-hdpi/check_box_3.png b/astrid/src/main/res/drawable-hdpi/check_box_3.png similarity index 100% rename from astrid/res/drawable-hdpi/check_box_3.png rename to astrid/src/main/res/drawable-hdpi/check_box_3.png diff --git a/astrid/res/drawable-hdpi/check_box_4.png b/astrid/src/main/res/drawable-hdpi/check_box_4.png similarity index 100% rename from astrid/res/drawable-hdpi/check_box_4.png rename to astrid/src/main/res/drawable-hdpi/check_box_4.png diff --git a/astrid/res/drawable-hdpi/check_box_checked_1.png b/astrid/src/main/res/drawable-hdpi/check_box_checked_1.png similarity index 100% rename from astrid/res/drawable-hdpi/check_box_checked_1.png rename to astrid/src/main/res/drawable-hdpi/check_box_checked_1.png diff --git a/astrid/res/drawable-hdpi/check_box_checked_2.png b/astrid/src/main/res/drawable-hdpi/check_box_checked_2.png similarity index 100% rename from astrid/res/drawable-hdpi/check_box_checked_2.png rename to astrid/src/main/res/drawable-hdpi/check_box_checked_2.png diff --git a/astrid/res/drawable-hdpi/check_box_checked_3.png b/astrid/src/main/res/drawable-hdpi/check_box_checked_3.png similarity index 100% rename from astrid/res/drawable-hdpi/check_box_checked_3.png rename to astrid/src/main/res/drawable-hdpi/check_box_checked_3.png diff --git a/astrid/res/drawable-hdpi/check_box_checked_4.png b/astrid/src/main/res/drawable-hdpi/check_box_checked_4.png similarity index 100% rename from astrid/res/drawable-hdpi/check_box_checked_4.png rename to astrid/src/main/res/drawable-hdpi/check_box_checked_4.png diff --git a/astrid/res/drawable-hdpi/check_box_large_1.png b/astrid/src/main/res/drawable-hdpi/check_box_large_1.png similarity index 100% rename from astrid/res/drawable-hdpi/check_box_large_1.png rename to astrid/src/main/res/drawable-hdpi/check_box_large_1.png diff --git a/astrid/res/drawable-hdpi/check_box_large_2.png b/astrid/src/main/res/drawable-hdpi/check_box_large_2.png similarity index 100% rename from astrid/res/drawable-hdpi/check_box_large_2.png rename to astrid/src/main/res/drawable-hdpi/check_box_large_2.png diff --git a/astrid/res/drawable-hdpi/check_box_large_3.png b/astrid/src/main/res/drawable-hdpi/check_box_large_3.png similarity index 100% rename from astrid/res/drawable-hdpi/check_box_large_3.png rename to astrid/src/main/res/drawable-hdpi/check_box_large_3.png diff --git a/astrid/res/drawable-hdpi/check_box_large_4.png b/astrid/src/main/res/drawable-hdpi/check_box_large_4.png similarity index 100% rename from astrid/res/drawable-hdpi/check_box_large_4.png rename to astrid/src/main/res/drawable-hdpi/check_box_large_4.png diff --git a/astrid/res/drawable-hdpi/check_box_repeat_1.png b/astrid/src/main/res/drawable-hdpi/check_box_repeat_1.png similarity index 100% rename from astrid/res/drawable-hdpi/check_box_repeat_1.png rename to astrid/src/main/res/drawable-hdpi/check_box_repeat_1.png diff --git a/astrid/res/drawable-hdpi/check_box_repeat_2.png b/astrid/src/main/res/drawable-hdpi/check_box_repeat_2.png similarity index 100% rename from astrid/res/drawable-hdpi/check_box_repeat_2.png rename to astrid/src/main/res/drawable-hdpi/check_box_repeat_2.png diff --git a/astrid/res/drawable-hdpi/check_box_repeat_3.png b/astrid/src/main/res/drawable-hdpi/check_box_repeat_3.png similarity index 100% rename from astrid/res/drawable-hdpi/check_box_repeat_3.png rename to astrid/src/main/res/drawable-hdpi/check_box_repeat_3.png diff --git a/astrid/res/drawable-hdpi/check_box_repeat_4.png b/astrid/src/main/res/drawable-hdpi/check_box_repeat_4.png similarity index 100% rename from astrid/res/drawable-hdpi/check_box_repeat_4.png rename to astrid/src/main/res/drawable-hdpi/check_box_repeat_4.png diff --git a/astrid/res/drawable-hdpi/check_box_repeat_checked_1.png b/astrid/src/main/res/drawable-hdpi/check_box_repeat_checked_1.png similarity index 100% rename from astrid/res/drawable-hdpi/check_box_repeat_checked_1.png rename to astrid/src/main/res/drawable-hdpi/check_box_repeat_checked_1.png diff --git a/astrid/res/drawable-hdpi/check_box_repeat_checked_2.png b/astrid/src/main/res/drawable-hdpi/check_box_repeat_checked_2.png similarity index 100% rename from astrid/res/drawable-hdpi/check_box_repeat_checked_2.png rename to astrid/src/main/res/drawable-hdpi/check_box_repeat_checked_2.png diff --git a/astrid/res/drawable-hdpi/check_box_repeat_checked_3.png b/astrid/src/main/res/drawable-hdpi/check_box_repeat_checked_3.png similarity index 100% rename from astrid/res/drawable-hdpi/check_box_repeat_checked_3.png rename to astrid/src/main/res/drawable-hdpi/check_box_repeat_checked_3.png diff --git a/astrid/res/drawable-hdpi/check_box_repeat_checked_4.png b/astrid/src/main/res/drawable-hdpi/check_box_repeat_checked_4.png similarity index 100% rename from astrid/res/drawable-hdpi/check_box_repeat_checked_4.png rename to astrid/src/main/res/drawable-hdpi/check_box_repeat_checked_4.png diff --git a/astrid/res/drawable-hdpi/details_alarm.png b/astrid/src/main/res/drawable-hdpi/details_alarm.png similarity index 100% rename from astrid/res/drawable-hdpi/details_alarm.png rename to astrid/src/main/res/drawable-hdpi/details_alarm.png diff --git a/astrid/res/drawable-hdpi/details_note.png b/astrid/src/main/res/drawable-hdpi/details_note.png similarity index 100% rename from astrid/res/drawable-hdpi/details_note.png rename to astrid/src/main/res/drawable-hdpi/details_note.png diff --git a/astrid/res/drawable-hdpi/details_repeat.png b/astrid/src/main/res/drawable-hdpi/details_repeat.png similarity index 100% rename from astrid/res/drawable-hdpi/details_repeat.png rename to astrid/src/main/res/drawable-hdpi/details_repeat.png diff --git a/astrid/res/drawable-hdpi/details_tag.png b/astrid/src/main/res/drawable-hdpi/details_tag.png similarity index 100% rename from astrid/res/drawable-hdpi/details_tag.png rename to astrid/src/main/res/drawable-hdpi/details_tag.png diff --git a/astrid/res/drawable-hdpi/dialog_full_holo_dark.9.png b/astrid/src/main/res/drawable-hdpi/dialog_full_holo_dark.9.png similarity index 100% rename from astrid/res/drawable-hdpi/dialog_full_holo_dark.9.png rename to astrid/src/main/res/drawable-hdpi/dialog_full_holo_dark.9.png diff --git a/astrid/res/drawable-hdpi/dialog_full_holo_light.9.png b/astrid/src/main/res/drawable-hdpi/dialog_full_holo_light.9.png similarity index 100% rename from astrid/res/drawable-hdpi/dialog_full_holo_light.9.png rename to astrid/src/main/res/drawable-hdpi/dialog_full_holo_light.9.png diff --git a/astrid/res/drawable-hdpi/directory_icon.png b/astrid/src/main/res/drawable-hdpi/directory_icon.png similarity index 100% rename from astrid/res/drawable-hdpi/directory_icon.png rename to astrid/src/main/res/drawable-hdpi/directory_icon.png diff --git a/astrid/res/drawable-hdpi/directory_up.png b/astrid/src/main/res/drawable-hdpi/directory_up.png similarity index 100% rename from astrid/res/drawable-hdpi/directory_up.png rename to astrid/src/main/res/drawable-hdpi/directory_up.png diff --git a/astrid/res/drawable-hdpi/facebook.png b/astrid/src/main/res/drawable-hdpi/facebook.png similarity index 100% rename from astrid/res/drawable-hdpi/facebook.png rename to astrid/src/main/res/drawable-hdpi/facebook.png diff --git a/astrid/res/drawable-hdpi/fb_login_background.9.png b/astrid/src/main/res/drawable-hdpi/fb_login_background.9.png similarity index 100% rename from astrid/res/drawable-hdpi/fb_login_background.9.png rename to astrid/src/main/res/drawable-hdpi/fb_login_background.9.png diff --git a/astrid/res/drawable-hdpi/file_icon.png b/astrid/src/main/res/drawable-hdpi/file_icon.png similarity index 100% rename from astrid/res/drawable-hdpi/file_icon.png rename to astrid/src/main/res/drawable-hdpi/file_icon.png diff --git a/astrid/res/drawable-hdpi/filter_btn_background.9.png b/astrid/src/main/res/drawable-hdpi/filter_btn_background.9.png similarity index 100% rename from astrid/res/drawable-hdpi/filter_btn_background.9.png rename to astrid/src/main/res/drawable-hdpi/filter_btn_background.9.png diff --git a/astrid/res/drawable-hdpi/filter_plus_button.png b/astrid/src/main/res/drawable-hdpi/filter_plus_button.png similarity index 100% rename from astrid/res/drawable-hdpi/filter_plus_button.png rename to astrid/src/main/res/drawable-hdpi/filter_plus_button.png diff --git a/astrid/res/drawable-hdpi/footer_button_normal.png b/astrid/src/main/res/drawable-hdpi/footer_button_normal.png similarity index 100% rename from astrid/res/drawable-hdpi/footer_button_normal.png rename to astrid/src/main/res/drawable-hdpi/footer_button_normal.png diff --git a/astrid/res/drawable-hdpi/footer_button_pressed.png b/astrid/src/main/res/drawable-hdpi/footer_button_pressed.png similarity index 100% rename from astrid/res/drawable-hdpi/footer_button_pressed.png rename to astrid/src/main/res/drawable-hdpi/footer_button_pressed.png diff --git a/astrid/res/drawable-hdpi/footer_button_selected.png b/astrid/src/main/res/drawable-hdpi/footer_button_selected.png similarity index 100% rename from astrid/res/drawable-hdpi/footer_button_selected.png rename to astrid/src/main/res/drawable-hdpi/footer_button_selected.png diff --git a/astrid/res/drawable-hdpi/footer_editbutton_normal.9.png b/astrid/src/main/res/drawable-hdpi/footer_editbutton_normal.9.png similarity index 100% rename from astrid/res/drawable-hdpi/footer_editbutton_normal.9.png rename to astrid/src/main/res/drawable-hdpi/footer_editbutton_normal.9.png diff --git a/astrid/res/drawable-hdpi/footer_editbutton_pressed.9.png b/astrid/src/main/res/drawable-hdpi/footer_editbutton_pressed.9.png similarity index 100% rename from astrid/res/drawable-hdpi/footer_editbutton_pressed.9.png rename to astrid/src/main/res/drawable-hdpi/footer_editbutton_pressed.9.png diff --git a/astrid/res/drawable-hdpi/footer_edittext_focus.9.png b/astrid/src/main/res/drawable-hdpi/footer_edittext_focus.9.png similarity index 100% rename from astrid/res/drawable-hdpi/footer_edittext_focus.9.png rename to astrid/src/main/res/drawable-hdpi/footer_edittext_focus.9.png diff --git a/astrid/res/drawable-hdpi/footer_edittext_normal.9.png b/astrid/src/main/res/drawable-hdpi/footer_edittext_normal.9.png similarity index 100% rename from astrid/res/drawable-hdpi/footer_edittext_normal.9.png rename to astrid/src/main/res/drawable-hdpi/footer_edittext_normal.9.png diff --git a/astrid/res/drawable-hdpi/gl_more.png b/astrid/src/main/res/drawable-hdpi/gl_more.png similarity index 100% rename from astrid/res/drawable-hdpi/gl_more.png rename to astrid/src/main/res/drawable-hdpi/gl_more.png diff --git a/astrid/res/drawable-hdpi/gl_pencil.png b/astrid/src/main/res/drawable-hdpi/gl_pencil.png similarity index 100% rename from astrid/res/drawable-hdpi/gl_pencil.png rename to astrid/src/main/res/drawable-hdpi/gl_pencil.png diff --git a/astrid/res/drawable-hdpi/google.png b/astrid/src/main/res/drawable-hdpi/google.png similarity index 100% rename from astrid/res/drawable-hdpi/google.png rename to astrid/src/main/res/drawable-hdpi/google.png diff --git a/astrid/res/drawable-hdpi/google_login_background.9.png b/astrid/src/main/res/drawable-hdpi/google_login_background.9.png similarity index 100% rename from astrid/res/drawable-hdpi/google_login_background.9.png rename to astrid/src/main/res/drawable-hdpi/google_login_background.9.png diff --git a/astrid/res/drawable-hdpi/header_background.png b/astrid/src/main/res/drawable-hdpi/header_background.png similarity index 100% rename from astrid/res/drawable-hdpi/header_background.png rename to astrid/src/main/res/drawable-hdpi/header_background.png diff --git a/astrid/res/drawable-hdpi/header_blue.9.png b/astrid/src/main/res/drawable-hdpi/header_blue.9.png similarity index 100% rename from astrid/res/drawable-hdpi/header_blue.9.png rename to astrid/src/main/res/drawable-hdpi/header_blue.9.png diff --git a/astrid/res/drawable-hdpi/header_blue_alt.9.png b/astrid/src/main/res/drawable-hdpi/header_blue_alt.9.png similarity index 100% rename from astrid/res/drawable-hdpi/header_blue_alt.9.png rename to astrid/src/main/res/drawable-hdpi/header_blue_alt.9.png diff --git a/astrid/res/drawable-hdpi/header_day_blue.9.png b/astrid/src/main/res/drawable-hdpi/header_day_blue.9.png similarity index 100% rename from astrid/res/drawable-hdpi/header_day_blue.9.png rename to astrid/src/main/res/drawable-hdpi/header_day_blue.9.png diff --git a/astrid/res/drawable-hdpi/header_red.9.png b/astrid/src/main/res/drawable-hdpi/header_red.9.png similarity index 100% rename from astrid/res/drawable-hdpi/header_red.9.png rename to astrid/src/main/res/drawable-hdpi/header_red.9.png diff --git a/astrid/res/drawable-hdpi/home_button_blue.png b/astrid/src/main/res/drawable-hdpi/home_button_blue.png similarity index 100% rename from astrid/res/drawable-hdpi/home_button_blue.png rename to astrid/src/main/res/drawable-hdpi/home_button_blue.png diff --git a/astrid/res/drawable-hdpi/home_button_blue_alt.png b/astrid/src/main/res/drawable-hdpi/home_button_blue_alt.png similarity index 100% rename from astrid/res/drawable-hdpi/home_button_blue_alt.png rename to astrid/src/main/res/drawable-hdpi/home_button_blue_alt.png diff --git a/astrid/res/drawable-hdpi/home_button_dark_blue.png b/astrid/src/main/res/drawable-hdpi/home_button_dark_blue.png similarity index 100% rename from astrid/res/drawable-hdpi/home_button_dark_blue.png rename to astrid/src/main/res/drawable-hdpi/home_button_dark_blue.png diff --git a/astrid/res/drawable-hdpi/home_button_red.png b/astrid/src/main/res/drawable-hdpi/home_button_red.png similarity index 100% rename from astrid/res/drawable-hdpi/home_button_red.png rename to astrid/src/main/res/drawable-hdpi/home_button_red.png diff --git a/astrid/res/drawable-hdpi/ic_menu_attach.png b/astrid/src/main/res/drawable-hdpi/ic_menu_attach.png similarity index 100% rename from astrid/res/drawable-hdpi/ic_menu_attach.png rename to astrid/src/main/res/drawable-hdpi/ic_menu_attach.png diff --git a/astrid/res/drawable-hdpi/ic_menu_attach_blue_alt.png b/astrid/src/main/res/drawable-hdpi/ic_menu_attach_blue_alt.png similarity index 100% rename from astrid/res/drawable-hdpi/ic_menu_attach_blue_alt.png rename to astrid/src/main/res/drawable-hdpi/ic_menu_attach_blue_alt.png diff --git a/astrid/res/drawable-hdpi/ic_menu_camera.png b/astrid/src/main/res/drawable-hdpi/ic_menu_camera.png similarity index 100% rename from astrid/res/drawable-hdpi/ic_menu_camera.png rename to astrid/src/main/res/drawable-hdpi/ic_menu_camera.png diff --git a/astrid/res/drawable-hdpi/ic_menu_camera_blue_alt.png b/astrid/src/main/res/drawable-hdpi/ic_menu_camera_blue_alt.png similarity index 100% rename from astrid/res/drawable-hdpi/ic_menu_camera_blue_alt.png rename to astrid/src/main/res/drawable-hdpi/ic_menu_camera_blue_alt.png diff --git a/astrid/res/drawable-hdpi/ic_menu_close.png b/astrid/src/main/res/drawable-hdpi/ic_menu_close.png similarity index 100% rename from astrid/res/drawable-hdpi/ic_menu_close.png rename to astrid/src/main/res/drawable-hdpi/ic_menu_close.png diff --git a/astrid/res/drawable-hdpi/ic_menu_close_blue_alt.png b/astrid/src/main/res/drawable-hdpi/ic_menu_close_blue_alt.png similarity index 100% rename from astrid/res/drawable-hdpi/ic_menu_close_blue_alt.png rename to astrid/src/main/res/drawable-hdpi/ic_menu_close_blue_alt.png diff --git a/astrid/res/drawable-hdpi/ic_menu_list_copy.png b/astrid/src/main/res/drawable-hdpi/ic_menu_list_copy.png similarity index 100% rename from astrid/res/drawable-hdpi/ic_menu_list_copy.png rename to astrid/src/main/res/drawable-hdpi/ic_menu_list_copy.png diff --git a/astrid/res/drawable-hdpi/ic_menu_list_copy_blue_alt.png b/astrid/src/main/res/drawable-hdpi/ic_menu_list_copy_blue_alt.png similarity index 100% rename from astrid/res/drawable-hdpi/ic_menu_list_copy_blue_alt.png rename to astrid/src/main/res/drawable-hdpi/ic_menu_list_copy_blue_alt.png diff --git a/astrid/res/drawable-hdpi/ic_menu_mic.png b/astrid/src/main/res/drawable-hdpi/ic_menu_mic.png similarity index 100% rename from astrid/res/drawable-hdpi/ic_menu_mic.png rename to astrid/src/main/res/drawable-hdpi/ic_menu_mic.png diff --git a/astrid/res/drawable-hdpi/ic_menu_mic_blue_alt.png b/astrid/src/main/res/drawable-hdpi/ic_menu_mic_blue_alt.png similarity index 100% rename from astrid/res/drawable-hdpi/ic_menu_mic_blue_alt.png rename to astrid/src/main/res/drawable-hdpi/ic_menu_mic_blue_alt.png diff --git a/astrid/res/drawable-hdpi/ic_menu_save.png b/astrid/src/main/res/drawable-hdpi/ic_menu_save.png similarity index 100% rename from astrid/res/drawable-hdpi/ic_menu_save.png rename to astrid/src/main/res/drawable-hdpi/ic_menu_save.png diff --git a/astrid/res/drawable-hdpi/ic_menu_save_blue_alt.png b/astrid/src/main/res/drawable-hdpi/ic_menu_save_blue_alt.png similarity index 100% rename from astrid/res/drawable-hdpi/ic_menu_save_blue_alt.png rename to astrid/src/main/res/drawable-hdpi/ic_menu_save_blue_alt.png diff --git a/astrid/res/drawable-hdpi/icn_clone_down.png b/astrid/src/main/res/drawable-hdpi/icn_clone_down.png similarity index 100% rename from astrid/res/drawable-hdpi/icn_clone_down.png rename to astrid/src/main/res/drawable-hdpi/icn_clone_down.png diff --git a/astrid/res/drawable-hdpi/icn_clone_up.png b/astrid/src/main/res/drawable-hdpi/icn_clone_up.png similarity index 100% rename from astrid/res/drawable-hdpi/icn_clone_up.png rename to astrid/src/main/res/drawable-hdpi/icn_clone_up.png diff --git a/astrid/res/drawable-hdpi/icn_featured_lists.png b/astrid/src/main/res/drawable-hdpi/icn_featured_lists.png similarity index 100% rename from astrid/res/drawable-hdpi/icn_featured_lists.png rename to astrid/src/main/res/drawable-hdpi/icn_featured_lists.png diff --git a/astrid/res/drawable-hdpi/icn_featured_lists_dark.png b/astrid/src/main/res/drawable-hdpi/icn_featured_lists_dark.png similarity index 100% rename from astrid/res/drawable-hdpi/icn_featured_lists_dark.png rename to astrid/src/main/res/drawable-hdpi/icn_featured_lists_dark.png diff --git a/astrid/res/drawable-hdpi/icn_menu_filters.png b/astrid/src/main/res/drawable-hdpi/icn_menu_filters.png similarity index 100% rename from astrid/res/drawable-hdpi/icn_menu_filters.png rename to astrid/src/main/res/drawable-hdpi/icn_menu_filters.png diff --git a/astrid/res/drawable-hdpi/icn_menu_filters_dark.png b/astrid/src/main/res/drawable-hdpi/icn_menu_filters_dark.png similarity index 100% rename from astrid/res/drawable-hdpi/icn_menu_filters_dark.png rename to astrid/src/main/res/drawable-hdpi/icn_menu_filters_dark.png diff --git a/astrid/res/drawable-hdpi/icn_menu_lists.png b/astrid/src/main/res/drawable-hdpi/icn_menu_lists.png similarity index 100% rename from astrid/res/drawable-hdpi/icn_menu_lists.png rename to astrid/src/main/res/drawable-hdpi/icn_menu_lists.png diff --git a/astrid/res/drawable-hdpi/icn_menu_lists_dark.png b/astrid/src/main/res/drawable-hdpi/icn_menu_lists_dark.png similarity index 100% rename from astrid/res/drawable-hdpi/icn_menu_lists_dark.png rename to astrid/src/main/res/drawable-hdpi/icn_menu_lists_dark.png diff --git a/astrid/res/drawable-hdpi/icn_menu_plugins.png b/astrid/src/main/res/drawable-hdpi/icn_menu_plugins.png similarity index 100% rename from astrid/res/drawable-hdpi/icn_menu_plugins.png rename to astrid/src/main/res/drawable-hdpi/icn_menu_plugins.png diff --git a/astrid/res/drawable-hdpi/icn_menu_plugins_dark.png b/astrid/src/main/res/drawable-hdpi/icn_menu_plugins_dark.png similarity index 100% rename from astrid/res/drawable-hdpi/icn_menu_plugins_dark.png rename to astrid/src/main/res/drawable-hdpi/icn_menu_plugins_dark.png diff --git a/astrid/res/drawable-hdpi/icn_menu_refresh.png b/astrid/src/main/res/drawable-hdpi/icn_menu_refresh.png similarity index 100% rename from astrid/res/drawable-hdpi/icn_menu_refresh.png rename to astrid/src/main/res/drawable-hdpi/icn_menu_refresh.png diff --git a/astrid/res/drawable-hdpi/icn_menu_refresh_dark.png b/astrid/src/main/res/drawable-hdpi/icn_menu_refresh_dark.png similarity index 100% rename from astrid/res/drawable-hdpi/icn_menu_refresh_dark.png rename to astrid/src/main/res/drawable-hdpi/icn_menu_refresh_dark.png diff --git a/astrid/res/drawable-hdpi/icn_menu_refresh_tablet.png b/astrid/src/main/res/drawable-hdpi/icn_menu_refresh_tablet.png similarity index 100% rename from astrid/res/drawable-hdpi/icn_menu_refresh_tablet.png rename to astrid/src/main/res/drawable-hdpi/icn_menu_refresh_tablet.png diff --git a/astrid/res/drawable-hdpi/icn_menu_search.png b/astrid/src/main/res/drawable-hdpi/icn_menu_search.png similarity index 100% rename from astrid/res/drawable-hdpi/icn_menu_search.png rename to astrid/src/main/res/drawable-hdpi/icn_menu_search.png diff --git a/astrid/res/drawable-hdpi/icn_menu_search_dark.png b/astrid/src/main/res/drawable-hdpi/icn_menu_search_dark.png similarity index 100% rename from astrid/res/drawable-hdpi/icn_menu_search_dark.png rename to astrid/src/main/res/drawable-hdpi/icn_menu_search_dark.png diff --git a/astrid/res/drawable-hdpi/icn_menu_settings.png b/astrid/src/main/res/drawable-hdpi/icn_menu_settings.png similarity index 100% rename from astrid/res/drawable-hdpi/icn_menu_settings.png rename to astrid/src/main/res/drawable-hdpi/icn_menu_settings.png diff --git a/astrid/res/drawable-hdpi/icn_menu_settings_dark.png b/astrid/src/main/res/drawable-hdpi/icn_menu_settings_dark.png similarity index 100% rename from astrid/res/drawable-hdpi/icn_menu_settings_dark.png rename to astrid/src/main/res/drawable-hdpi/icn_menu_settings_dark.png diff --git a/astrid/res/drawable-hdpi/icn_menu_sort_by_size.png b/astrid/src/main/res/drawable-hdpi/icn_menu_sort_by_size.png similarity index 100% rename from astrid/res/drawable-hdpi/icn_menu_sort_by_size.png rename to astrid/src/main/res/drawable-hdpi/icn_menu_sort_by_size.png diff --git a/astrid/res/drawable-hdpi/icn_menu_sort_by_size_dark.png b/astrid/src/main/res/drawable-hdpi/icn_menu_sort_by_size_dark.png similarity index 100% rename from astrid/res/drawable-hdpi/icn_menu_sort_by_size_dark.png rename to astrid/src/main/res/drawable-hdpi/icn_menu_sort_by_size_dark.png diff --git a/astrid/res/drawable-hdpi/icn_menu_support.png b/astrid/src/main/res/drawable-hdpi/icn_menu_support.png similarity index 100% rename from astrid/res/drawable-hdpi/icn_menu_support.png rename to astrid/src/main/res/drawable-hdpi/icn_menu_support.png diff --git a/astrid/res/drawable-hdpi/icn_menu_support_dark.png b/astrid/src/main/res/drawable-hdpi/icn_menu_support_dark.png similarity index 100% rename from astrid/res/drawable-hdpi/icn_menu_support_dark.png rename to astrid/src/main/res/drawable-hdpi/icn_menu_support_dark.png diff --git a/astrid/res/drawable-hdpi/icn_menu_tutorial.png b/astrid/src/main/res/drawable-hdpi/icn_menu_tutorial.png similarity index 100% rename from astrid/res/drawable-hdpi/icn_menu_tutorial.png rename to astrid/src/main/res/drawable-hdpi/icn_menu_tutorial.png diff --git a/astrid/res/drawable-hdpi/icn_thumbsdown.png b/astrid/src/main/res/drawable-hdpi/icn_thumbsdown.png similarity index 100% rename from astrid/res/drawable-hdpi/icn_thumbsdown.png rename to astrid/src/main/res/drawable-hdpi/icn_thumbsdown.png diff --git a/astrid/res/drawable-hdpi/icn_thumbsup.png b/astrid/src/main/res/drawable-hdpi/icn_thumbsup.png similarity index 100% rename from astrid/res/drawable-hdpi/icn_thumbsup.png rename to astrid/src/main/res/drawable-hdpi/icn_thumbsup.png diff --git a/astrid/res/drawable-hdpi/icon.png b/astrid/src/main/res/drawable-hdpi/icon.png similarity index 100% rename from astrid/res/drawable-hdpi/icon.png rename to astrid/src/main/res/drawable-hdpi/icon.png diff --git a/astrid/res/drawable-hdpi/icon_32.png b/astrid/src/main/res/drawable-hdpi/icon_32.png similarity index 100% rename from astrid/res/drawable-hdpi/icon_32.png rename to astrid/src/main/res/drawable-hdpi/icon_32.png diff --git a/astrid/res/drawable-hdpi/icon_48.png b/astrid/src/main/res/drawable-hdpi/icon_48.png similarity index 100% rename from astrid/res/drawable-hdpi/icon_48.png rename to astrid/src/main/res/drawable-hdpi/icon_48.png diff --git a/astrid/res/drawable-hdpi/icon_pp.png b/astrid/src/main/res/drawable-hdpi/icon_pp.png similarity index 100% rename from astrid/res/drawable-hdpi/icon_pp.png rename to astrid/src/main/res/drawable-hdpi/icon_pp.png diff --git a/astrid/res/drawable-hdpi/icon_simple.png b/astrid/src/main/res/drawable-hdpi/icon_simple.png similarity index 100% rename from astrid/res/drawable-hdpi/icon_simple.png rename to astrid/src/main/res/drawable-hdpi/icon_simple.png diff --git a/astrid/res/drawable-hdpi/icon_simple_32.png b/astrid/src/main/res/drawable-hdpi/icon_simple_32.png similarity index 100% rename from astrid/res/drawable-hdpi/icon_simple_32.png rename to astrid/src/main/res/drawable-hdpi/icon_simple_32.png diff --git a/astrid/res/drawable-hdpi/icon_simple_48.png b/astrid/src/main/res/drawable-hdpi/icon_simple_48.png similarity index 100% rename from astrid/res/drawable-hdpi/icon_simple_48.png rename to astrid/src/main/res/drawable-hdpi/icon_simple_48.png diff --git a/astrid/res/drawable-hdpi/list_settings.png b/astrid/src/main/res/drawable-hdpi/list_settings.png similarity index 100% rename from astrid/res/drawable-hdpi/list_settings.png rename to astrid/src/main/res/drawable-hdpi/list_settings.png diff --git a/astrid/res/drawable-hdpi/list_settings_white.png b/astrid/src/main/res/drawable-hdpi/list_settings_white.png similarity index 100% rename from astrid/res/drawable-hdpi/list_settings_white.png rename to astrid/src/main/res/drawable-hdpi/list_settings_white.png diff --git a/astrid/res/drawable-hdpi/lists_disclosure_blue_off.png b/astrid/src/main/res/drawable-hdpi/lists_disclosure_blue_off.png similarity index 100% rename from astrid/res/drawable-hdpi/lists_disclosure_blue_off.png rename to astrid/src/main/res/drawable-hdpi/lists_disclosure_blue_off.png diff --git a/astrid/res/drawable-hdpi/lists_disclosure_blue_on.png b/astrid/src/main/res/drawable-hdpi/lists_disclosure_blue_on.png similarity index 100% rename from astrid/res/drawable-hdpi/lists_disclosure_blue_on.png rename to astrid/src/main/res/drawable-hdpi/lists_disclosure_blue_on.png diff --git a/astrid/res/drawable-hdpi/lists_disclosure_dark_blue_off.png b/astrid/src/main/res/drawable-hdpi/lists_disclosure_dark_blue_off.png similarity index 100% rename from astrid/res/drawable-hdpi/lists_disclosure_dark_blue_off.png rename to astrid/src/main/res/drawable-hdpi/lists_disclosure_dark_blue_off.png diff --git a/astrid/res/drawable-hdpi/lists_disclosure_dark_blue_on.png b/astrid/src/main/res/drawable-hdpi/lists_disclosure_dark_blue_on.png similarity index 100% rename from astrid/res/drawable-hdpi/lists_disclosure_dark_blue_on.png rename to astrid/src/main/res/drawable-hdpi/lists_disclosure_dark_blue_on.png diff --git a/astrid/res/drawable-hdpi/lists_disclosure_red_off.png b/astrid/src/main/res/drawable-hdpi/lists_disclosure_red_off.png similarity index 100% rename from astrid/res/drawable-hdpi/lists_disclosure_red_off.png rename to astrid/src/main/res/drawable-hdpi/lists_disclosure_red_off.png diff --git a/astrid/res/drawable-hdpi/lists_disclosure_red_on.png b/astrid/src/main/res/drawable-hdpi/lists_disclosure_red_on.png similarity index 100% rename from astrid/res/drawable-hdpi/lists_disclosure_red_on.png rename to astrid/src/main/res/drawable-hdpi/lists_disclosure_red_on.png diff --git a/astrid/res/drawable-hdpi/menu_button_blue_alt_off.png b/astrid/src/main/res/drawable-hdpi/menu_button_blue_alt_off.png similarity index 100% rename from astrid/res/drawable-hdpi/menu_button_blue_alt_off.png rename to astrid/src/main/res/drawable-hdpi/menu_button_blue_alt_off.png diff --git a/astrid/res/drawable-hdpi/menu_button_blue_alt_on.png b/astrid/src/main/res/drawable-hdpi/menu_button_blue_alt_on.png similarity index 100% rename from astrid/res/drawable-hdpi/menu_button_blue_alt_on.png rename to astrid/src/main/res/drawable-hdpi/menu_button_blue_alt_on.png diff --git a/astrid/res/drawable-hdpi/menu_button_blue_off.png b/astrid/src/main/res/drawable-hdpi/menu_button_blue_off.png similarity index 100% rename from astrid/res/drawable-hdpi/menu_button_blue_off.png rename to astrid/src/main/res/drawable-hdpi/menu_button_blue_off.png diff --git a/astrid/res/drawable-hdpi/menu_button_blue_on.png b/astrid/src/main/res/drawable-hdpi/menu_button_blue_on.png similarity index 100% rename from astrid/res/drawable-hdpi/menu_button_blue_on.png rename to astrid/src/main/res/drawable-hdpi/menu_button_blue_on.png diff --git a/astrid/res/drawable-hdpi/menu_button_dark_blue_off.png b/astrid/src/main/res/drawable-hdpi/menu_button_dark_blue_off.png similarity index 100% rename from astrid/res/drawable-hdpi/menu_button_dark_blue_off.png rename to astrid/src/main/res/drawable-hdpi/menu_button_dark_blue_off.png diff --git a/astrid/res/drawable-hdpi/menu_button_dark_blue_on.png b/astrid/src/main/res/drawable-hdpi/menu_button_dark_blue_on.png similarity index 100% rename from astrid/res/drawable-hdpi/menu_button_dark_blue_on.png rename to astrid/src/main/res/drawable-hdpi/menu_button_dark_blue_on.png diff --git a/astrid/res/drawable-hdpi/menu_button_red_off.png b/astrid/src/main/res/drawable-hdpi/menu_button_red_off.png similarity index 100% rename from astrid/res/drawable-hdpi/menu_button_red_off.png rename to astrid/src/main/res/drawable-hdpi/menu_button_red_off.png diff --git a/astrid/res/drawable-hdpi/menu_button_red_on.png b/astrid/src/main/res/drawable-hdpi/menu_button_red_on.png similarity index 100% rename from astrid/res/drawable-hdpi/menu_button_red_on.png rename to astrid/src/main/res/drawable-hdpi/menu_button_red_on.png diff --git a/astrid/res/drawable-hdpi/mic_button_blue_normal.png b/astrid/src/main/res/drawable-hdpi/mic_button_blue_normal.png similarity index 100% rename from astrid/res/drawable-hdpi/mic_button_blue_normal.png rename to astrid/src/main/res/drawable-hdpi/mic_button_blue_normal.png diff --git a/astrid/res/drawable-hdpi/mic_button_blue_pressed.png b/astrid/src/main/res/drawable-hdpi/mic_button_blue_pressed.png similarity index 100% rename from astrid/res/drawable-hdpi/mic_button_blue_pressed.png rename to astrid/src/main/res/drawable-hdpi/mic_button_blue_pressed.png diff --git a/astrid/res/drawable-hdpi/mic_button_dark_blue_normal.png b/astrid/src/main/res/drawable-hdpi/mic_button_dark_blue_normal.png similarity index 100% rename from astrid/res/drawable-hdpi/mic_button_dark_blue_normal.png rename to astrid/src/main/res/drawable-hdpi/mic_button_dark_blue_normal.png diff --git a/astrid/res/drawable-hdpi/mic_button_dark_blue_pressed.png b/astrid/src/main/res/drawable-hdpi/mic_button_dark_blue_pressed.png similarity index 100% rename from astrid/res/drawable-hdpi/mic_button_dark_blue_pressed.png rename to astrid/src/main/res/drawable-hdpi/mic_button_dark_blue_pressed.png diff --git a/astrid/res/drawable-hdpi/mic_button_red_normal.png b/astrid/src/main/res/drawable-hdpi/mic_button_red_normal.png similarity index 100% rename from astrid/res/drawable-hdpi/mic_button_red_normal.png rename to astrid/src/main/res/drawable-hdpi/mic_button_red_normal.png diff --git a/astrid/res/drawable-hdpi/mic_button_red_pressed.png b/astrid/src/main/res/drawable-hdpi/mic_button_red_pressed.png similarity index 100% rename from astrid/res/drawable-hdpi/mic_button_red_pressed.png rename to astrid/src/main/res/drawable-hdpi/mic_button_red_pressed.png diff --git a/astrid/res/drawable-hdpi/people_menu_button_blue_alt_off.png b/astrid/src/main/res/drawable-hdpi/people_menu_button_blue_alt_off.png similarity index 100% rename from astrid/res/drawable-hdpi/people_menu_button_blue_alt_off.png rename to astrid/src/main/res/drawable-hdpi/people_menu_button_blue_alt_off.png diff --git a/astrid/res/drawable-hdpi/people_menu_button_blue_alt_on.png b/astrid/src/main/res/drawable-hdpi/people_menu_button_blue_alt_on.png similarity index 100% rename from astrid/res/drawable-hdpi/people_menu_button_blue_alt_on.png rename to astrid/src/main/res/drawable-hdpi/people_menu_button_blue_alt_on.png diff --git a/astrid/res/drawable-hdpi/people_menu_button_blue_off.png b/astrid/src/main/res/drawable-hdpi/people_menu_button_blue_off.png similarity index 100% rename from astrid/res/drawable-hdpi/people_menu_button_blue_off.png rename to astrid/src/main/res/drawable-hdpi/people_menu_button_blue_off.png diff --git a/astrid/res/drawable-hdpi/people_menu_button_blue_on.png b/astrid/src/main/res/drawable-hdpi/people_menu_button_blue_on.png similarity index 100% rename from astrid/res/drawable-hdpi/people_menu_button_blue_on.png rename to astrid/src/main/res/drawable-hdpi/people_menu_button_blue_on.png diff --git a/astrid/res/drawable-hdpi/people_menu_button_dark_blue_off.png b/astrid/src/main/res/drawable-hdpi/people_menu_button_dark_blue_off.png similarity index 100% rename from astrid/res/drawable-hdpi/people_menu_button_dark_blue_off.png rename to astrid/src/main/res/drawable-hdpi/people_menu_button_dark_blue_off.png diff --git a/astrid/res/drawable-hdpi/people_menu_button_dark_blue_on.png b/astrid/src/main/res/drawable-hdpi/people_menu_button_dark_blue_on.png similarity index 100% rename from astrid/res/drawable-hdpi/people_menu_button_dark_blue_on.png rename to astrid/src/main/res/drawable-hdpi/people_menu_button_dark_blue_on.png diff --git a/astrid/res/drawable-hdpi/people_menu_button_red_off.png b/astrid/src/main/res/drawable-hdpi/people_menu_button_red_off.png similarity index 100% rename from astrid/res/drawable-hdpi/people_menu_button_red_off.png rename to astrid/src/main/res/drawable-hdpi/people_menu_button_red_off.png diff --git a/astrid/res/drawable-hdpi/people_menu_button_red_on.png b/astrid/src/main/res/drawable-hdpi/people_menu_button_red_on.png similarity index 100% rename from astrid/res/drawable-hdpi/people_menu_button_red_on.png rename to astrid/src/main/res/drawable-hdpi/people_menu_button_red_on.png diff --git a/astrid/res/drawable-hdpi/single_gear.png b/astrid/src/main/res/drawable-hdpi/single_gear.png similarity index 100% rename from astrid/res/drawable-hdpi/single_gear.png rename to astrid/src/main/res/drawable-hdpi/single_gear.png diff --git a/astrid/res/drawable-hdpi/speech_bubble_reminder.9.png b/astrid/src/main/res/drawable-hdpi/speech_bubble_reminder.9.png similarity index 100% rename from astrid/res/drawable-hdpi/speech_bubble_reminder.9.png rename to astrid/src/main/res/drawable-hdpi/speech_bubble_reminder.9.png diff --git a/astrid/res/drawable-hdpi/task_notes.png b/astrid/src/main/res/drawable-hdpi/task_notes.png similarity index 100% rename from astrid/res/drawable-hdpi/task_notes.png rename to astrid/src/main/res/drawable-hdpi/task_notes.png diff --git a/astrid/res/drawable-hdpi/task_timer.png b/astrid/src/main/res/drawable-hdpi/task_timer.png similarity index 100% rename from astrid/res/drawable-hdpi/task_timer.png rename to astrid/src/main/res/drawable-hdpi/task_timer.png diff --git a/astrid/res/drawable-hdpi/tea_icn_addcal.png b/astrid/src/main/res/drawable-hdpi/tea_icn_addcal.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_addcal.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_addcal.png diff --git a/astrid/res/drawable-hdpi/tea_icn_addcal_gray.png b/astrid/src/main/res/drawable-hdpi/tea_icn_addcal_gray.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_addcal_gray.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_addcal_gray.png diff --git a/astrid/res/drawable-hdpi/tea_icn_addcal_lightblue.png b/astrid/src/main/res/drawable-hdpi/tea_icn_addcal_lightblue.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_addcal_lightblue.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_addcal_lightblue.png diff --git a/astrid/res/drawable-hdpi/tea_icn_assign.png b/astrid/src/main/res/drawable-hdpi/tea_icn_assign.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_assign.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_assign.png diff --git a/astrid/res/drawable-hdpi/tea_icn_assign_gray.png b/astrid/src/main/res/drawable-hdpi/tea_icn_assign_gray.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_assign_gray.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_assign_gray.png diff --git a/astrid/res/drawable-hdpi/tea_icn_assign_lightblue.png b/astrid/src/main/res/drawable-hdpi/tea_icn_assign_lightblue.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_assign_lightblue.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_assign_lightblue.png diff --git a/astrid/res/drawable-hdpi/tea_icn_date.png b/astrid/src/main/res/drawable-hdpi/tea_icn_date.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_date.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_date.png diff --git a/astrid/res/drawable-hdpi/tea_icn_date_gray.png b/astrid/src/main/res/drawable-hdpi/tea_icn_date_gray.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_date_gray.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_date_gray.png diff --git a/astrid/res/drawable-hdpi/tea_icn_date_lightblue.png b/astrid/src/main/res/drawable-hdpi/tea_icn_date_lightblue.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_date_lightblue.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_date_lightblue.png diff --git a/astrid/res/drawable-hdpi/tea_icn_date_red.png b/astrid/src/main/res/drawable-hdpi/tea_icn_date_red.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_date_red.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_date_red.png diff --git a/astrid/res/drawable-hdpi/tea_icn_edit.png b/astrid/src/main/res/drawable-hdpi/tea_icn_edit.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_edit.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_edit.png diff --git a/astrid/res/drawable-hdpi/tea_icn_edit_gray.png b/astrid/src/main/res/drawable-hdpi/tea_icn_edit_gray.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_edit_gray.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_edit_gray.png diff --git a/astrid/res/drawable-hdpi/tea_icn_edit_lightblue.png b/astrid/src/main/res/drawable-hdpi/tea_icn_edit_lightblue.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_edit_lightblue.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_edit_lightblue.png diff --git a/astrid/res/drawable-hdpi/tea_icn_files.png b/astrid/src/main/res/drawable-hdpi/tea_icn_files.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_files.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_files.png diff --git a/astrid/res/drawable-hdpi/tea_icn_files_gray.png b/astrid/src/main/res/drawable-hdpi/tea_icn_files_gray.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_files_gray.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_files_gray.png diff --git a/astrid/res/drawable-hdpi/tea_icn_files_lightblue.png b/astrid/src/main/res/drawable-hdpi/tea_icn_files_lightblue.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_files_lightblue.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_files_lightblue.png diff --git a/astrid/res/drawable-hdpi/tea_icn_hide.png b/astrid/src/main/res/drawable-hdpi/tea_icn_hide.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_hide.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_hide.png diff --git a/astrid/res/drawable-hdpi/tea_icn_hide_gray.png b/astrid/src/main/res/drawable-hdpi/tea_icn_hide_gray.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_hide_gray.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_hide_gray.png diff --git a/astrid/res/drawable-hdpi/tea_icn_hide_lightblue.png b/astrid/src/main/res/drawable-hdpi/tea_icn_hide_lightblue.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_hide_lightblue.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_hide_lightblue.png diff --git a/astrid/res/drawable-hdpi/tea_icn_lists.png b/astrid/src/main/res/drawable-hdpi/tea_icn_lists.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_lists.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_lists.png diff --git a/astrid/res/drawable-hdpi/tea_icn_lists_gray.png b/astrid/src/main/res/drawable-hdpi/tea_icn_lists_gray.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_lists_gray.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_lists_gray.png diff --git a/astrid/res/drawable-hdpi/tea_icn_lists_lightblue.png b/astrid/src/main/res/drawable-hdpi/tea_icn_lists_lightblue.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_lists_lightblue.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_lists_lightblue.png diff --git a/astrid/res/drawable-hdpi/tea_icn_priority.png b/astrid/src/main/res/drawable-hdpi/tea_icn_priority.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_priority.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_priority.png diff --git a/astrid/res/drawable-hdpi/tea_icn_priority_gray.png b/astrid/src/main/res/drawable-hdpi/tea_icn_priority_gray.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_priority_gray.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_priority_gray.png diff --git a/astrid/res/drawable-hdpi/tea_icn_priority_lightblue.png b/astrid/src/main/res/drawable-hdpi/tea_icn_priority_lightblue.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_priority_lightblue.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_priority_lightblue.png diff --git a/astrid/res/drawable-hdpi/tea_icn_reminder.png b/astrid/src/main/res/drawable-hdpi/tea_icn_reminder.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_reminder.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_reminder.png diff --git a/astrid/res/drawable-hdpi/tea_icn_reminder_gray.png b/astrid/src/main/res/drawable-hdpi/tea_icn_reminder_gray.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_reminder_gray.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_reminder_gray.png diff --git a/astrid/res/drawable-hdpi/tea_icn_reminder_lightblue.png b/astrid/src/main/res/drawable-hdpi/tea_icn_reminder_lightblue.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_reminder_lightblue.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_reminder_lightblue.png diff --git a/astrid/res/drawable-hdpi/tea_icn_repeat.png b/astrid/src/main/res/drawable-hdpi/tea_icn_repeat.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_repeat.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_repeat.png diff --git a/astrid/res/drawable-hdpi/tea_icn_repeat_gray.png b/astrid/src/main/res/drawable-hdpi/tea_icn_repeat_gray.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_repeat_gray.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_repeat_gray.png diff --git a/astrid/res/drawable-hdpi/tea_icn_repeat_lightblue.png b/astrid/src/main/res/drawable-hdpi/tea_icn_repeat_lightblue.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_repeat_lightblue.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_repeat_lightblue.png diff --git a/astrid/res/drawable-hdpi/tea_icn_repeat_red.png b/astrid/src/main/res/drawable-hdpi/tea_icn_repeat_red.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_repeat_red.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_repeat_red.png diff --git a/astrid/res/drawable-hdpi/tea_icn_share.png b/astrid/src/main/res/drawable-hdpi/tea_icn_share.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_share.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_share.png diff --git a/astrid/res/drawable-hdpi/tea_icn_share_gray.png b/astrid/src/main/res/drawable-hdpi/tea_icn_share_gray.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_share_gray.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_share_gray.png diff --git a/astrid/res/drawable-hdpi/tea_icn_share_lightblue.png b/astrid/src/main/res/drawable-hdpi/tea_icn_share_lightblue.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_share_lightblue.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_share_lightblue.png diff --git a/astrid/res/drawable-hdpi/tea_icn_timer.png b/astrid/src/main/res/drawable-hdpi/tea_icn_timer.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_timer.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_timer.png diff --git a/astrid/res/drawable-hdpi/tea_icn_timer_gray.png b/astrid/src/main/res/drawable-hdpi/tea_icn_timer_gray.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_timer_gray.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_timer_gray.png diff --git a/astrid/res/drawable-hdpi/tea_icn_timer_lightblue.png b/astrid/src/main/res/drawable-hdpi/tea_icn_timer_lightblue.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_timer_lightblue.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_timer_lightblue.png diff --git a/astrid/res/drawable-hdpi/tea_icn_waiting.png b/astrid/src/main/res/drawable-hdpi/tea_icn_waiting.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_waiting.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_waiting.png diff --git a/astrid/res/drawable-hdpi/tea_icn_waiting_lightblue.png b/astrid/src/main/res/drawable-hdpi/tea_icn_waiting_lightblue.png similarity index 100% rename from astrid/res/drawable-hdpi/tea_icn_waiting_lightblue.png rename to astrid/src/main/res/drawable-hdpi/tea_icn_waiting_lightblue.png diff --git a/astrid/res/drawable-hdpi/trashcan.png b/astrid/src/main/res/drawable-hdpi/trashcan.png similarity index 100% rename from astrid/res/drawable-hdpi/trashcan.png rename to astrid/src/main/res/drawable-hdpi/trashcan.png diff --git a/astrid/res/drawable-land/separator.png b/astrid/src/main/res/drawable-land/separator.png similarity index 100% rename from astrid/res/drawable-land/separator.png rename to astrid/src/main/res/drawable-land/separator.png diff --git a/astrid/res/drawable-v11/importance_title_1.xml b/astrid/src/main/res/drawable-v11/importance_title_1.xml similarity index 100% rename from astrid/res/drawable-v11/importance_title_1.xml rename to astrid/src/main/res/drawable-v11/importance_title_1.xml diff --git a/astrid/res/drawable-v11/importance_title_2.xml b/astrid/src/main/res/drawable-v11/importance_title_2.xml similarity index 100% rename from astrid/res/drawable-v11/importance_title_2.xml rename to astrid/src/main/res/drawable-v11/importance_title_2.xml diff --git a/astrid/res/drawable-v11/importance_title_3.xml b/astrid/src/main/res/drawable-v11/importance_title_3.xml similarity index 100% rename from astrid/res/drawable-v11/importance_title_3.xml rename to astrid/src/main/res/drawable-v11/importance_title_3.xml diff --git a/astrid/res/drawable-v11/importance_title_4.xml b/astrid/src/main/res/drawable-v11/importance_title_4.xml similarity index 100% rename from astrid/res/drawable-v11/importance_title_4.xml rename to astrid/src/main/res/drawable-v11/importance_title_4.xml diff --git a/astrid/res/drawable-v11/importance_title_5.xml b/astrid/src/main/res/drawable-v11/importance_title_5.xml similarity index 100% rename from astrid/res/drawable-v11/importance_title_5.xml rename to astrid/src/main/res/drawable-v11/importance_title_5.xml diff --git a/astrid/res/drawable-v11/importance_title_6.xml b/astrid/src/main/res/drawable-v11/importance_title_6.xml similarity index 100% rename from astrid/res/drawable-v11/importance_title_6.xml rename to astrid/src/main/res/drawable-v11/importance_title_6.xml diff --git a/astrid/res/drawable-xhdpi/btn_dismiss_normal.png b/astrid/src/main/res/drawable-xhdpi/btn_dismiss_normal.png similarity index 100% rename from astrid/res/drawable-xhdpi/btn_dismiss_normal.png rename to astrid/src/main/res/drawable-xhdpi/btn_dismiss_normal.png diff --git a/astrid/res/drawable-xhdpi/btn_dismiss_pressed.png b/astrid/src/main/res/drawable-xhdpi/btn_dismiss_pressed.png similarity index 100% rename from astrid/res/drawable-xhdpi/btn_dismiss_pressed.png rename to astrid/src/main/res/drawable-xhdpi/btn_dismiss_pressed.png diff --git a/astrid/res/drawable-xhdpi/check_box_1.png b/astrid/src/main/res/drawable-xhdpi/check_box_1.png similarity index 100% rename from astrid/res/drawable-xhdpi/check_box_1.png rename to astrid/src/main/res/drawable-xhdpi/check_box_1.png diff --git a/astrid/res/drawable-xhdpi/check_box_2.png b/astrid/src/main/res/drawable-xhdpi/check_box_2.png similarity index 100% rename from astrid/res/drawable-xhdpi/check_box_2.png rename to astrid/src/main/res/drawable-xhdpi/check_box_2.png diff --git a/astrid/res/drawable-xhdpi/check_box_3.png b/astrid/src/main/res/drawable-xhdpi/check_box_3.png similarity index 100% rename from astrid/res/drawable-xhdpi/check_box_3.png rename to astrid/src/main/res/drawable-xhdpi/check_box_3.png diff --git a/astrid/res/drawable-xhdpi/check_box_4.png b/astrid/src/main/res/drawable-xhdpi/check_box_4.png similarity index 100% rename from astrid/res/drawable-xhdpi/check_box_4.png rename to astrid/src/main/res/drawable-xhdpi/check_box_4.png diff --git a/astrid/res/drawable-xhdpi/check_box_checked_1.png b/astrid/src/main/res/drawable-xhdpi/check_box_checked_1.png similarity index 100% rename from astrid/res/drawable-xhdpi/check_box_checked_1.png rename to astrid/src/main/res/drawable-xhdpi/check_box_checked_1.png diff --git a/astrid/res/drawable-xhdpi/check_box_checked_2.png b/astrid/src/main/res/drawable-xhdpi/check_box_checked_2.png similarity index 100% rename from astrid/res/drawable-xhdpi/check_box_checked_2.png rename to astrid/src/main/res/drawable-xhdpi/check_box_checked_2.png diff --git a/astrid/res/drawable-xhdpi/check_box_checked_3.png b/astrid/src/main/res/drawable-xhdpi/check_box_checked_3.png similarity index 100% rename from astrid/res/drawable-xhdpi/check_box_checked_3.png rename to astrid/src/main/res/drawable-xhdpi/check_box_checked_3.png diff --git a/astrid/res/drawable-xhdpi/check_box_checked_4.png b/astrid/src/main/res/drawable-xhdpi/check_box_checked_4.png similarity index 100% rename from astrid/res/drawable-xhdpi/check_box_checked_4.png rename to astrid/src/main/res/drawable-xhdpi/check_box_checked_4.png diff --git a/astrid/res/drawable-xhdpi/check_box_repeat_1.png b/astrid/src/main/res/drawable-xhdpi/check_box_repeat_1.png similarity index 100% rename from astrid/res/drawable-xhdpi/check_box_repeat_1.png rename to astrid/src/main/res/drawable-xhdpi/check_box_repeat_1.png diff --git a/astrid/res/drawable-xhdpi/check_box_repeat_2.png b/astrid/src/main/res/drawable-xhdpi/check_box_repeat_2.png similarity index 100% rename from astrid/res/drawable-xhdpi/check_box_repeat_2.png rename to astrid/src/main/res/drawable-xhdpi/check_box_repeat_2.png diff --git a/astrid/res/drawable-xhdpi/check_box_repeat_3.png b/astrid/src/main/res/drawable-xhdpi/check_box_repeat_3.png similarity index 100% rename from astrid/res/drawable-xhdpi/check_box_repeat_3.png rename to astrid/src/main/res/drawable-xhdpi/check_box_repeat_3.png diff --git a/astrid/res/drawable-xhdpi/check_box_repeat_4.png b/astrid/src/main/res/drawable-xhdpi/check_box_repeat_4.png similarity index 100% rename from astrid/res/drawable-xhdpi/check_box_repeat_4.png rename to astrid/src/main/res/drawable-xhdpi/check_box_repeat_4.png diff --git a/astrid/res/drawable-xhdpi/check_box_repeat_checked_1.png b/astrid/src/main/res/drawable-xhdpi/check_box_repeat_checked_1.png similarity index 100% rename from astrid/res/drawable-xhdpi/check_box_repeat_checked_1.png rename to astrid/src/main/res/drawable-xhdpi/check_box_repeat_checked_1.png diff --git a/astrid/res/drawable-xhdpi/check_box_repeat_checked_2.png b/astrid/src/main/res/drawable-xhdpi/check_box_repeat_checked_2.png similarity index 100% rename from astrid/res/drawable-xhdpi/check_box_repeat_checked_2.png rename to astrid/src/main/res/drawable-xhdpi/check_box_repeat_checked_2.png diff --git a/astrid/res/drawable-xhdpi/check_box_repeat_checked_3.png b/astrid/src/main/res/drawable-xhdpi/check_box_repeat_checked_3.png similarity index 100% rename from astrid/res/drawable-xhdpi/check_box_repeat_checked_3.png rename to astrid/src/main/res/drawable-xhdpi/check_box_repeat_checked_3.png diff --git a/astrid/res/drawable-xhdpi/check_box_repeat_checked_4.png b/astrid/src/main/res/drawable-xhdpi/check_box_repeat_checked_4.png similarity index 100% rename from astrid/res/drawable-xhdpi/check_box_repeat_checked_4.png rename to astrid/src/main/res/drawable-xhdpi/check_box_repeat_checked_4.png diff --git a/astrid/res/drawable-xhdpi/dialog_full_holo_dark.9.png b/astrid/src/main/res/drawable-xhdpi/dialog_full_holo_dark.9.png similarity index 100% rename from astrid/res/drawable-xhdpi/dialog_full_holo_dark.9.png rename to astrid/src/main/res/drawable-xhdpi/dialog_full_holo_dark.9.png diff --git a/astrid/res/drawable-xhdpi/dialog_full_holo_light.9.png b/astrid/src/main/res/drawable-xhdpi/dialog_full_holo_light.9.png similarity index 100% rename from astrid/res/drawable-xhdpi/dialog_full_holo_light.9.png rename to astrid/src/main/res/drawable-xhdpi/dialog_full_holo_light.9.png diff --git a/astrid/res/drawable-xhdpi/ic_menu_list_copy.png b/astrid/src/main/res/drawable-xhdpi/ic_menu_list_copy.png similarity index 100% rename from astrid/res/drawable-xhdpi/ic_menu_list_copy.png rename to astrid/src/main/res/drawable-xhdpi/ic_menu_list_copy.png diff --git a/astrid/res/drawable-xhdpi/icn_thumbsdown.png b/astrid/src/main/res/drawable-xhdpi/icn_thumbsdown.png similarity index 100% rename from astrid/res/drawable-xhdpi/icn_thumbsdown.png rename to astrid/src/main/res/drawable-xhdpi/icn_thumbsdown.png diff --git a/astrid/res/drawable-xhdpi/icn_thumbsup.png b/astrid/src/main/res/drawable-xhdpi/icn_thumbsup.png similarity index 100% rename from astrid/res/drawable-xhdpi/icn_thumbsup.png rename to astrid/src/main/res/drawable-xhdpi/icn_thumbsup.png diff --git a/astrid/res/drawable-xhdpi/lists_disclosure_blue_off.png b/astrid/src/main/res/drawable-xhdpi/lists_disclosure_blue_off.png similarity index 100% rename from astrid/res/drawable-xhdpi/lists_disclosure_blue_off.png rename to astrid/src/main/res/drawable-xhdpi/lists_disclosure_blue_off.png diff --git a/astrid/res/drawable-xhdpi/lists_disclosure_blue_on.png b/astrid/src/main/res/drawable-xhdpi/lists_disclosure_blue_on.png similarity index 100% rename from astrid/res/drawable-xhdpi/lists_disclosure_blue_on.png rename to astrid/src/main/res/drawable-xhdpi/lists_disclosure_blue_on.png diff --git a/astrid/res/drawable-xhdpi/lists_disclosure_dark_blue_off.png b/astrid/src/main/res/drawable-xhdpi/lists_disclosure_dark_blue_off.png similarity index 100% rename from astrid/res/drawable-xhdpi/lists_disclosure_dark_blue_off.png rename to astrid/src/main/res/drawable-xhdpi/lists_disclosure_dark_blue_off.png diff --git a/astrid/res/drawable-xhdpi/lists_disclosure_dark_blue_on.png b/astrid/src/main/res/drawable-xhdpi/lists_disclosure_dark_blue_on.png similarity index 100% rename from astrid/res/drawable-xhdpi/lists_disclosure_dark_blue_on.png rename to astrid/src/main/res/drawable-xhdpi/lists_disclosure_dark_blue_on.png diff --git a/astrid/res/drawable-xhdpi/lists_disclosure_red_off.png b/astrid/src/main/res/drawable-xhdpi/lists_disclosure_red_off.png similarity index 100% rename from astrid/res/drawable-xhdpi/lists_disclosure_red_off.png rename to astrid/src/main/res/drawable-xhdpi/lists_disclosure_red_off.png diff --git a/astrid/res/drawable-xhdpi/lists_disclosure_red_on.png b/astrid/src/main/res/drawable-xhdpi/lists_disclosure_red_on.png similarity index 100% rename from astrid/res/drawable-xhdpi/lists_disclosure_red_on.png rename to astrid/src/main/res/drawable-xhdpi/lists_disclosure_red_on.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_addcal.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_addcal.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_addcal.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_addcal.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_addcal_gray.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_addcal_gray.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_addcal_gray.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_addcal_gray.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_addcal_lightblue.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_addcal_lightblue.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_addcal_lightblue.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_addcal_lightblue.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_assign.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_assign.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_assign.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_assign.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_assign_gray.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_assign_gray.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_assign_gray.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_assign_gray.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_assign_lightblue.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_assign_lightblue.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_assign_lightblue.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_assign_lightblue.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_date.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_date.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_date.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_date.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_date_gray.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_date_gray.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_date_gray.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_date_gray.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_date_lightblue.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_date_lightblue.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_date_lightblue.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_date_lightblue.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_date_red.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_date_red.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_date_red.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_date_red.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_edit.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_edit.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_edit.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_edit.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_edit_gray.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_edit_gray.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_edit_gray.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_edit_gray.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_edit_lightblue.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_edit_lightblue.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_edit_lightblue.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_edit_lightblue.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_files.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_files.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_files.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_files.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_files_gray.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_files_gray.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_files_gray.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_files_gray.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_files_lightblue.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_files_lightblue.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_files_lightblue.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_files_lightblue.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_hide.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_hide.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_hide.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_hide.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_hide_gray.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_hide_gray.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_hide_gray.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_hide_gray.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_hide_lightblue.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_hide_lightblue.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_hide_lightblue.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_hide_lightblue.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_lists.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_lists.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_lists.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_lists.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_lists_gray.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_lists_gray.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_lists_gray.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_lists_gray.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_lists_lightblue.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_lists_lightblue.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_lists_lightblue.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_lists_lightblue.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_priority.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_priority.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_priority.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_priority.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_priority_gray.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_priority_gray.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_priority_gray.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_priority_gray.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_priority_lightblue.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_priority_lightblue.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_priority_lightblue.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_priority_lightblue.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_reminder.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_reminder.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_reminder.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_reminder.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_reminder_gray.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_reminder_gray.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_reminder_gray.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_reminder_gray.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_reminder_lightblue.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_reminder_lightblue.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_reminder_lightblue.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_reminder_lightblue.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_repeat.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_repeat.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_repeat.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_repeat.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_repeat_gray.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_repeat_gray.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_repeat_gray.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_repeat_gray.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_repeat_lightblue.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_repeat_lightblue.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_repeat_lightblue.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_repeat_lightblue.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_repeat_red.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_repeat_red.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_repeat_red.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_repeat_red.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_share.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_share.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_share.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_share.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_share_gray.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_share_gray.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_share_gray.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_share_gray.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_share_lightblue.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_share_lightblue.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_share_lightblue.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_share_lightblue.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_timer.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_timer.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_timer.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_timer.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_timer_gray.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_timer_gray.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_timer_gray.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_timer_gray.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_timer_lightblue.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_timer_lightblue.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_timer_lightblue.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_timer_lightblue.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_waiting.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_waiting.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_waiting.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_waiting.png diff --git a/astrid/res/drawable-xhdpi/tea_icn_waiting_lightblue.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_waiting_lightblue.png similarity index 100% rename from astrid/res/drawable-xhdpi/tea_icn_waiting_lightblue.png rename to astrid/src/main/res/drawable-xhdpi/tea_icn_waiting_lightblue.png diff --git a/astrid/res/drawable-xhdpi/trashcan.png b/astrid/src/main/res/drawable-xhdpi/trashcan.png similarity index 100% rename from astrid/res/drawable-xhdpi/trashcan.png rename to astrid/src/main/res/drawable-xhdpi/trashcan.png diff --git a/astrid/res/drawable/action_attachments.png b/astrid/src/main/res/drawable/action_attachments.png similarity index 100% rename from astrid/res/drawable/action_attachments.png rename to astrid/src/main/res/drawable/action_attachments.png diff --git a/astrid/res/drawable/action_mail.png b/astrid/src/main/res/drawable/action_mail.png similarity index 100% rename from astrid/res/drawable/action_mail.png rename to astrid/src/main/res/drawable/action_mail.png diff --git a/astrid/res/drawable/action_notes.png b/astrid/src/main/res/drawable/action_notes.png similarity index 100% rename from astrid/res/drawable/action_notes.png rename to astrid/src/main/res/drawable/action_notes.png diff --git a/astrid/res/drawable/action_tel.png b/astrid/src/main/res/drawable/action_tel.png similarity index 100% rename from astrid/res/drawable/action_tel.png rename to astrid/src/main/res/drawable/action_tel.png diff --git a/astrid/res/drawable/action_web.png b/astrid/src/main/res/drawable/action_web.png similarity index 100% rename from astrid/res/drawable/action_web.png rename to astrid/src/main/res/drawable/action_web.png diff --git a/astrid/res/drawable/arrow_branch.png b/astrid/src/main/res/drawable/arrow_branch.png similarity index 100% rename from astrid/res/drawable/arrow_branch.png rename to astrid/src/main/res/drawable/arrow_branch.png diff --git a/astrid/res/drawable/arrow_down.png b/astrid/src/main/res/drawable/arrow_down.png similarity index 100% rename from astrid/res/drawable/arrow_down.png rename to astrid/src/main/res/drawable/arrow_down.png diff --git a/astrid/res/drawable/arrow_join.png b/astrid/src/main/res/drawable/arrow_join.png similarity index 100% rename from astrid/res/drawable/arrow_join.png rename to astrid/src/main/res/drawable/arrow_join.png diff --git a/astrid/res/drawable/astrid_com_gradient.xml b/astrid/src/main/res/drawable/astrid_com_gradient.xml similarity index 100% rename from astrid/res/drawable/astrid_com_gradient.xml rename to astrid/src/main/res/drawable/astrid_com_gradient.xml diff --git a/astrid/res/drawable/astrid_com_logo.png b/astrid/src/main/res/drawable/astrid_com_logo.png similarity index 100% rename from astrid/res/drawable/astrid_com_logo.png rename to astrid/src/main/res/drawable/astrid_com_logo.png diff --git a/astrid/res/drawable/btn_add.xml b/astrid/src/main/res/drawable/btn_add.xml similarity index 100% rename from astrid/res/drawable/btn_add.xml rename to astrid/src/main/res/drawable/btn_add.xml diff --git a/astrid/res/drawable/btn_add_normal.png b/astrid/src/main/res/drawable/btn_add_normal.png similarity index 100% rename from astrid/res/drawable/btn_add_normal.png rename to astrid/src/main/res/drawable/btn_add_normal.png diff --git a/astrid/res/drawable/btn_add_pressed.png b/astrid/src/main/res/drawable/btn_add_pressed.png similarity index 100% rename from astrid/res/drawable/btn_add_pressed.png rename to astrid/src/main/res/drawable/btn_add_pressed.png diff --git a/astrid/res/drawable/btn_check.xml b/astrid/src/main/res/drawable/btn_check.xml similarity index 100% rename from astrid/res/drawable/btn_check.xml rename to astrid/src/main/res/drawable/btn_check.xml diff --git a/astrid/res/drawable/btn_check_small.xml b/astrid/src/main/res/drawable/btn_check_small.xml similarity index 100% rename from astrid/res/drawable/btn_check_small.xml rename to astrid/src/main/res/drawable/btn_check_small.xml diff --git a/astrid/res/drawable/btn_clone.xml b/astrid/src/main/res/drawable/btn_clone.xml similarity index 100% rename from astrid/res/drawable/btn_clone.xml rename to astrid/src/main/res/drawable/btn_clone.xml diff --git a/astrid/res/drawable/btn_dismiss.xml b/astrid/src/main/res/drawable/btn_dismiss.xml similarity index 100% rename from astrid/res/drawable/btn_dismiss.xml rename to astrid/src/main/res/drawable/btn_dismiss.xml diff --git a/astrid/res/drawable/btn_dismiss_normal.png b/astrid/src/main/res/drawable/btn_dismiss_normal.png similarity index 100% rename from astrid/res/drawable/btn_dismiss_normal.png rename to astrid/src/main/res/drawable/btn_dismiss_normal.png diff --git a/astrid/res/drawable/btn_dismiss_normal_blue_alt.png b/astrid/src/main/res/drawable/btn_dismiss_normal_blue_alt.png similarity index 100% rename from astrid/res/drawable/btn_dismiss_normal_blue_alt.png rename to astrid/src/main/res/drawable/btn_dismiss_normal_blue_alt.png diff --git a/astrid/res/drawable/btn_dismiss_pressed.png b/astrid/src/main/res/drawable/btn_dismiss_pressed.png similarity index 100% rename from astrid/res/drawable/btn_dismiss_pressed.png rename to astrid/src/main/res/drawable/btn_dismiss_pressed.png diff --git a/astrid/res/drawable/btn_dismiss_pressed_blue_alt.png b/astrid/src/main/res/drawable/btn_dismiss_pressed_blue_alt.png similarity index 100% rename from astrid/res/drawable/btn_dismiss_pressed_blue_alt.png rename to astrid/src/main/res/drawable/btn_dismiss_pressed_blue_alt.png diff --git a/astrid/res/drawable/button_plus.png b/astrid/src/main/res/drawable/button_plus.png similarity index 100% rename from astrid/res/drawable/button_plus.png rename to astrid/src/main/res/drawable/button_plus.png diff --git a/astrid/res/drawable/camera_button.xml b/astrid/src/main/res/drawable/camera_button.xml similarity index 100% rename from astrid/res/drawable/camera_button.xml rename to astrid/src/main/res/drawable/camera_button.xml diff --git a/astrid/res/drawable/camera_button_normal.png b/astrid/src/main/res/drawable/camera_button_normal.png similarity index 100% rename from astrid/res/drawable/camera_button_normal.png rename to astrid/src/main/res/drawable/camera_button_normal.png diff --git a/astrid/res/drawable/camera_button_pressed.png b/astrid/src/main/res/drawable/camera_button_pressed.png similarity index 100% rename from astrid/res/drawable/camera_button_pressed.png rename to astrid/src/main/res/drawable/camera_button_pressed.png diff --git a/astrid/res/drawable/check_box_1.png b/astrid/src/main/res/drawable/check_box_1.png similarity index 100% rename from astrid/res/drawable/check_box_1.png rename to astrid/src/main/res/drawable/check_box_1.png diff --git a/astrid/res/drawable/check_box_2.png b/astrid/src/main/res/drawable/check_box_2.png similarity index 100% rename from astrid/res/drawable/check_box_2.png rename to astrid/src/main/res/drawable/check_box_2.png diff --git a/astrid/res/drawable/check_box_3.png b/astrid/src/main/res/drawable/check_box_3.png similarity index 100% rename from astrid/res/drawable/check_box_3.png rename to astrid/src/main/res/drawable/check_box_3.png diff --git a/astrid/res/drawable/check_box_4.png b/astrid/src/main/res/drawable/check_box_4.png similarity index 100% rename from astrid/res/drawable/check_box_4.png rename to astrid/src/main/res/drawable/check_box_4.png diff --git a/astrid/res/drawable/check_box_checked_1.png b/astrid/src/main/res/drawable/check_box_checked_1.png similarity index 100% rename from astrid/res/drawable/check_box_checked_1.png rename to astrid/src/main/res/drawable/check_box_checked_1.png diff --git a/astrid/res/drawable/check_box_checked_2.png b/astrid/src/main/res/drawable/check_box_checked_2.png similarity index 100% rename from astrid/res/drawable/check_box_checked_2.png rename to astrid/src/main/res/drawable/check_box_checked_2.png diff --git a/astrid/res/drawable/check_box_checked_3.png b/astrid/src/main/res/drawable/check_box_checked_3.png similarity index 100% rename from astrid/res/drawable/check_box_checked_3.png rename to astrid/src/main/res/drawable/check_box_checked_3.png diff --git a/astrid/res/drawable/check_box_checked_4.png b/astrid/src/main/res/drawable/check_box_checked_4.png similarity index 100% rename from astrid/res/drawable/check_box_checked_4.png rename to astrid/src/main/res/drawable/check_box_checked_4.png diff --git a/astrid/res/drawable/check_box_large_1.png b/astrid/src/main/res/drawable/check_box_large_1.png similarity index 100% rename from astrid/res/drawable/check_box_large_1.png rename to astrid/src/main/res/drawable/check_box_large_1.png diff --git a/astrid/res/drawable/check_box_large_2.png b/astrid/src/main/res/drawable/check_box_large_2.png similarity index 100% rename from astrid/res/drawable/check_box_large_2.png rename to astrid/src/main/res/drawable/check_box_large_2.png diff --git a/astrid/res/drawable/check_box_large_3.png b/astrid/src/main/res/drawable/check_box_large_3.png similarity index 100% rename from astrid/res/drawable/check_box_large_3.png rename to astrid/src/main/res/drawable/check_box_large_3.png diff --git a/astrid/res/drawable/check_box_large_4.png b/astrid/src/main/res/drawable/check_box_large_4.png similarity index 100% rename from astrid/res/drawable/check_box_large_4.png rename to astrid/src/main/res/drawable/check_box_large_4.png diff --git a/astrid/res/drawable/check_box_repeat_1.png b/astrid/src/main/res/drawable/check_box_repeat_1.png similarity index 100% rename from astrid/res/drawable/check_box_repeat_1.png rename to astrid/src/main/res/drawable/check_box_repeat_1.png diff --git a/astrid/res/drawable/check_box_repeat_2.png b/astrid/src/main/res/drawable/check_box_repeat_2.png similarity index 100% rename from astrid/res/drawable/check_box_repeat_2.png rename to astrid/src/main/res/drawable/check_box_repeat_2.png diff --git a/astrid/res/drawable/check_box_repeat_3.png b/astrid/src/main/res/drawable/check_box_repeat_3.png similarity index 100% rename from astrid/res/drawable/check_box_repeat_3.png rename to astrid/src/main/res/drawable/check_box_repeat_3.png diff --git a/astrid/res/drawable/check_box_repeat_4.png b/astrid/src/main/res/drawable/check_box_repeat_4.png similarity index 100% rename from astrid/res/drawable/check_box_repeat_4.png rename to astrid/src/main/res/drawable/check_box_repeat_4.png diff --git a/astrid/res/drawable/check_box_repeat_checked_1.png b/astrid/src/main/res/drawable/check_box_repeat_checked_1.png similarity index 100% rename from astrid/res/drawable/check_box_repeat_checked_1.png rename to astrid/src/main/res/drawable/check_box_repeat_checked_1.png diff --git a/astrid/res/drawable/check_box_repeat_checked_2.png b/astrid/src/main/res/drawable/check_box_repeat_checked_2.png similarity index 100% rename from astrid/res/drawable/check_box_repeat_checked_2.png rename to astrid/src/main/res/drawable/check_box_repeat_checked_2.png diff --git a/astrid/res/drawable/check_box_repeat_checked_3.png b/astrid/src/main/res/drawable/check_box_repeat_checked_3.png similarity index 100% rename from astrid/res/drawable/check_box_repeat_checked_3.png rename to astrid/src/main/res/drawable/check_box_repeat_checked_3.png diff --git a/astrid/res/drawable/check_box_repeat_checked_4.png b/astrid/src/main/res/drawable/check_box_repeat_checked_4.png similarity index 100% rename from astrid/res/drawable/check_box_repeat_checked_4.png rename to astrid/src/main/res/drawable/check_box_repeat_checked_4.png diff --git a/astrid/res/drawable/custom_tab_indicator.xml b/astrid/src/main/res/drawable/custom_tab_indicator.xml similarity index 100% rename from astrid/res/drawable/custom_tab_indicator.xml rename to astrid/src/main/res/drawable/custom_tab_indicator.xml diff --git a/astrid/res/drawable/custom_tab_indicator_alt.xml b/astrid/src/main/res/drawable/custom_tab_indicator_alt.xml similarity index 100% rename from astrid/res/drawable/custom_tab_indicator_alt.xml rename to astrid/src/main/res/drawable/custom_tab_indicator_alt.xml diff --git a/astrid/res/drawable/custom_tab_indicator_dark.xml b/astrid/src/main/res/drawable/custom_tab_indicator_dark.xml similarity index 100% rename from astrid/res/drawable/custom_tab_indicator_dark.xml rename to astrid/src/main/res/drawable/custom_tab_indicator_dark.xml diff --git a/astrid/res/drawable/custom_tab_indicator_dark_blue.xml b/astrid/src/main/res/drawable/custom_tab_indicator_dark_blue.xml similarity index 100% rename from astrid/res/drawable/custom_tab_indicator_dark_blue.xml rename to astrid/src/main/res/drawable/custom_tab_indicator_dark_blue.xml diff --git a/astrid/res/drawable/custom_tab_indicator_dark_blue_selected.9.png b/astrid/src/main/res/drawable/custom_tab_indicator_dark_blue_selected.9.png similarity index 100% rename from astrid/res/drawable/custom_tab_indicator_dark_blue_selected.9.png rename to astrid/src/main/res/drawable/custom_tab_indicator_dark_blue_selected.9.png diff --git a/astrid/res/drawable/custom_tab_indicator_dark_blue_selected_layer.xml b/astrid/src/main/res/drawable/custom_tab_indicator_dark_blue_selected_layer.xml similarity index 100% rename from astrid/res/drawable/custom_tab_indicator_dark_blue_selected_layer.xml rename to astrid/src/main/res/drawable/custom_tab_indicator_dark_blue_selected_layer.xml diff --git a/astrid/res/drawable/custom_tab_indicator_dark_blue_unselected.9.png b/astrid/src/main/res/drawable/custom_tab_indicator_dark_blue_unselected.9.png similarity index 100% rename from astrid/res/drawable/custom_tab_indicator_dark_blue_unselected.9.png rename to astrid/src/main/res/drawable/custom_tab_indicator_dark_blue_unselected.9.png diff --git a/astrid/res/drawable/custom_tab_indicator_dark_selected.9.png b/astrid/src/main/res/drawable/custom_tab_indicator_dark_selected.9.png similarity index 100% rename from astrid/res/drawable/custom_tab_indicator_dark_selected.9.png rename to astrid/src/main/res/drawable/custom_tab_indicator_dark_selected.9.png diff --git a/astrid/res/drawable/custom_tab_indicator_dark_selected_layer.xml b/astrid/src/main/res/drawable/custom_tab_indicator_dark_selected_layer.xml similarity index 100% rename from astrid/res/drawable/custom_tab_indicator_dark_selected_layer.xml rename to astrid/src/main/res/drawable/custom_tab_indicator_dark_selected_layer.xml diff --git a/astrid/res/drawable/custom_tab_indicator_dark_unselected.9.png b/astrid/src/main/res/drawable/custom_tab_indicator_dark_unselected.9.png similarity index 100% rename from astrid/res/drawable/custom_tab_indicator_dark_unselected.9.png rename to astrid/src/main/res/drawable/custom_tab_indicator_dark_unselected.9.png diff --git a/astrid/res/drawable/custom_tab_indicator_selected.9.png b/astrid/src/main/res/drawable/custom_tab_indicator_selected.9.png similarity index 100% rename from astrid/res/drawable/custom_tab_indicator_selected.9.png rename to astrid/src/main/res/drawable/custom_tab_indicator_selected.9.png diff --git a/astrid/res/drawable/custom_tab_indicator_selected_alt.9.png b/astrid/src/main/res/drawable/custom_tab_indicator_selected_alt.9.png similarity index 100% rename from astrid/res/drawable/custom_tab_indicator_selected_alt.9.png rename to astrid/src/main/res/drawable/custom_tab_indicator_selected_alt.9.png diff --git a/astrid/res/drawable/custom_tab_indicator_selected_alt_layer.xml b/astrid/src/main/res/drawable/custom_tab_indicator_selected_alt_layer.xml similarity index 100% rename from astrid/res/drawable/custom_tab_indicator_selected_alt_layer.xml rename to astrid/src/main/res/drawable/custom_tab_indicator_selected_alt_layer.xml diff --git a/astrid/res/drawable/custom_tab_indicator_selected_layer.xml b/astrid/src/main/res/drawable/custom_tab_indicator_selected_layer.xml similarity index 100% rename from astrid/res/drawable/custom_tab_indicator_selected_layer.xml rename to astrid/src/main/res/drawable/custom_tab_indicator_selected_layer.xml diff --git a/astrid/res/drawable/custom_tab_indicator_unselected.9.png b/astrid/src/main/res/drawable/custom_tab_indicator_unselected.9.png similarity index 100% rename from astrid/res/drawable/custom_tab_indicator_unselected.9.png rename to astrid/src/main/res/drawable/custom_tab_indicator_unselected.9.png diff --git a/astrid/res/drawable/custom_tab_indicator_unselected_alt.9.png b/astrid/src/main/res/drawable/custom_tab_indicator_unselected_alt.9.png similarity index 100% rename from astrid/res/drawable/custom_tab_indicator_unselected_alt.9.png rename to astrid/src/main/res/drawable/custom_tab_indicator_unselected_alt.9.png diff --git a/astrid/res/drawable/default_list_0.png b/astrid/src/main/res/drawable/default_list_0.png similarity index 100% rename from astrid/res/drawable/default_list_0.png rename to astrid/src/main/res/drawable/default_list_0.png diff --git a/astrid/res/drawable/default_list_1.png b/astrid/src/main/res/drawable/default_list_1.png similarity index 100% rename from astrid/res/drawable/default_list_1.png rename to astrid/src/main/res/drawable/default_list_1.png diff --git a/astrid/res/drawable/default_list_2.png b/astrid/src/main/res/drawable/default_list_2.png similarity index 100% rename from astrid/res/drawable/default_list_2.png rename to astrid/src/main/res/drawable/default_list_2.png diff --git a/astrid/res/drawable/default_list_3.png b/astrid/src/main/res/drawable/default_list_3.png similarity index 100% rename from astrid/res/drawable/default_list_3.png rename to astrid/src/main/res/drawable/default_list_3.png diff --git a/astrid/res/drawable/details_alarm.png b/astrid/src/main/res/drawable/details_alarm.png similarity index 100% rename from astrid/res/drawable/details_alarm.png rename to astrid/src/main/res/drawable/details_alarm.png diff --git a/astrid/res/drawable/details_note.png b/astrid/src/main/res/drawable/details_note.png similarity index 100% rename from astrid/res/drawable/details_note.png rename to astrid/src/main/res/drawable/details_note.png diff --git a/astrid/res/drawable/details_repeat.png b/astrid/src/main/res/drawable/details_repeat.png similarity index 100% rename from astrid/res/drawable/details_repeat.png rename to astrid/src/main/res/drawable/details_repeat.png diff --git a/astrid/res/drawable/details_tag.png b/astrid/src/main/res/drawable/details_tag.png similarity index 100% rename from astrid/res/drawable/details_tag.png rename to astrid/src/main/res/drawable/details_tag.png diff --git a/astrid/res/drawable/dialog_full_holo_dark.9.png b/astrid/src/main/res/drawable/dialog_full_holo_dark.9.png similarity index 100% rename from astrid/res/drawable/dialog_full_holo_dark.9.png rename to astrid/src/main/res/drawable/dialog_full_holo_dark.9.png diff --git a/astrid/res/drawable/dialog_full_holo_light.9.png b/astrid/src/main/res/drawable/dialog_full_holo_light.9.png similarity index 100% rename from astrid/res/drawable/dialog_full_holo_light.9.png rename to astrid/src/main/res/drawable/dialog_full_holo_light.9.png diff --git a/astrid/res/drawable/edit_title_background.xml b/astrid/src/main/res/drawable/edit_title_background.xml similarity index 100% rename from astrid/res/drawable/edit_title_background.xml rename to astrid/src/main/res/drawable/edit_title_background.xml diff --git a/astrid/res/drawable/edit_title_background_dark.xml b/astrid/src/main/res/drawable/edit_title_background_dark.xml similarity index 100% rename from astrid/res/drawable/edit_title_background_dark.xml rename to astrid/src/main/res/drawable/edit_title_background_dark.xml diff --git a/astrid/res/drawable/edit_titlebar.9.png b/astrid/src/main/res/drawable/edit_titlebar.9.png similarity index 100% rename from astrid/res/drawable/edit_titlebar.9.png rename to astrid/src/main/res/drawable/edit_titlebar.9.png diff --git a/astrid/res/drawable/edit_titlebar_white.9.png b/astrid/src/main/res/drawable/edit_titlebar_white.9.png similarity index 100% rename from astrid/res/drawable/edit_titlebar_white.9.png rename to astrid/src/main/res/drawable/edit_titlebar_white.9.png diff --git a/astrid/res/drawable/facebook.png b/astrid/src/main/res/drawable/facebook.png similarity index 100% rename from astrid/res/drawable/facebook.png rename to astrid/src/main/res/drawable/facebook.png diff --git a/astrid/res/drawable/file_type_background.xml b/astrid/src/main/res/drawable/file_type_background.xml similarity index 100% rename from astrid/res/drawable/file_type_background.xml rename to astrid/src/main/res/drawable/file_type_background.xml diff --git a/astrid/res/drawable/filter_assigned.png b/astrid/src/main/res/drawable/filter_assigned.png similarity index 100% rename from astrid/res/drawable/filter_assigned.png rename to astrid/src/main/res/drawable/filter_assigned.png diff --git a/astrid/res/drawable/filter_assigned_dark.png b/astrid/src/main/res/drawable/filter_assigned_dark.png similarity index 100% rename from astrid/res/drawable/filter_assigned_dark.png rename to astrid/src/main/res/drawable/filter_assigned_dark.png diff --git a/astrid/res/drawable/filter_btn_background.9.png b/astrid/src/main/res/drawable/filter_btn_background.9.png similarity index 100% rename from astrid/res/drawable/filter_btn_background.9.png rename to astrid/src/main/res/drawable/filter_btn_background.9.png diff --git a/astrid/res/drawable/filter_calendar.png b/astrid/src/main/res/drawable/filter_calendar.png similarity index 100% rename from astrid/res/drawable/filter_calendar.png rename to astrid/src/main/res/drawable/filter_calendar.png diff --git a/astrid/res/drawable/filter_calendar_dark.png b/astrid/src/main/res/drawable/filter_calendar_dark.png similarity index 100% rename from astrid/res/drawable/filter_calendar_dark.png rename to astrid/src/main/res/drawable/filter_calendar_dark.png diff --git a/astrid/res/drawable/filter_count.xml b/astrid/src/main/res/drawable/filter_count.xml similarity index 100% rename from astrid/res/drawable/filter_count.xml rename to astrid/src/main/res/drawable/filter_count.xml diff --git a/astrid/res/drawable/filter_inbox.png b/astrid/src/main/res/drawable/filter_inbox.png similarity index 100% rename from astrid/res/drawable/filter_inbox.png rename to astrid/src/main/res/drawable/filter_inbox.png diff --git a/astrid/res/drawable/filter_inbox_dark.png b/astrid/src/main/res/drawable/filter_inbox_dark.png similarity index 100% rename from astrid/res/drawable/filter_inbox_dark.png rename to astrid/src/main/res/drawable/filter_inbox_dark.png diff --git a/astrid/res/drawable/filter_new.png b/astrid/src/main/res/drawable/filter_new.png similarity index 100% rename from astrid/res/drawable/filter_new.png rename to astrid/src/main/res/drawable/filter_new.png diff --git a/astrid/res/drawable/filter_pencil.png b/astrid/src/main/res/drawable/filter_pencil.png similarity index 100% rename from astrid/res/drawable/filter_pencil.png rename to astrid/src/main/res/drawable/filter_pencil.png diff --git a/astrid/res/drawable/filter_pencil_dark.png b/astrid/src/main/res/drawable/filter_pencil_dark.png similarity index 100% rename from astrid/res/drawable/filter_pencil_dark.png rename to astrid/src/main/res/drawable/filter_pencil_dark.png diff --git a/astrid/res/drawable/filter_plus_button.png b/astrid/src/main/res/drawable/filter_plus_button.png similarity index 100% rename from astrid/res/drawable/filter_plus_button.png rename to astrid/src/main/res/drawable/filter_plus_button.png diff --git a/astrid/res/drawable/filter_selected_icon.png b/astrid/src/main/res/drawable/filter_selected_icon.png similarity index 100% rename from astrid/res/drawable/filter_selected_icon.png rename to astrid/src/main/res/drawable/filter_selected_icon.png diff --git a/astrid/res/drawable/filter_selected_icon_black.png b/astrid/src/main/res/drawable/filter_selected_icon_black.png similarity index 100% rename from astrid/res/drawable/filter_selected_icon_black.png rename to astrid/src/main/res/drawable/filter_selected_icon_black.png diff --git a/astrid/res/drawable/filter_sliders.png b/astrid/src/main/res/drawable/filter_sliders.png similarity index 100% rename from astrid/res/drawable/filter_sliders.png rename to astrid/src/main/res/drawable/filter_sliders.png diff --git a/astrid/res/drawable/filter_sliders_dark.png b/astrid/src/main/res/drawable/filter_sliders_dark.png similarity index 100% rename from astrid/res/drawable/filter_sliders_dark.png rename to astrid/src/main/res/drawable/filter_sliders_dark.png diff --git a/astrid/res/drawable/footer_editbutton.xml b/astrid/src/main/res/drawable/footer_editbutton.xml similarity index 100% rename from astrid/res/drawable/footer_editbutton.xml rename to astrid/src/main/res/drawable/footer_editbutton.xml diff --git a/astrid/res/drawable/footer_editbutton_normal.9.png b/astrid/src/main/res/drawable/footer_editbutton_normal.9.png similarity index 100% rename from astrid/res/drawable/footer_editbutton_normal.9.png rename to astrid/src/main/res/drawable/footer_editbutton_normal.9.png diff --git a/astrid/res/drawable/footer_editbutton_pressed.9.png b/astrid/src/main/res/drawable/footer_editbutton_pressed.9.png similarity index 100% rename from astrid/res/drawable/footer_editbutton_pressed.9.png rename to astrid/src/main/res/drawable/footer_editbutton_pressed.9.png diff --git a/astrid/res/drawable/gl_lists.png b/astrid/src/main/res/drawable/gl_lists.png similarity index 100% rename from astrid/res/drawable/gl_lists.png rename to astrid/src/main/res/drawable/gl_lists.png diff --git a/astrid/res/drawable/gl_lists_dark.png b/astrid/src/main/res/drawable/gl_lists_dark.png similarity index 100% rename from astrid/res/drawable/gl_lists_dark.png rename to astrid/src/main/res/drawable/gl_lists_dark.png diff --git a/astrid/res/drawable/gl_more.png b/astrid/src/main/res/drawable/gl_more.png similarity index 100% rename from astrid/res/drawable/gl_more.png rename to astrid/src/main/res/drawable/gl_more.png diff --git a/astrid/res/drawable/gl_pencil.png b/astrid/src/main/res/drawable/gl_pencil.png similarity index 100% rename from astrid/res/drawable/gl_pencil.png rename to astrid/src/main/res/drawable/gl_pencil.png diff --git a/astrid/res/drawable/google.png b/astrid/src/main/res/drawable/google.png similarity index 100% rename from astrid/res/drawable/google.png rename to astrid/src/main/res/drawable/google.png diff --git a/astrid/res/drawable/grabber.png b/astrid/src/main/res/drawable/grabber.png similarity index 100% rename from astrid/res/drawable/grabber.png rename to astrid/src/main/res/drawable/grabber.png diff --git a/astrid/res/drawable/gtasks_detail.png b/astrid/src/main/res/drawable/gtasks_detail.png similarity index 100% rename from astrid/res/drawable/gtasks_detail.png rename to astrid/src/main/res/drawable/gtasks_detail.png diff --git a/astrid/res/drawable/gtasks_icon.png b/astrid/src/main/res/drawable/gtasks_icon.png similarity index 100% rename from astrid/res/drawable/gtasks_icon.png rename to astrid/src/main/res/drawable/gtasks_icon.png diff --git a/astrid/res/drawable/header_background.9.png b/astrid/src/main/res/drawable/header_background.9.png similarity index 100% rename from astrid/res/drawable/header_background.9.png rename to astrid/src/main/res/drawable/header_background.9.png diff --git a/astrid/res/drawable/header_background_pressed.9.png b/astrid/src/main/res/drawable/header_background_pressed.9.png similarity index 100% rename from astrid/res/drawable/header_background_pressed.9.png rename to astrid/src/main/res/drawable/header_background_pressed.9.png diff --git a/astrid/res/drawable/header_background_white.9.png b/astrid/src/main/res/drawable/header_background_white.9.png similarity index 100% rename from astrid/res/drawable/header_background_white.9.png rename to astrid/src/main/res/drawable/header_background_white.9.png diff --git a/astrid/res/drawable/header_blue.9.png b/astrid/src/main/res/drawable/header_blue.9.png similarity index 100% rename from astrid/res/drawable/header_blue.9.png rename to astrid/src/main/res/drawable/header_blue.9.png diff --git a/astrid/res/drawable/header_blue_alt.9.png b/astrid/src/main/res/drawable/header_blue_alt.9.png similarity index 100% rename from astrid/res/drawable/header_blue_alt.9.png rename to astrid/src/main/res/drawable/header_blue_alt.9.png diff --git a/astrid/res/drawable/header_button.xml b/astrid/src/main/res/drawable/header_button.xml similarity index 100% rename from astrid/res/drawable/header_button.xml rename to astrid/src/main/res/drawable/header_button.xml diff --git a/astrid/res/drawable/header_button_white.xml b/astrid/src/main/res/drawable/header_button_white.xml similarity index 100% rename from astrid/res/drawable/header_button_white.xml rename to astrid/src/main/res/drawable/header_button_white.xml diff --git a/astrid/res/drawable/header_day_blue.9.png b/astrid/src/main/res/drawable/header_day_blue.9.png similarity index 100% rename from astrid/res/drawable/header_day_blue.9.png rename to astrid/src/main/res/drawable/header_day_blue.9.png diff --git a/astrid/res/drawable/header_red.9.png b/astrid/src/main/res/drawable/header_red.9.png similarity index 100% rename from astrid/res/drawable/header_red.9.png rename to astrid/src/main/res/drawable/header_red.9.png diff --git a/astrid/res/drawable/home_button_blue.png b/astrid/src/main/res/drawable/home_button_blue.png similarity index 100% rename from astrid/res/drawable/home_button_blue.png rename to astrid/src/main/res/drawable/home_button_blue.png diff --git a/astrid/res/drawable/home_button_blue_alt.png b/astrid/src/main/res/drawable/home_button_blue_alt.png similarity index 100% rename from astrid/res/drawable/home_button_blue_alt.png rename to astrid/src/main/res/drawable/home_button_blue_alt.png diff --git a/astrid/res/drawable/home_button_dark_blue.png b/astrid/src/main/res/drawable/home_button_dark_blue.png similarity index 100% rename from astrid/res/drawable/home_button_dark_blue.png rename to astrid/src/main/res/drawable/home_button_dark_blue.png diff --git a/astrid/res/drawable/home_button_red.png b/astrid/src/main/res/drawable/home_button_red.png similarity index 100% rename from astrid/res/drawable/home_button_red.png rename to astrid/src/main/res/drawable/home_button_red.png diff --git a/astrid/res/drawable/ic_contact_picture_2.png b/astrid/src/main/res/drawable/ic_contact_picture_2.png similarity index 100% rename from astrid/res/drawable/ic_contact_picture_2.png rename to astrid/src/main/res/drawable/ic_contact_picture_2.png diff --git a/astrid/res/drawable/ic_dialog_time.png b/astrid/src/main/res/drawable/ic_dialog_time.png similarity index 100% rename from astrid/res/drawable/ic_dialog_time.png rename to astrid/src/main/res/drawable/ic_dialog_time.png diff --git a/astrid/res/drawable/ic_menu_attach.png b/astrid/src/main/res/drawable/ic_menu_attach.png similarity index 100% rename from astrid/res/drawable/ic_menu_attach.png rename to astrid/src/main/res/drawable/ic_menu_attach.png diff --git a/astrid/res/drawable/ic_menu_attach_blue_alt.png b/astrid/src/main/res/drawable/ic_menu_attach_blue_alt.png similarity index 100% rename from astrid/res/drawable/ic_menu_attach_blue_alt.png rename to astrid/src/main/res/drawable/ic_menu_attach_blue_alt.png diff --git a/astrid/res/drawable/ic_menu_close.png b/astrid/src/main/res/drawable/ic_menu_close.png similarity index 100% rename from astrid/res/drawable/ic_menu_close.png rename to astrid/src/main/res/drawable/ic_menu_close.png diff --git a/astrid/res/drawable/ic_menu_close_blue_alt.png b/astrid/src/main/res/drawable/ic_menu_close_blue_alt.png similarity index 100% rename from astrid/res/drawable/ic_menu_close_blue_alt.png rename to astrid/src/main/res/drawable/ic_menu_close_blue_alt.png diff --git a/astrid/res/drawable/ic_menu_list_copy.png b/astrid/src/main/res/drawable/ic_menu_list_copy.png similarity index 100% rename from astrid/res/drawable/ic_menu_list_copy.png rename to astrid/src/main/res/drawable/ic_menu_list_copy.png diff --git a/astrid/res/drawable/ic_menu_list_copy_blue_alt.png b/astrid/src/main/res/drawable/ic_menu_list_copy_blue_alt.png similarity index 100% rename from astrid/res/drawable/ic_menu_list_copy_blue_alt.png rename to astrid/src/main/res/drawable/ic_menu_list_copy_blue_alt.png diff --git a/astrid/res/drawable/ic_menu_mic.png b/astrid/src/main/res/drawable/ic_menu_mic.png similarity index 100% rename from astrid/res/drawable/ic_menu_mic.png rename to astrid/src/main/res/drawable/ic_menu_mic.png diff --git a/astrid/res/drawable/ic_menu_mic_blue_alt.png b/astrid/src/main/res/drawable/ic_menu_mic_blue_alt.png similarity index 100% rename from astrid/res/drawable/ic_menu_mic_blue_alt.png rename to astrid/src/main/res/drawable/ic_menu_mic_blue_alt.png diff --git a/astrid/res/drawable/ic_menu_save.png b/astrid/src/main/res/drawable/ic_menu_save.png similarity index 100% rename from astrid/res/drawable/ic_menu_save.png rename to astrid/src/main/res/drawable/ic_menu_save.png diff --git a/astrid/res/drawable/ic_menu_save_blue_alt.png b/astrid/src/main/res/drawable/ic_menu_save_blue_alt.png similarity index 100% rename from astrid/res/drawable/ic_menu_save_blue_alt.png rename to astrid/src/main/res/drawable/ic_menu_save_blue_alt.png diff --git a/astrid/res/drawable/ic_producteev_notification.png b/astrid/src/main/res/drawable/ic_producteev_notification.png similarity index 100% rename from astrid/res/drawable/ic_producteev_notification.png rename to astrid/src/main/res/drawable/ic_producteev_notification.png diff --git a/astrid/res/drawable/icn_add_contact.png b/astrid/src/main/res/drawable/icn_add_contact.png similarity index 100% rename from astrid/res/drawable/icn_add_contact.png rename to astrid/src/main/res/drawable/icn_add_contact.png diff --git a/astrid/res/drawable/icn_anyone.png b/astrid/src/main/res/drawable/icn_anyone.png similarity index 100% rename from astrid/res/drawable/icn_anyone.png rename to astrid/src/main/res/drawable/icn_anyone.png diff --git a/astrid/res/drawable/icn_anyone_transparent.png b/astrid/src/main/res/drawable/icn_anyone_transparent.png similarity index 100% rename from astrid/res/drawable/icn_anyone_transparent.png rename to astrid/src/main/res/drawable/icn_anyone_transparent.png diff --git a/astrid/res/drawable/icn_arrow_down.png b/astrid/src/main/res/drawable/icn_arrow_down.png similarity index 100% rename from astrid/res/drawable/icn_arrow_down.png rename to astrid/src/main/res/drawable/icn_arrow_down.png diff --git a/astrid/res/drawable/icn_arrow_left.png b/astrid/src/main/res/drawable/icn_arrow_left.png similarity index 100% rename from astrid/res/drawable/icn_arrow_left.png rename to astrid/src/main/res/drawable/icn_arrow_left.png diff --git a/astrid/res/drawable/icn_arrow_left_white.png b/astrid/src/main/res/drawable/icn_arrow_left_white.png similarity index 100% rename from astrid/res/drawable/icn_arrow_left_white.png rename to astrid/src/main/res/drawable/icn_arrow_left_white.png diff --git a/astrid/res/drawable/icn_arrow_right.png b/astrid/src/main/res/drawable/icn_arrow_right.png similarity index 100% rename from astrid/res/drawable/icn_arrow_right.png rename to astrid/src/main/res/drawable/icn_arrow_right.png diff --git a/astrid/res/drawable/icn_arrow_right_white.png b/astrid/src/main/res/drawable/icn_arrow_right_white.png similarity index 100% rename from astrid/res/drawable/icn_arrow_right_white.png rename to astrid/src/main/res/drawable/icn_arrow_right_white.png diff --git a/astrid/res/drawable/icn_arrow_up.png b/astrid/src/main/res/drawable/icn_arrow_up.png similarity index 100% rename from astrid/res/drawable/icn_arrow_up.png rename to astrid/src/main/res/drawable/icn_arrow_up.png diff --git a/astrid/res/drawable/icn_check_off.png b/astrid/src/main/res/drawable/icn_check_off.png similarity index 100% rename from astrid/res/drawable/icn_check_off.png rename to astrid/src/main/res/drawable/icn_check_off.png diff --git a/astrid/res/drawable/icn_check_on.png b/astrid/src/main/res/drawable/icn_check_on.png similarity index 100% rename from astrid/res/drawable/icn_check_on.png rename to astrid/src/main/res/drawable/icn_check_on.png diff --git a/astrid/res/drawable/icn_clone_down.png b/astrid/src/main/res/drawable/icn_clone_down.png similarity index 100% rename from astrid/res/drawable/icn_clone_down.png rename to astrid/src/main/res/drawable/icn_clone_down.png diff --git a/astrid/res/drawable/icn_clone_up.png b/astrid/src/main/res/drawable/icn_clone_up.png similarity index 100% rename from astrid/res/drawable/icn_clone_up.png rename to astrid/src/main/res/drawable/icn_clone_up.png diff --git a/astrid/res/drawable/icn_default_person_image.png b/astrid/src/main/res/drawable/icn_default_person_image.png similarity index 100% rename from astrid/res/drawable/icn_default_person_image.png rename to astrid/src/main/res/drawable/icn_default_person_image.png diff --git a/astrid/res/drawable/icn_edit_calendar.png b/astrid/src/main/res/drawable/icn_edit_calendar.png similarity index 100% rename from astrid/res/drawable/icn_edit_calendar.png rename to astrid/src/main/res/drawable/icn_edit_calendar.png diff --git a/astrid/res/drawable/icn_edit_repeats.png b/astrid/src/main/res/drawable/icn_edit_repeats.png similarity index 100% rename from astrid/res/drawable/icn_edit_repeats.png rename to astrid/src/main/res/drawable/icn_edit_repeats.png diff --git a/astrid/res/drawable/icn_edit_repeats_blue.png b/astrid/src/main/res/drawable/icn_edit_repeats_blue.png similarity index 100% rename from astrid/res/drawable/icn_edit_repeats_blue.png rename to astrid/src/main/res/drawable/icn_edit_repeats_blue.png diff --git a/astrid/res/drawable/icn_edit_repeats_dark_blue.png b/astrid/src/main/res/drawable/icn_edit_repeats_dark_blue.png similarity index 100% rename from astrid/res/drawable/icn_edit_repeats_dark_blue.png rename to astrid/src/main/res/drawable/icn_edit_repeats_dark_blue.png diff --git a/astrid/res/drawable/icn_edit_repeats_red.png b/astrid/src/main/res/drawable/icn_edit_repeats_red.png similarity index 100% rename from astrid/res/drawable/icn_edit_repeats_red.png rename to astrid/src/main/res/drawable/icn_edit_repeats_red.png diff --git a/astrid/res/drawable/icn_edit_repeats_white.png b/astrid/src/main/res/drawable/icn_edit_repeats_white.png similarity index 100% rename from astrid/res/drawable/icn_edit_repeats_white.png rename to astrid/src/main/res/drawable/icn_edit_repeats_white.png diff --git a/astrid/res/drawable/icn_edit_timer.png b/astrid/src/main/res/drawable/icn_edit_timer.png similarity index 100% rename from astrid/res/drawable/icn_edit_timer.png rename to astrid/src/main/res/drawable/icn_edit_timer.png diff --git a/astrid/res/drawable/icn_featured_lists.png b/astrid/src/main/res/drawable/icn_featured_lists.png similarity index 100% rename from astrid/res/drawable/icn_featured_lists.png rename to astrid/src/main/res/drawable/icn_featured_lists.png diff --git a/astrid/res/drawable/icn_featured_lists_dark.png b/astrid/src/main/res/drawable/icn_featured_lists_dark.png similarity index 100% rename from astrid/res/drawable/icn_featured_lists_dark.png rename to astrid/src/main/res/drawable/icn_featured_lists_dark.png diff --git a/astrid/res/drawable/icn_friends.png b/astrid/src/main/res/drawable/icn_friends.png similarity index 100% rename from astrid/res/drawable/icn_friends.png rename to astrid/src/main/res/drawable/icn_friends.png diff --git a/astrid/res/drawable/icn_list_shortcut.png b/astrid/src/main/res/drawable/icn_list_shortcut.png similarity index 100% rename from astrid/res/drawable/icn_list_shortcut.png rename to astrid/src/main/res/drawable/icn_list_shortcut.png diff --git a/astrid/res/drawable/icn_menu_filters.png b/astrid/src/main/res/drawable/icn_menu_filters.png similarity index 100% rename from astrid/res/drawable/icn_menu_filters.png rename to astrid/src/main/res/drawable/icn_menu_filters.png diff --git a/astrid/res/drawable/icn_menu_filters_dark.png b/astrid/src/main/res/drawable/icn_menu_filters_dark.png similarity index 100% rename from astrid/res/drawable/icn_menu_filters_dark.png rename to astrid/src/main/res/drawable/icn_menu_filters_dark.png diff --git a/astrid/res/drawable/icn_menu_friends.png b/astrid/src/main/res/drawable/icn_menu_friends.png similarity index 100% rename from astrid/res/drawable/icn_menu_friends.png rename to astrid/src/main/res/drawable/icn_menu_friends.png diff --git a/astrid/res/drawable/icn_menu_friends_dark.png b/astrid/src/main/res/drawable/icn_menu_friends_dark.png similarity index 100% rename from astrid/res/drawable/icn_menu_friends_dark.png rename to astrid/src/main/res/drawable/icn_menu_friends_dark.png diff --git a/astrid/res/drawable/icn_menu_lists.png b/astrid/src/main/res/drawable/icn_menu_lists.png similarity index 100% rename from astrid/res/drawable/icn_menu_lists.png rename to astrid/src/main/res/drawable/icn_menu_lists.png diff --git a/astrid/res/drawable/icn_menu_lists_dark.png b/astrid/src/main/res/drawable/icn_menu_lists_dark.png similarity index 100% rename from astrid/res/drawable/icn_menu_lists_dark.png rename to astrid/src/main/res/drawable/icn_menu_lists_dark.png diff --git a/astrid/res/drawable/icn_menu_plugins.png b/astrid/src/main/res/drawable/icn_menu_plugins.png similarity index 100% rename from astrid/res/drawable/icn_menu_plugins.png rename to astrid/src/main/res/drawable/icn_menu_plugins.png diff --git a/astrid/res/drawable/icn_menu_plugins_dark.png b/astrid/src/main/res/drawable/icn_menu_plugins_dark.png similarity index 100% rename from astrid/res/drawable/icn_menu_plugins_dark.png rename to astrid/src/main/res/drawable/icn_menu_plugins_dark.png diff --git a/astrid/res/drawable/icn_menu_refresh.png b/astrid/src/main/res/drawable/icn_menu_refresh.png similarity index 100% rename from astrid/res/drawable/icn_menu_refresh.png rename to astrid/src/main/res/drawable/icn_menu_refresh.png diff --git a/astrid/res/drawable/icn_menu_refresh_dark.png b/astrid/src/main/res/drawable/icn_menu_refresh_dark.png similarity index 100% rename from astrid/res/drawable/icn_menu_refresh_dark.png rename to astrid/src/main/res/drawable/icn_menu_refresh_dark.png diff --git a/astrid/res/drawable/icn_menu_search.png b/astrid/src/main/res/drawable/icn_menu_search.png similarity index 100% rename from astrid/res/drawable/icn_menu_search.png rename to astrid/src/main/res/drawable/icn_menu_search.png diff --git a/astrid/res/drawable/icn_menu_search_dark.png b/astrid/src/main/res/drawable/icn_menu_search_dark.png similarity index 100% rename from astrid/res/drawable/icn_menu_search_dark.png rename to astrid/src/main/res/drawable/icn_menu_search_dark.png diff --git a/astrid/res/drawable/icn_menu_settings.png b/astrid/src/main/res/drawable/icn_menu_settings.png similarity index 100% rename from astrid/res/drawable/icn_menu_settings.png rename to astrid/src/main/res/drawable/icn_menu_settings.png diff --git a/astrid/res/drawable/icn_menu_settings_dark.png b/astrid/src/main/res/drawable/icn_menu_settings_dark.png similarity index 100% rename from astrid/res/drawable/icn_menu_settings_dark.png rename to astrid/src/main/res/drawable/icn_menu_settings_dark.png diff --git a/astrid/res/drawable/icn_menu_sort_by_size.png b/astrid/src/main/res/drawable/icn_menu_sort_by_size.png similarity index 100% rename from astrid/res/drawable/icn_menu_sort_by_size.png rename to astrid/src/main/res/drawable/icn_menu_sort_by_size.png diff --git a/astrid/res/drawable/icn_menu_sort_by_size_dark.png b/astrid/src/main/res/drawable/icn_menu_sort_by_size_dark.png similarity index 100% rename from astrid/res/drawable/icn_menu_sort_by_size_dark.png rename to astrid/src/main/res/drawable/icn_menu_sort_by_size_dark.png diff --git a/astrid/res/drawable/icn_menu_support.png b/astrid/src/main/res/drawable/icn_menu_support.png similarity index 100% rename from astrid/res/drawable/icn_menu_support.png rename to astrid/src/main/res/drawable/icn_menu_support.png diff --git a/astrid/res/drawable/icn_menu_support_dark.png b/astrid/src/main/res/drawable/icn_menu_support_dark.png similarity index 100% rename from astrid/res/drawable/icn_menu_support_dark.png rename to astrid/src/main/res/drawable/icn_menu_support_dark.png diff --git a/astrid/res/drawable/icn_menu_tutorial.png b/astrid/src/main/res/drawable/icn_menu_tutorial.png similarity index 100% rename from astrid/res/drawable/icn_menu_tutorial.png rename to astrid/src/main/res/drawable/icn_menu_tutorial.png diff --git a/astrid/res/drawable/icn_menu_tutorial_dark.png b/astrid/src/main/res/drawable/icn_menu_tutorial_dark.png similarity index 100% rename from astrid/res/drawable/icn_menu_tutorial_dark.png rename to astrid/src/main/res/drawable/icn_menu_tutorial_dark.png diff --git a/astrid/res/drawable/icn_thumbsdown.png b/astrid/src/main/res/drawable/icn_thumbsdown.png similarity index 100% rename from astrid/res/drawable/icn_thumbsdown.png rename to astrid/src/main/res/drawable/icn_thumbsdown.png diff --git a/astrid/res/drawable/icn_thumbsup.png b/astrid/src/main/res/drawable/icn_thumbsup.png similarity index 100% rename from astrid/res/drawable/icn_thumbsup.png rename to astrid/src/main/res/drawable/icn_thumbsup.png diff --git a/astrid/res/drawable/icn_timer_stop.png b/astrid/src/main/res/drawable/icn_timer_stop.png similarity index 100% rename from astrid/res/drawable/icn_timer_stop.png rename to astrid/src/main/res/drawable/icn_timer_stop.png diff --git a/astrid/res/drawable/icon.png b/astrid/src/main/res/drawable/icon.png similarity index 100% rename from astrid/res/drawable/icon.png rename to astrid/src/main/res/drawable/icon.png diff --git a/astrid/res/drawable/icon_32.png b/astrid/src/main/res/drawable/icon_32.png similarity index 100% rename from astrid/res/drawable/icon_32.png rename to astrid/src/main/res/drawable/icon_32.png diff --git a/astrid/res/drawable/icon_48.png b/astrid/src/main/res/drawable/icon_48.png similarity index 100% rename from astrid/res/drawable/icon_48.png rename to astrid/src/main/res/drawable/icon_48.png diff --git a/astrid/res/drawable/icon_blank.png b/astrid/src/main/res/drawable/icon_blank.png similarity index 100% rename from astrid/res/drawable/icon_blank.png rename to astrid/src/main/res/drawable/icon_blank.png diff --git a/astrid/res/drawable/icon_locale.png b/astrid/src/main/res/drawable/icon_locale.png similarity index 100% rename from astrid/res/drawable/icon_locale.png rename to astrid/src/main/res/drawable/icon_locale.png diff --git a/astrid/res/drawable/icon_pp.png b/astrid/src/main/res/drawable/icon_pp.png similarity index 100% rename from astrid/res/drawable/icon_pp.png rename to astrid/src/main/res/drawable/icon_pp.png diff --git a/astrid/res/drawable/icon_simple.png b/astrid/src/main/res/drawable/icon_simple.png similarity index 100% rename from astrid/res/drawable/icon_simple.png rename to astrid/src/main/res/drawable/icon_simple.png diff --git a/astrid/res/drawable/icon_simple_32.png b/astrid/src/main/res/drawable/icon_simple_32.png similarity index 100% rename from astrid/res/drawable/icon_simple_32.png rename to astrid/src/main/res/drawable/icon_simple_32.png diff --git a/astrid/res/drawable/icon_simple_48.png b/astrid/src/main/res/drawable/icon_simple_48.png similarity index 100% rename from astrid/res/drawable/icon_simple_48.png rename to astrid/src/main/res/drawable/icon_simple_48.png diff --git a/astrid/res/drawable/importance_1.xml b/astrid/src/main/res/drawable/importance_1.xml similarity index 100% rename from astrid/res/drawable/importance_1.xml rename to astrid/src/main/res/drawable/importance_1.xml diff --git a/astrid/res/drawable/importance_2.xml b/astrid/src/main/res/drawable/importance_2.xml similarity index 100% rename from astrid/res/drawable/importance_2.xml rename to astrid/src/main/res/drawable/importance_2.xml diff --git a/astrid/res/drawable/importance_3.xml b/astrid/src/main/res/drawable/importance_3.xml similarity index 100% rename from astrid/res/drawable/importance_3.xml rename to astrid/src/main/res/drawable/importance_3.xml diff --git a/astrid/res/drawable/importance_4.xml b/astrid/src/main/res/drawable/importance_4.xml similarity index 100% rename from astrid/res/drawable/importance_4.xml rename to astrid/src/main/res/drawable/importance_4.xml diff --git a/astrid/res/drawable/importance_background_selected.xml b/astrid/src/main/res/drawable/importance_background_selected.xml similarity index 100% rename from astrid/res/drawable/importance_background_selected.xml rename to astrid/src/main/res/drawable/importance_background_selected.xml diff --git a/astrid/res/drawable/importance_background_selected_dark.xml b/astrid/src/main/res/drawable/importance_background_selected_dark.xml similarity index 100% rename from astrid/res/drawable/importance_background_selected_dark.xml rename to astrid/src/main/res/drawable/importance_background_selected_dark.xml diff --git a/astrid/res/drawable/importance_check_1.xml b/astrid/src/main/res/drawable/importance_check_1.xml similarity index 100% rename from astrid/res/drawable/importance_check_1.xml rename to astrid/src/main/res/drawable/importance_check_1.xml diff --git a/astrid/res/drawable/importance_check_2.xml b/astrid/src/main/res/drawable/importance_check_2.xml similarity index 100% rename from astrid/res/drawable/importance_check_2.xml rename to astrid/src/main/res/drawable/importance_check_2.xml diff --git a/astrid/res/drawable/importance_check_3.xml b/astrid/src/main/res/drawable/importance_check_3.xml similarity index 100% rename from astrid/res/drawable/importance_check_3.xml rename to astrid/src/main/res/drawable/importance_check_3.xml diff --git a/astrid/res/drawable/importance_check_4.xml b/astrid/src/main/res/drawable/importance_check_4.xml similarity index 100% rename from astrid/res/drawable/importance_check_4.xml rename to astrid/src/main/res/drawable/importance_check_4.xml diff --git a/astrid/res/drawable/importance_check_repeat_1.xml b/astrid/src/main/res/drawable/importance_check_repeat_1.xml similarity index 100% rename from astrid/res/drawable/importance_check_repeat_1.xml rename to astrid/src/main/res/drawable/importance_check_repeat_1.xml diff --git a/astrid/res/drawable/importance_check_repeat_2.xml b/astrid/src/main/res/drawable/importance_check_repeat_2.xml similarity index 100% rename from astrid/res/drawable/importance_check_repeat_2.xml rename to astrid/src/main/res/drawable/importance_check_repeat_2.xml diff --git a/astrid/res/drawable/importance_check_repeat_3.xml b/astrid/src/main/res/drawable/importance_check_repeat_3.xml similarity index 100% rename from astrid/res/drawable/importance_check_repeat_3.xml rename to astrid/src/main/res/drawable/importance_check_repeat_3.xml diff --git a/astrid/res/drawable/importance_check_repeat_4.xml b/astrid/src/main/res/drawable/importance_check_repeat_4.xml similarity index 100% rename from astrid/res/drawable/importance_check_repeat_4.xml rename to astrid/src/main/res/drawable/importance_check_repeat_4.xml diff --git a/astrid/res/drawable/list_arrow_down.png b/astrid/src/main/res/drawable/list_arrow_down.png similarity index 100% rename from astrid/res/drawable/list_arrow_down.png rename to astrid/src/main/res/drawable/list_arrow_down.png diff --git a/astrid/res/drawable/list_arrow_up.png b/astrid/src/main/res/drawable/list_arrow_up.png similarity index 100% rename from astrid/res/drawable/list_arrow_up.png rename to astrid/src/main/res/drawable/list_arrow_up.png diff --git a/astrid/res/drawable/list_arrow_up_white.png b/astrid/src/main/res/drawable/list_arrow_up_white.png similarity index 100% rename from astrid/res/drawable/list_arrow_up_white.png rename to astrid/src/main/res/drawable/list_arrow_up_white.png diff --git a/astrid/res/drawable/list_popover_bg.9.png b/astrid/src/main/res/drawable/list_popover_bg.9.png similarity index 100% rename from astrid/res/drawable/list_popover_bg.9.png rename to astrid/src/main/res/drawable/list_popover_bg.9.png diff --git a/astrid/res/drawable/list_popover_bg_white.9.png b/astrid/src/main/res/drawable/list_popover_bg_white.9.png similarity index 100% rename from astrid/res/drawable/list_popover_bg_white.9.png rename to astrid/src/main/res/drawable/list_popover_bg_white.9.png diff --git a/astrid/res/drawable/list_settings.png b/astrid/src/main/res/drawable/list_settings.png similarity index 100% rename from astrid/res/drawable/list_settings.png rename to astrid/src/main/res/drawable/list_settings.png diff --git a/astrid/res/drawable/list_settings_white.png b/astrid/src/main/res/drawable/list_settings_white.png similarity index 100% rename from astrid/res/drawable/list_settings_white.png rename to astrid/src/main/res/drawable/list_settings_white.png diff --git a/astrid/res/drawable/lists_disclosure_blue.xml b/astrid/src/main/res/drawable/lists_disclosure_blue.xml similarity index 100% rename from astrid/res/drawable/lists_disclosure_blue.xml rename to astrid/src/main/res/drawable/lists_disclosure_blue.xml diff --git a/astrid/res/drawable/lists_disclosure_blue_alt.xml b/astrid/src/main/res/drawable/lists_disclosure_blue_alt.xml similarity index 100% rename from astrid/res/drawable/lists_disclosure_blue_alt.xml rename to astrid/src/main/res/drawable/lists_disclosure_blue_alt.xml diff --git a/astrid/res/drawable/lists_disclosure_blue_off.png b/astrid/src/main/res/drawable/lists_disclosure_blue_off.png similarity index 100% rename from astrid/res/drawable/lists_disclosure_blue_off.png rename to astrid/src/main/res/drawable/lists_disclosure_blue_off.png diff --git a/astrid/res/drawable/lists_disclosure_blue_on.png b/astrid/src/main/res/drawable/lists_disclosure_blue_on.png similarity index 100% rename from astrid/res/drawable/lists_disclosure_blue_on.png rename to astrid/src/main/res/drawable/lists_disclosure_blue_on.png diff --git a/astrid/res/drawable/lists_disclosure_dark_blue.xml b/astrid/src/main/res/drawable/lists_disclosure_dark_blue.xml similarity index 100% rename from astrid/res/drawable/lists_disclosure_dark_blue.xml rename to astrid/src/main/res/drawable/lists_disclosure_dark_blue.xml diff --git a/astrid/res/drawable/lists_disclosure_dark_blue_off.png b/astrid/src/main/res/drawable/lists_disclosure_dark_blue_off.png similarity index 100% rename from astrid/res/drawable/lists_disclosure_dark_blue_off.png rename to astrid/src/main/res/drawable/lists_disclosure_dark_blue_off.png diff --git a/astrid/res/drawable/lists_disclosure_dark_blue_on.png b/astrid/src/main/res/drawable/lists_disclosure_dark_blue_on.png similarity index 100% rename from astrid/res/drawable/lists_disclosure_dark_blue_on.png rename to astrid/src/main/res/drawable/lists_disclosure_dark_blue_on.png diff --git a/astrid/res/drawable/lists_disclosure_red.xml b/astrid/src/main/res/drawable/lists_disclosure_red.xml similarity index 100% rename from astrid/res/drawable/lists_disclosure_red.xml rename to astrid/src/main/res/drawable/lists_disclosure_red.xml diff --git a/astrid/res/drawable/lists_disclosure_red_off.png b/astrid/src/main/res/drawable/lists_disclosure_red_off.png similarity index 100% rename from astrid/res/drawable/lists_disclosure_red_off.png rename to astrid/src/main/res/drawable/lists_disclosure_red_off.png diff --git a/astrid/res/drawable/lists_disclosure_red_on.png b/astrid/src/main/res/drawable/lists_disclosure_red_on.png similarity index 100% rename from astrid/res/drawable/lists_disclosure_red_on.png rename to astrid/src/main/res/drawable/lists_disclosure_red_on.png diff --git a/astrid/res/drawable/locale_border.9.png b/astrid/src/main/res/drawable/locale_border.9.png similarity index 100% rename from astrid/res/drawable/locale_border.9.png rename to astrid/src/main/res/drawable/locale_border.9.png diff --git a/astrid/res/drawable/med_tag.png b/astrid/src/main/res/drawable/med_tag.png similarity index 100% rename from astrid/res/drawable/med_tag.png rename to astrid/src/main/res/drawable/med_tag.png diff --git a/astrid/res/drawable/menu_button_blue.xml b/astrid/src/main/res/drawable/menu_button_blue.xml similarity index 100% rename from astrid/res/drawable/menu_button_blue.xml rename to astrid/src/main/res/drawable/menu_button_blue.xml diff --git a/astrid/res/drawable/menu_button_blue_alt.xml b/astrid/src/main/res/drawable/menu_button_blue_alt.xml similarity index 100% rename from astrid/res/drawable/menu_button_blue_alt.xml rename to astrid/src/main/res/drawable/menu_button_blue_alt.xml diff --git a/astrid/res/drawable/menu_button_blue_alt_off.png b/astrid/src/main/res/drawable/menu_button_blue_alt_off.png similarity index 100% rename from astrid/res/drawable/menu_button_blue_alt_off.png rename to astrid/src/main/res/drawable/menu_button_blue_alt_off.png diff --git a/astrid/res/drawable/menu_button_blue_alt_on.png b/astrid/src/main/res/drawable/menu_button_blue_alt_on.png similarity index 100% rename from astrid/res/drawable/menu_button_blue_alt_on.png rename to astrid/src/main/res/drawable/menu_button_blue_alt_on.png diff --git a/astrid/res/drawable/menu_button_blue_off.png b/astrid/src/main/res/drawable/menu_button_blue_off.png similarity index 100% rename from astrid/res/drawable/menu_button_blue_off.png rename to astrid/src/main/res/drawable/menu_button_blue_off.png diff --git a/astrid/res/drawable/menu_button_blue_on.png b/astrid/src/main/res/drawable/menu_button_blue_on.png similarity index 100% rename from astrid/res/drawable/menu_button_blue_on.png rename to astrid/src/main/res/drawable/menu_button_blue_on.png diff --git a/astrid/res/drawable/menu_button_dark_blue.xml b/astrid/src/main/res/drawable/menu_button_dark_blue.xml similarity index 100% rename from astrid/res/drawable/menu_button_dark_blue.xml rename to astrid/src/main/res/drawable/menu_button_dark_blue.xml diff --git a/astrid/res/drawable/menu_button_dark_blue_off.png b/astrid/src/main/res/drawable/menu_button_dark_blue_off.png similarity index 100% rename from astrid/res/drawable/menu_button_dark_blue_off.png rename to astrid/src/main/res/drawable/menu_button_dark_blue_off.png diff --git a/astrid/res/drawable/menu_button_dark_blue_on.png b/astrid/src/main/res/drawable/menu_button_dark_blue_on.png similarity index 100% rename from astrid/res/drawable/menu_button_dark_blue_on.png rename to astrid/src/main/res/drawable/menu_button_dark_blue_on.png diff --git a/astrid/res/drawable/menu_button_red.xml b/astrid/src/main/res/drawable/menu_button_red.xml similarity index 100% rename from astrid/res/drawable/menu_button_red.xml rename to astrid/src/main/res/drawable/menu_button_red.xml diff --git a/astrid/res/drawable/menu_button_red_off.png b/astrid/src/main/res/drawable/menu_button_red_off.png similarity index 100% rename from astrid/res/drawable/menu_button_red_off.png rename to astrid/src/main/res/drawable/menu_button_red_off.png diff --git a/astrid/res/drawable/menu_button_red_on.png b/astrid/src/main/res/drawable/menu_button_red_on.png similarity index 100% rename from astrid/res/drawable/menu_button_red_on.png rename to astrid/src/main/res/drawable/menu_button_red_on.png diff --git a/astrid/res/drawable/mic_button_blue.xml b/astrid/src/main/res/drawable/mic_button_blue.xml similarity index 100% rename from astrid/res/drawable/mic_button_blue.xml rename to astrid/src/main/res/drawable/mic_button_blue.xml diff --git a/astrid/res/drawable/mic_button_blue_normal.png b/astrid/src/main/res/drawable/mic_button_blue_normal.png similarity index 100% rename from astrid/res/drawable/mic_button_blue_normal.png rename to astrid/src/main/res/drawable/mic_button_blue_normal.png diff --git a/astrid/res/drawable/mic_button_blue_pressed.png b/astrid/src/main/res/drawable/mic_button_blue_pressed.png similarity index 100% rename from astrid/res/drawable/mic_button_blue_pressed.png rename to astrid/src/main/res/drawable/mic_button_blue_pressed.png diff --git a/astrid/res/drawable/mic_button_dark_blue.xml b/astrid/src/main/res/drawable/mic_button_dark_blue.xml similarity index 100% rename from astrid/res/drawable/mic_button_dark_blue.xml rename to astrid/src/main/res/drawable/mic_button_dark_blue.xml diff --git a/astrid/res/drawable/mic_button_dark_blue_normal.png b/astrid/src/main/res/drawable/mic_button_dark_blue_normal.png similarity index 100% rename from astrid/res/drawable/mic_button_dark_blue_normal.png rename to astrid/src/main/res/drawable/mic_button_dark_blue_normal.png diff --git a/astrid/res/drawable/mic_button_dark_blue_pressed.png b/astrid/src/main/res/drawable/mic_button_dark_blue_pressed.png similarity index 100% rename from astrid/res/drawable/mic_button_dark_blue_pressed.png rename to astrid/src/main/res/drawable/mic_button_dark_blue_pressed.png diff --git a/astrid/res/drawable/mic_button_red.xml b/astrid/src/main/res/drawable/mic_button_red.xml similarity index 100% rename from astrid/res/drawable/mic_button_red.xml rename to astrid/src/main/res/drawable/mic_button_red.xml diff --git a/astrid/res/drawable/mic_button_red_normal.png b/astrid/src/main/res/drawable/mic_button_red_normal.png similarity index 100% rename from astrid/res/drawable/mic_button_red_normal.png rename to astrid/src/main/res/drawable/mic_button_red_normal.png diff --git a/astrid/res/drawable/mic_button_red_pressed.png b/astrid/src/main/res/drawable/mic_button_red_pressed.png similarity index 100% rename from astrid/res/drawable/mic_button_red_pressed.png rename to astrid/src/main/res/drawable/mic_button_red_pressed.png diff --git a/astrid/res/drawable/none.png b/astrid/src/main/res/drawable/none.png similarity index 100% rename from astrid/res/drawable/none.png rename to astrid/src/main/res/drawable/none.png diff --git a/astrid/res/drawable/notif_astrid.png b/astrid/src/main/res/drawable/notif_astrid.png similarity index 100% rename from astrid/res/drawable/notif_astrid.png rename to astrid/src/main/res/drawable/notif_astrid.png diff --git a/astrid/res/drawable/notif_boring_alarm.png b/astrid/src/main/res/drawable/notif_boring_alarm.png similarity index 100% rename from astrid/res/drawable/notif_boring_alarm.png rename to astrid/src/main/res/drawable/notif_boring_alarm.png diff --git a/astrid/res/drawable/notif_c2dm_assign.png b/astrid/src/main/res/drawable/notif_c2dm_assign.png similarity index 100% rename from astrid/res/drawable/notif_c2dm_assign.png rename to astrid/src/main/res/drawable/notif_c2dm_assign.png diff --git a/astrid/res/drawable/notif_c2dm_done.png b/astrid/src/main/res/drawable/notif_c2dm_done.png similarity index 100% rename from astrid/res/drawable/notif_c2dm_done.png rename to astrid/src/main/res/drawable/notif_c2dm_done.png diff --git a/astrid/res/drawable/notif_c2dm_msg.png b/astrid/src/main/res/drawable/notif_c2dm_msg.png similarity index 100% rename from astrid/res/drawable/notif_c2dm_msg.png rename to astrid/src/main/res/drawable/notif_c2dm_msg.png diff --git a/astrid/res/drawable/notif_pink_alarm.png b/astrid/src/main/res/drawable/notif_pink_alarm.png similarity index 100% rename from astrid/res/drawable/notif_pink_alarm.png rename to astrid/src/main/res/drawable/notif_pink_alarm.png diff --git a/astrid/res/drawable/panel_background.9.png b/astrid/src/main/res/drawable/panel_background.9.png similarity index 100% rename from astrid/res/drawable/panel_background.9.png rename to astrid/src/main/res/drawable/panel_background.9.png diff --git a/astrid/res/drawable/pdv_body.png b/astrid/src/main/res/drawable/pdv_body.png similarity index 100% rename from astrid/res/drawable/pdv_body.png rename to astrid/src/main/res/drawable/pdv_body.png diff --git a/astrid/res/drawable/pdv_logo.png b/astrid/src/main/res/drawable/pdv_logo.png similarity index 100% rename from astrid/res/drawable/pdv_logo.png rename to astrid/src/main/res/drawable/pdv_logo.png diff --git a/astrid/res/drawable/people_menu_button_blue.xml b/astrid/src/main/res/drawable/people_menu_button_blue.xml similarity index 100% rename from astrid/res/drawable/people_menu_button_blue.xml rename to astrid/src/main/res/drawable/people_menu_button_blue.xml diff --git a/astrid/res/drawable/people_menu_button_blue_alt_on.png b/astrid/src/main/res/drawable/people_menu_button_blue_alt_on.png similarity index 100% rename from astrid/res/drawable/people_menu_button_blue_alt_on.png rename to astrid/src/main/res/drawable/people_menu_button_blue_alt_on.png diff --git a/astrid/res/drawable/people_menu_button_blue_off.png b/astrid/src/main/res/drawable/people_menu_button_blue_off.png similarity index 100% rename from astrid/res/drawable/people_menu_button_blue_off.png rename to astrid/src/main/res/drawable/people_menu_button_blue_off.png diff --git a/astrid/res/drawable/people_menu_button_blue_on.png b/astrid/src/main/res/drawable/people_menu_button_blue_on.png similarity index 100% rename from astrid/res/drawable/people_menu_button_blue_on.png rename to astrid/src/main/res/drawable/people_menu_button_blue_on.png diff --git a/astrid/res/drawable/people_menu_button_dark_blue.xml b/astrid/src/main/res/drawable/people_menu_button_dark_blue.xml similarity index 100% rename from astrid/res/drawable/people_menu_button_dark_blue.xml rename to astrid/src/main/res/drawable/people_menu_button_dark_blue.xml diff --git a/astrid/res/drawable/people_menu_button_dark_blue_off.png b/astrid/src/main/res/drawable/people_menu_button_dark_blue_off.png similarity index 100% rename from astrid/res/drawable/people_menu_button_dark_blue_off.png rename to astrid/src/main/res/drawable/people_menu_button_dark_blue_off.png diff --git a/astrid/res/drawable/people_menu_button_dark_blue_on.png b/astrid/src/main/res/drawable/people_menu_button_dark_blue_on.png similarity index 100% rename from astrid/res/drawable/people_menu_button_dark_blue_on.png rename to astrid/src/main/res/drawable/people_menu_button_dark_blue_on.png diff --git a/astrid/res/drawable/people_menu_button_red.xml b/astrid/src/main/res/drawable/people_menu_button_red.xml similarity index 100% rename from astrid/res/drawable/people_menu_button_red.xml rename to astrid/src/main/res/drawable/people_menu_button_red.xml diff --git a/astrid/res/drawable/people_menu_button_red_off.png b/astrid/src/main/res/drawable/people_menu_button_red_off.png similarity index 100% rename from astrid/res/drawable/people_menu_button_red_off.png rename to astrid/src/main/res/drawable/people_menu_button_red_off.png diff --git a/astrid/res/drawable/people_menu_button_red_on.png b/astrid/src/main/res/drawable/people_menu_button_red_on.png similarity index 100% rename from astrid/res/drawable/people_menu_button_red_on.png rename to astrid/src/main/res/drawable/people_menu_button_red_on.png diff --git a/astrid/res/drawable/plus_button_blue.xml b/astrid/src/main/res/drawable/plus_button_blue.xml similarity index 100% rename from astrid/res/drawable/plus_button_blue.xml rename to astrid/src/main/res/drawable/plus_button_blue.xml diff --git a/astrid/res/drawable/plus_button_blue_normal.png b/astrid/src/main/res/drawable/plus_button_blue_normal.png similarity index 100% rename from astrid/res/drawable/plus_button_blue_normal.png rename to astrid/src/main/res/drawable/plus_button_blue_normal.png diff --git a/astrid/res/drawable/plus_button_blue_pressed.png b/astrid/src/main/res/drawable/plus_button_blue_pressed.png similarity index 100% rename from astrid/res/drawable/plus_button_blue_pressed.png rename to astrid/src/main/res/drawable/plus_button_blue_pressed.png diff --git a/astrid/res/drawable/plus_button_dark_blue.xml b/astrid/src/main/res/drawable/plus_button_dark_blue.xml similarity index 100% rename from astrid/res/drawable/plus_button_dark_blue.xml rename to astrid/src/main/res/drawable/plus_button_dark_blue.xml diff --git a/astrid/res/drawable/plus_button_dark_blue_normal.png b/astrid/src/main/res/drawable/plus_button_dark_blue_normal.png similarity index 100% rename from astrid/res/drawable/plus_button_dark_blue_normal.png rename to astrid/src/main/res/drawable/plus_button_dark_blue_normal.png diff --git a/astrid/res/drawable/plus_button_dark_blue_pressed.png b/astrid/src/main/res/drawable/plus_button_dark_blue_pressed.png similarity index 100% rename from astrid/res/drawable/plus_button_dark_blue_pressed.png rename to astrid/src/main/res/drawable/plus_button_dark_blue_pressed.png diff --git a/astrid/res/drawable/plus_button_red.xml b/astrid/src/main/res/drawable/plus_button_red.xml similarity index 100% rename from astrid/res/drawable/plus_button_red.xml rename to astrid/src/main/res/drawable/plus_button_red.xml diff --git a/astrid/res/drawable/plus_button_red_normal.png b/astrid/src/main/res/drawable/plus_button_red_normal.png similarity index 100% rename from astrid/res/drawable/plus_button_red_normal.png rename to astrid/src/main/res/drawable/plus_button_red_normal.png diff --git a/astrid/res/drawable/plus_button_red_pressed.png b/astrid/src/main/res/drawable/plus_button_red_pressed.png similarity index 100% rename from astrid/res/drawable/plus_button_red_pressed.png rename to astrid/src/main/res/drawable/plus_button_red_pressed.png diff --git a/astrid/res/drawable/reminder_dialog_background.xml b/astrid/src/main/res/drawable/reminder_dialog_background.xml similarity index 100% rename from astrid/res/drawable/reminder_dialog_background.xml rename to astrid/src/main/res/drawable/reminder_dialog_background.xml diff --git a/astrid/res/drawable/reminder_dialog_inset_background.xml b/astrid/src/main/res/drawable/reminder_dialog_inset_background.xml similarity index 100% rename from astrid/res/drawable/reminder_dialog_inset_background.xml rename to astrid/src/main/res/drawable/reminder_dialog_inset_background.xml diff --git a/astrid/res/drawable/repeating_deadline.png b/astrid/src/main/res/drawable/repeating_deadline.png similarity index 100% rename from astrid/res/drawable/repeating_deadline.png rename to astrid/src/main/res/drawable/repeating_deadline.png diff --git a/astrid/res/drawable/share_facebook.png b/astrid/src/main/res/drawable/share_facebook.png similarity index 100% rename from astrid/res/drawable/share_facebook.png rename to astrid/src/main/res/drawable/share_facebook.png diff --git a/astrid/res/drawable/share_google.png b/astrid/src/main/res/drawable/share_google.png similarity index 100% rename from astrid/res/drawable/share_google.png rename to astrid/src/main/res/drawable/share_google.png diff --git a/astrid/res/drawable/share_twitter.png b/astrid/src/main/res/drawable/share_twitter.png similarity index 100% rename from astrid/res/drawable/share_twitter.png rename to astrid/src/main/res/drawable/share_twitter.png diff --git a/astrid/res/drawable/silk_folder.png b/astrid/src/main/res/drawable/silk_folder.png similarity index 100% rename from astrid/res/drawable/silk_folder.png rename to astrid/src/main/res/drawable/silk_folder.png diff --git a/astrid/res/drawable/silk_user_gray.png b/astrid/src/main/res/drawable/silk_user_gray.png similarity index 100% rename from astrid/res/drawable/silk_user_gray.png rename to astrid/src/main/res/drawable/silk_user_gray.png diff --git a/astrid/res/drawable/silk_user_orange.png b/astrid/src/main/res/drawable/silk_user_orange.png similarity index 100% rename from astrid/res/drawable/silk_user_orange.png rename to astrid/src/main/res/drawable/silk_user_orange.png diff --git a/astrid/res/drawable/single_gear.png b/astrid/src/main/res/drawable/single_gear.png similarity index 100% rename from astrid/res/drawable/single_gear.png rename to astrid/src/main/res/drawable/single_gear.png diff --git a/astrid/res/drawable/speech_bubble_reminder.9.png b/astrid/src/main/res/drawable/speech_bubble_reminder.9.png similarity index 100% rename from astrid/res/drawable/speech_bubble_reminder.9.png rename to astrid/src/main/res/drawable/speech_bubble_reminder.9.png diff --git a/astrid/res/drawable/tango_alpha.png b/astrid/src/main/res/drawable/tango_alpha.png similarity index 100% rename from astrid/res/drawable/tango_alpha.png rename to astrid/src/main/res/drawable/tango_alpha.png diff --git a/astrid/res/drawable/tango_calendar.png b/astrid/src/main/res/drawable/tango_calendar.png similarity index 100% rename from astrid/res/drawable/tango_calendar.png rename to astrid/src/main/res/drawable/tango_calendar.png diff --git a/astrid/res/drawable/tango_clock.png b/astrid/src/main/res/drawable/tango_clock.png similarity index 100% rename from astrid/res/drawable/tango_clock.png rename to astrid/src/main/res/drawable/tango_clock.png diff --git a/astrid/res/drawable/tango_warning.png b/astrid/src/main/res/drawable/tango_warning.png similarity index 100% rename from astrid/res/drawable/tango_warning.png rename to astrid/src/main/res/drawable/tango_warning.png diff --git a/astrid/res/drawable/task_edit_background.xml b/astrid/src/main/res/drawable/task_edit_background.xml similarity index 100% rename from astrid/res/drawable/task_edit_background.xml rename to astrid/src/main/res/drawable/task_edit_background.xml diff --git a/astrid/res/drawable/task_edit_background_transparent_black.xml b/astrid/src/main/res/drawable/task_edit_background_transparent_black.xml similarity index 100% rename from astrid/res/drawable/task_edit_background_transparent_black.xml rename to astrid/src/main/res/drawable/task_edit_background_transparent_black.xml diff --git a/astrid/res/drawable/task_edit_background_transparent_white.xml b/astrid/src/main/res/drawable/task_edit_background_transparent_white.xml similarity index 100% rename from astrid/res/drawable/task_edit_background_transparent_white.xml rename to astrid/src/main/res/drawable/task_edit_background_transparent_white.xml diff --git a/astrid/res/drawable/task_edit_background_white.xml b/astrid/src/main/res/drawable/task_edit_background_white.xml similarity index 100% rename from astrid/res/drawable/task_edit_background_white.xml rename to astrid/src/main/res/drawable/task_edit_background_white.xml diff --git a/astrid/res/drawable/task_notes.png b/astrid/src/main/res/drawable/task_notes.png similarity index 100% rename from astrid/res/drawable/task_notes.png rename to astrid/src/main/res/drawable/task_notes.png diff --git a/astrid/res/drawable/task_rabbit_image.png b/astrid/src/main/res/drawable/task_rabbit_image.png similarity index 100% rename from astrid/res/drawable/task_rabbit_image.png rename to astrid/src/main/res/drawable/task_rabbit_image.png diff --git a/astrid/res/drawable/task_rabbit_logo.png b/astrid/src/main/res/drawable/task_rabbit_logo.png similarity index 100% rename from astrid/res/drawable/task_rabbit_logo.png rename to astrid/src/main/res/drawable/task_rabbit_logo.png diff --git a/astrid/res/drawable/task_row_bg_dark.xml b/astrid/src/main/res/drawable/task_row_bg_dark.xml similarity index 100% rename from astrid/res/drawable/task_row_bg_dark.xml rename to astrid/src/main/res/drawable/task_row_bg_dark.xml diff --git a/astrid/res/drawable/task_row_bg_white.xml b/astrid/src/main/res/drawable/task_row_bg_white.xml similarity index 100% rename from astrid/res/drawable/task_row_bg_white.xml rename to astrid/src/main/res/drawable/task_row_bg_white.xml diff --git a/astrid/res/drawable/task_timer.png b/astrid/src/main/res/drawable/task_timer.png similarity index 100% rename from astrid/res/drawable/task_timer.png rename to astrid/src/main/res/drawable/task_timer.png diff --git a/astrid/res/drawable/tea_icn_addcal.png b/astrid/src/main/res/drawable/tea_icn_addcal.png similarity index 100% rename from astrid/res/drawable/tea_icn_addcal.png rename to astrid/src/main/res/drawable/tea_icn_addcal.png diff --git a/astrid/res/drawable/tea_icn_addcal_gray.png b/astrid/src/main/res/drawable/tea_icn_addcal_gray.png similarity index 100% rename from astrid/res/drawable/tea_icn_addcal_gray.png rename to astrid/src/main/res/drawable/tea_icn_addcal_gray.png diff --git a/astrid/res/drawable/tea_icn_addcal_lightblue.png b/astrid/src/main/res/drawable/tea_icn_addcal_lightblue.png similarity index 100% rename from astrid/res/drawable/tea_icn_addcal_lightblue.png rename to astrid/src/main/res/drawable/tea_icn_addcal_lightblue.png diff --git a/astrid/res/drawable/tea_icn_assign.png b/astrid/src/main/res/drawable/tea_icn_assign.png similarity index 100% rename from astrid/res/drawable/tea_icn_assign.png rename to astrid/src/main/res/drawable/tea_icn_assign.png diff --git a/astrid/res/drawable/tea_icn_assign_gray.png b/astrid/src/main/res/drawable/tea_icn_assign_gray.png similarity index 100% rename from astrid/res/drawable/tea_icn_assign_gray.png rename to astrid/src/main/res/drawable/tea_icn_assign_gray.png diff --git a/astrid/res/drawable/tea_icn_assign_lightblue.png b/astrid/src/main/res/drawable/tea_icn_assign_lightblue.png similarity index 100% rename from astrid/res/drawable/tea_icn_assign_lightblue.png rename to astrid/src/main/res/drawable/tea_icn_assign_lightblue.png diff --git a/astrid/res/drawable/tea_icn_date.png b/astrid/src/main/res/drawable/tea_icn_date.png similarity index 100% rename from astrid/res/drawable/tea_icn_date.png rename to astrid/src/main/res/drawable/tea_icn_date.png diff --git a/astrid/res/drawable/tea_icn_date_gray.png b/astrid/src/main/res/drawable/tea_icn_date_gray.png similarity index 100% rename from astrid/res/drawable/tea_icn_date_gray.png rename to astrid/src/main/res/drawable/tea_icn_date_gray.png diff --git a/astrid/res/drawable/tea_icn_date_lightblue.png b/astrid/src/main/res/drawable/tea_icn_date_lightblue.png similarity index 100% rename from astrid/res/drawable/tea_icn_date_lightblue.png rename to astrid/src/main/res/drawable/tea_icn_date_lightblue.png diff --git a/astrid/res/drawable/tea_icn_date_red.png b/astrid/src/main/res/drawable/tea_icn_date_red.png similarity index 100% rename from astrid/res/drawable/tea_icn_date_red.png rename to astrid/src/main/res/drawable/tea_icn_date_red.png diff --git a/astrid/res/drawable/tea_icn_edit.png b/astrid/src/main/res/drawable/tea_icn_edit.png similarity index 100% rename from astrid/res/drawable/tea_icn_edit.png rename to astrid/src/main/res/drawable/tea_icn_edit.png diff --git a/astrid/res/drawable/tea_icn_edit_gray.png b/astrid/src/main/res/drawable/tea_icn_edit_gray.png similarity index 100% rename from astrid/res/drawable/tea_icn_edit_gray.png rename to astrid/src/main/res/drawable/tea_icn_edit_gray.png diff --git a/astrid/res/drawable/tea_icn_edit_lightblue.png b/astrid/src/main/res/drawable/tea_icn_edit_lightblue.png similarity index 100% rename from astrid/res/drawable/tea_icn_edit_lightblue.png rename to astrid/src/main/res/drawable/tea_icn_edit_lightblue.png diff --git a/astrid/res/drawable/tea_icn_files.png b/astrid/src/main/res/drawable/tea_icn_files.png similarity index 100% rename from astrid/res/drawable/tea_icn_files.png rename to astrid/src/main/res/drawable/tea_icn_files.png diff --git a/astrid/res/drawable/tea_icn_files_gray.png b/astrid/src/main/res/drawable/tea_icn_files_gray.png similarity index 100% rename from astrid/res/drawable/tea_icn_files_gray.png rename to astrid/src/main/res/drawable/tea_icn_files_gray.png diff --git a/astrid/res/drawable/tea_icn_files_lightblue.png b/astrid/src/main/res/drawable/tea_icn_files_lightblue.png similarity index 100% rename from astrid/res/drawable/tea_icn_files_lightblue.png rename to astrid/src/main/res/drawable/tea_icn_files_lightblue.png diff --git a/astrid/res/drawable/tea_icn_hide.png b/astrid/src/main/res/drawable/tea_icn_hide.png similarity index 100% rename from astrid/res/drawable/tea_icn_hide.png rename to astrid/src/main/res/drawable/tea_icn_hide.png diff --git a/astrid/res/drawable/tea_icn_hide_gray.png b/astrid/src/main/res/drawable/tea_icn_hide_gray.png similarity index 100% rename from astrid/res/drawable/tea_icn_hide_gray.png rename to astrid/src/main/res/drawable/tea_icn_hide_gray.png diff --git a/astrid/res/drawable/tea_icn_hide_lightblue.png b/astrid/src/main/res/drawable/tea_icn_hide_lightblue.png similarity index 100% rename from astrid/res/drawable/tea_icn_hide_lightblue.png rename to astrid/src/main/res/drawable/tea_icn_hide_lightblue.png diff --git a/astrid/res/drawable/tea_icn_lists.png b/astrid/src/main/res/drawable/tea_icn_lists.png similarity index 100% rename from astrid/res/drawable/tea_icn_lists.png rename to astrid/src/main/res/drawable/tea_icn_lists.png diff --git a/astrid/res/drawable/tea_icn_lists_gray.png b/astrid/src/main/res/drawable/tea_icn_lists_gray.png similarity index 100% rename from astrid/res/drawable/tea_icn_lists_gray.png rename to astrid/src/main/res/drawable/tea_icn_lists_gray.png diff --git a/astrid/res/drawable/tea_icn_lists_lightblue.png b/astrid/src/main/res/drawable/tea_icn_lists_lightblue.png similarity index 100% rename from astrid/res/drawable/tea_icn_lists_lightblue.png rename to astrid/src/main/res/drawable/tea_icn_lists_lightblue.png diff --git a/astrid/res/drawable/tea_icn_priority.png b/astrid/src/main/res/drawable/tea_icn_priority.png similarity index 100% rename from astrid/res/drawable/tea_icn_priority.png rename to astrid/src/main/res/drawable/tea_icn_priority.png diff --git a/astrid/res/drawable/tea_icn_priority_gray.png b/astrid/src/main/res/drawable/tea_icn_priority_gray.png similarity index 100% rename from astrid/res/drawable/tea_icn_priority_gray.png rename to astrid/src/main/res/drawable/tea_icn_priority_gray.png diff --git a/astrid/res/drawable/tea_icn_priority_lightblue.png b/astrid/src/main/res/drawable/tea_icn_priority_lightblue.png similarity index 100% rename from astrid/res/drawable/tea_icn_priority_lightblue.png rename to astrid/src/main/res/drawable/tea_icn_priority_lightblue.png diff --git a/astrid/res/drawable/tea_icn_reminder.png b/astrid/src/main/res/drawable/tea_icn_reminder.png similarity index 100% rename from astrid/res/drawable/tea_icn_reminder.png rename to astrid/src/main/res/drawable/tea_icn_reminder.png diff --git a/astrid/res/drawable/tea_icn_reminder_gray.png b/astrid/src/main/res/drawable/tea_icn_reminder_gray.png similarity index 100% rename from astrid/res/drawable/tea_icn_reminder_gray.png rename to astrid/src/main/res/drawable/tea_icn_reminder_gray.png diff --git a/astrid/res/drawable/tea_icn_reminder_lightblue.png b/astrid/src/main/res/drawable/tea_icn_reminder_lightblue.png similarity index 100% rename from astrid/res/drawable/tea_icn_reminder_lightblue.png rename to astrid/src/main/res/drawable/tea_icn_reminder_lightblue.png diff --git a/astrid/res/drawable/tea_icn_repeat.png b/astrid/src/main/res/drawable/tea_icn_repeat.png similarity index 100% rename from astrid/res/drawable/tea_icn_repeat.png rename to astrid/src/main/res/drawable/tea_icn_repeat.png diff --git a/astrid/res/drawable/tea_icn_repeat_gray.png b/astrid/src/main/res/drawable/tea_icn_repeat_gray.png similarity index 100% rename from astrid/res/drawable/tea_icn_repeat_gray.png rename to astrid/src/main/res/drawable/tea_icn_repeat_gray.png diff --git a/astrid/res/drawable/tea_icn_repeat_lightblue.png b/astrid/src/main/res/drawable/tea_icn_repeat_lightblue.png similarity index 100% rename from astrid/res/drawable/tea_icn_repeat_lightblue.png rename to astrid/src/main/res/drawable/tea_icn_repeat_lightblue.png diff --git a/astrid/res/drawable/tea_icn_repeat_red.png b/astrid/src/main/res/drawable/tea_icn_repeat_red.png similarity index 100% rename from astrid/res/drawable/tea_icn_repeat_red.png rename to astrid/src/main/res/drawable/tea_icn_repeat_red.png diff --git a/astrid/res/drawable/tea_icn_share.png b/astrid/src/main/res/drawable/tea_icn_share.png similarity index 100% rename from astrid/res/drawable/tea_icn_share.png rename to astrid/src/main/res/drawable/tea_icn_share.png diff --git a/astrid/res/drawable/tea_icn_share_gray.png b/astrid/src/main/res/drawable/tea_icn_share_gray.png similarity index 100% rename from astrid/res/drawable/tea_icn_share_gray.png rename to astrid/src/main/res/drawable/tea_icn_share_gray.png diff --git a/astrid/res/drawable/tea_icn_share_lightblue.png b/astrid/src/main/res/drawable/tea_icn_share_lightblue.png similarity index 100% rename from astrid/res/drawable/tea_icn_share_lightblue.png rename to astrid/src/main/res/drawable/tea_icn_share_lightblue.png diff --git a/astrid/res/drawable/tea_icn_timer.png b/astrid/src/main/res/drawable/tea_icn_timer.png similarity index 100% rename from astrid/res/drawable/tea_icn_timer.png rename to astrid/src/main/res/drawable/tea_icn_timer.png diff --git a/astrid/res/drawable/tea_icn_timer_gray.png b/astrid/src/main/res/drawable/tea_icn_timer_gray.png similarity index 100% rename from astrid/res/drawable/tea_icn_timer_gray.png rename to astrid/src/main/res/drawable/tea_icn_timer_gray.png diff --git a/astrid/res/drawable/tea_icn_timer_lightblue.png b/astrid/src/main/res/drawable/tea_icn_timer_lightblue.png similarity index 100% rename from astrid/res/drawable/tea_icn_timer_lightblue.png rename to astrid/src/main/res/drawable/tea_icn_timer_lightblue.png diff --git a/astrid/res/drawable/tea_icn_waiting.png b/astrid/src/main/res/drawable/tea_icn_waiting.png similarity index 100% rename from astrid/res/drawable/tea_icn_waiting.png rename to astrid/src/main/res/drawable/tea_icn_waiting.png diff --git a/astrid/res/drawable/tea_icn_waiting_lightblue.png b/astrid/src/main/res/drawable/tea_icn_waiting_lightblue.png similarity index 100% rename from astrid/res/drawable/tea_icn_waiting_lightblue.png rename to astrid/src/main/res/drawable/tea_icn_waiting_lightblue.png diff --git a/astrid/res/drawable/timepicker_down_btn.xml b/astrid/src/main/res/drawable/timepicker_down_btn.xml similarity index 100% rename from astrid/res/drawable/timepicker_down_btn.xml rename to astrid/src/main/res/drawable/timepicker_down_btn.xml diff --git a/astrid/res/drawable/timepicker_down_disabled.9.png b/astrid/src/main/res/drawable/timepicker_down_disabled.9.png similarity index 100% rename from astrid/res/drawable/timepicker_down_disabled.9.png rename to astrid/src/main/res/drawable/timepicker_down_disabled.9.png diff --git a/astrid/res/drawable/timepicker_down_normal.9.png b/astrid/src/main/res/drawable/timepicker_down_normal.9.png similarity index 100% rename from astrid/res/drawable/timepicker_down_normal.9.png rename to astrid/src/main/res/drawable/timepicker_down_normal.9.png diff --git a/astrid/res/drawable/timepicker_down_pressed.9.png b/astrid/src/main/res/drawable/timepicker_down_pressed.9.png similarity index 100% rename from astrid/res/drawable/timepicker_down_pressed.9.png rename to astrid/src/main/res/drawable/timepicker_down_pressed.9.png diff --git a/astrid/res/drawable/timepicker_down_selected.9.png b/astrid/src/main/res/drawable/timepicker_down_selected.9.png similarity index 100% rename from astrid/res/drawable/timepicker_down_selected.9.png rename to astrid/src/main/res/drawable/timepicker_down_selected.9.png diff --git a/astrid/res/drawable/timepicker_input.xml b/astrid/src/main/res/drawable/timepicker_input.xml similarity index 100% rename from astrid/res/drawable/timepicker_input.xml rename to astrid/src/main/res/drawable/timepicker_input.xml diff --git a/astrid/res/drawable/timepicker_input_disabled.9.png b/astrid/src/main/res/drawable/timepicker_input_disabled.9.png similarity index 100% rename from astrid/res/drawable/timepicker_input_disabled.9.png rename to astrid/src/main/res/drawable/timepicker_input_disabled.9.png diff --git a/astrid/res/drawable/timepicker_input_normal.9.png b/astrid/src/main/res/drawable/timepicker_input_normal.9.png similarity index 100% rename from astrid/res/drawable/timepicker_input_normal.9.png rename to astrid/src/main/res/drawable/timepicker_input_normal.9.png diff --git a/astrid/res/drawable/timepicker_input_pressed.9.png b/astrid/src/main/res/drawable/timepicker_input_pressed.9.png similarity index 100% rename from astrid/res/drawable/timepicker_input_pressed.9.png rename to astrid/src/main/res/drawable/timepicker_input_pressed.9.png diff --git a/astrid/res/drawable/timepicker_input_selected.9.png b/astrid/src/main/res/drawable/timepicker_input_selected.9.png similarity index 100% rename from astrid/res/drawable/timepicker_input_selected.9.png rename to astrid/src/main/res/drawable/timepicker_input_selected.9.png diff --git a/astrid/res/drawable/timepicker_up_btn.xml b/astrid/src/main/res/drawable/timepicker_up_btn.xml similarity index 100% rename from astrid/res/drawable/timepicker_up_btn.xml rename to astrid/src/main/res/drawable/timepicker_up_btn.xml diff --git a/astrid/res/drawable/timepicker_up_disabled.9.png b/astrid/src/main/res/drawable/timepicker_up_disabled.9.png similarity index 100% rename from astrid/res/drawable/timepicker_up_disabled.9.png rename to astrid/src/main/res/drawable/timepicker_up_disabled.9.png diff --git a/astrid/res/drawable/timepicker_up_normal.9.png b/astrid/src/main/res/drawable/timepicker_up_normal.9.png similarity index 100% rename from astrid/res/drawable/timepicker_up_normal.9.png rename to astrid/src/main/res/drawable/timepicker_up_normal.9.png diff --git a/astrid/res/drawable/timepicker_up_pressed.9.png b/astrid/src/main/res/drawable/timepicker_up_pressed.9.png similarity index 100% rename from astrid/res/drawable/timepicker_up_pressed.9.png rename to astrid/src/main/res/drawable/timepicker_up_pressed.9.png diff --git a/astrid/res/drawable/timepicker_up_selected.9.png b/astrid/src/main/res/drawable/timepicker_up_selected.9.png similarity index 100% rename from astrid/res/drawable/timepicker_up_selected.9.png rename to astrid/src/main/res/drawable/timepicker_up_selected.9.png diff --git a/astrid/res/drawable/timers_notification.png b/astrid/src/main/res/drawable/timers_notification.png similarity index 100% rename from astrid/res/drawable/timers_notification.png rename to astrid/src/main/res/drawable/timers_notification.png diff --git a/astrid/res/drawable/trashcan.png b/astrid/src/main/res/drawable/trashcan.png similarity index 100% rename from astrid/res/drawable/trashcan.png rename to astrid/src/main/res/drawable/trashcan.png diff --git a/astrid/res/drawable/vertical_separator.xml b/astrid/src/main/res/drawable/vertical_separator.xml similarity index 100% rename from astrid/res/drawable/vertical_separator.xml rename to astrid/src/main/res/drawable/vertical_separator.xml diff --git a/astrid/res/drawable/welcome_activity.png b/astrid/src/main/res/drawable/welcome_activity.png similarity index 100% rename from astrid/res/drawable/welcome_activity.png rename to astrid/src/main/res/drawable/welcome_activity.png diff --git a/astrid/res/drawable/welcome_walkthrough_1.png b/astrid/src/main/res/drawable/welcome_walkthrough_1.png similarity index 100% rename from astrid/res/drawable/welcome_walkthrough_1.png rename to astrid/src/main/res/drawable/welcome_walkthrough_1.png diff --git a/astrid/res/drawable/widget_body_legacy.xml b/astrid/src/main/res/drawable/widget_body_legacy.xml similarity index 100% rename from astrid/res/drawable/widget_body_legacy.xml rename to astrid/src/main/res/drawable/widget_body_legacy.xml diff --git a/astrid/res/drawable/widget_header_legacy.xml b/astrid/src/main/res/drawable/widget_header_legacy.xml similarity index 100% rename from astrid/res/drawable/widget_header_legacy.xml rename to astrid/src/main/res/drawable/widget_header_legacy.xml diff --git a/astrid/res/drawable/wom_edit_background_white.xml b/astrid/src/main/res/drawable/wom_edit_background_white.xml similarity index 100% rename from astrid/res/drawable/wom_edit_background_white.xml rename to astrid/src/main/res/drawable/wom_edit_background_white.xml diff --git a/astrid/res/layout-land/astrid_dialog_view.xml b/astrid/src/main/res/layout-land/astrid_dialog_view.xml similarity index 100% rename from astrid/res/layout-land/astrid_dialog_view.xml rename to astrid/src/main/res/layout-land/astrid_dialog_view.xml diff --git a/astrid/res/layout-land/astrid_reminder_view.xml b/astrid/src/main/res/layout-land/astrid_reminder_view.xml similarity index 100% rename from astrid/res/layout-land/astrid_reminder_view.xml rename to astrid/src/main/res/layout-land/astrid_reminder_view.xml diff --git a/astrid/res/layout-land/date_time_picker.xml b/astrid/src/main/res/layout-land/date_time_picker.xml similarity index 100% rename from astrid/res/layout-land/date_time_picker.xml rename to astrid/src/main/res/layout-land/date_time_picker.xml diff --git a/astrid/res/layout-land/date_time_picker_no_shortcuts.xml b/astrid/src/main/res/layout-land/date_time_picker_no_shortcuts.xml similarity index 100% rename from astrid/res/layout-land/date_time_picker_no_shortcuts.xml rename to astrid/src/main/res/layout-land/date_time_picker_no_shortcuts.xml diff --git a/astrid/res/layout-land/filter_list_activity.xml b/astrid/src/main/res/layout-land/filter_list_activity.xml similarity index 100% rename from astrid/res/layout-land/filter_list_activity.xml rename to astrid/src/main/res/layout-land/filter_list_activity.xml diff --git a/astrid/res/layout-land/filter_list_fragment_alternative.xml b/astrid/src/main/res/layout-land/filter_list_fragment_alternative.xml similarity index 100% rename from astrid/res/layout-land/filter_list_fragment_alternative.xml rename to astrid/src/main/res/layout-land/filter_list_fragment_alternative.xml diff --git a/astrid/res/layout-land/main_menu_popover_body.xml b/astrid/src/main/res/layout-land/main_menu_popover_body.xml similarity index 100% rename from astrid/res/layout-land/main_menu_popover_body.xml rename to astrid/src/main/res/layout-land/main_menu_popover_body.xml diff --git a/astrid/res/layout-land/task_list_wrapper_activity_3pane.xml b/astrid/src/main/res/layout-land/task_list_wrapper_activity_3pane.xml similarity index 100% rename from astrid/res/layout-land/task_list_wrapper_activity_3pane.xml rename to astrid/src/main/res/layout-land/task_list_wrapper_activity_3pane.xml diff --git a/astrid/res/layout-land/widget_initialized.xml b/astrid/src/main/res/layout-land/widget_initialized.xml similarity index 100% rename from astrid/res/layout-land/widget_initialized.xml rename to astrid/src/main/res/layout-land/widget_initialized.xml diff --git a/astrid/res/layout-xlarge-land/widget_initialized.xml b/astrid/src/main/res/layout-xlarge-land/widget_initialized.xml similarity index 100% rename from astrid/res/layout-xlarge-land/widget_initialized.xml rename to astrid/src/main/res/layout-xlarge-land/widget_initialized.xml diff --git a/astrid/res/layout/aac_record_activity.xml b/astrid/src/main/res/layout/aac_record_activity.xml similarity index 100% rename from astrid/res/layout/aac_record_activity.xml rename to astrid/src/main/res/layout/aac_record_activity.xml diff --git a/astrid/res/layout/addon_adapter_row.xml b/astrid/src/main/res/layout/addon_adapter_row.xml similarity index 100% rename from astrid/res/layout/addon_adapter_row.xml rename to astrid/src/main/res/layout/addon_adapter_row.xml diff --git a/astrid/res/layout/addon_list_container.xml b/astrid/src/main/res/layout/addon_list_container.xml similarity index 100% rename from astrid/res/layout/addon_list_container.xml rename to astrid/src/main/res/layout/addon_list_container.xml diff --git a/astrid/res/layout/alarm_edit_row.xml b/astrid/src/main/res/layout/alarm_edit_row.xml similarity index 100% rename from astrid/res/layout/alarm_edit_row.xml rename to astrid/src/main/res/layout/alarm_edit_row.xml diff --git a/astrid/res/layout/assigned_adapter_row.xml b/astrid/src/main/res/layout/assigned_adapter_row.xml similarity index 100% rename from astrid/res/layout/assigned_adapter_row.xml rename to astrid/src/main/res/layout/assigned_adapter_row.xml diff --git a/astrid/res/layout/astrid_calendar_list_creator_view.xml b/astrid/src/main/res/layout/astrid_calendar_list_creator_view.xml similarity index 100% rename from astrid/res/layout/astrid_calendar_list_creator_view.xml rename to astrid/src/main/res/layout/astrid_calendar_list_creator_view.xml diff --git a/astrid/res/layout/astrid_calendar_reminder_view.xml b/astrid/src/main/res/layout/astrid_calendar_reminder_view.xml similarity index 100% rename from astrid/res/layout/astrid_calendar_reminder_view.xml rename to astrid/src/main/res/layout/astrid_calendar_reminder_view.xml diff --git a/astrid/res/layout/astrid_dialog_view.xml b/astrid/src/main/res/layout/astrid_dialog_view.xml similarity index 100% rename from astrid/res/layout/astrid_dialog_view.xml rename to astrid/src/main/res/layout/astrid_dialog_view.xml diff --git a/astrid/res/layout/astrid_dialog_view_portrait.xml b/astrid/src/main/res/layout/astrid_dialog_view_portrait.xml similarity index 100% rename from astrid/res/layout/astrid_dialog_view_portrait.xml rename to astrid/src/main/res/layout/astrid_dialog_view_portrait.xml diff --git a/astrid/res/layout/astrid_missed_call_view.xml b/astrid/src/main/res/layout/astrid_missed_call_view.xml similarity index 100% rename from astrid/res/layout/astrid_missed_call_view.xml rename to astrid/src/main/res/layout/astrid_missed_call_view.xml diff --git a/astrid/res/layout/astrid_record_audio_view.xml b/astrid/src/main/res/layout/astrid_record_audio_view.xml similarity index 100% rename from astrid/res/layout/astrid_record_audio_view.xml rename to astrid/src/main/res/layout/astrid_record_audio_view.xml diff --git a/astrid/res/layout/astrid_reminder_view.xml b/astrid/src/main/res/layout/astrid_reminder_view.xml similarity index 100% rename from astrid/res/layout/astrid_reminder_view.xml rename to astrid/src/main/res/layout/astrid_reminder_view.xml diff --git a/astrid/res/layout/astrid_reminder_view_portrait.xml b/astrid/src/main/res/layout/astrid_reminder_view_portrait.xml similarity index 100% rename from astrid/res/layout/astrid_reminder_view_portrait.xml rename to astrid/src/main/res/layout/astrid_reminder_view_portrait.xml diff --git a/astrid/res/layout/astrid_speech_bubble.xml b/astrid/src/main/res/layout/astrid_speech_bubble.xml similarity index 100% rename from astrid/res/layout/astrid_speech_bubble.xml rename to astrid/src/main/res/layout/astrid_speech_bubble.xml diff --git a/astrid/res/layout/astrid_time_picker.xml b/astrid/src/main/res/layout/astrid_time_picker.xml similarity index 100% rename from astrid/res/layout/astrid_time_picker.xml rename to astrid/src/main/res/layout/astrid_time_picker.xml diff --git a/astrid/res/layout/astrid_time_picker_horizontal.xml b/astrid/src/main/res/layout/astrid_time_picker_horizontal.xml similarity index 100% rename from astrid/res/layout/astrid_time_picker_horizontal.xml rename to astrid/src/main/res/layout/astrid_time_picker_horizontal.xml diff --git a/astrid/res/layout/backup_activity.xml b/astrid/src/main/res/layout/backup_activity.xml similarity index 100% rename from astrid/res/layout/backup_activity.xml rename to astrid/src/main/res/layout/backup_activity.xml diff --git a/astrid/res/layout/beast_mode_pref_activity.xml b/astrid/src/main/res/layout/beast_mode_pref_activity.xml similarity index 100% rename from astrid/res/layout/beast_mode_pref_activity.xml rename to astrid/src/main/res/layout/beast_mode_pref_activity.xml diff --git a/astrid/res/layout/calendar.xml b/astrid/src/main/res/layout/calendar.xml similarity index 100% rename from astrid/res/layout/calendar.xml rename to astrid/src/main/res/layout/calendar.xml diff --git a/astrid/res/layout/calendar_alarm_list_creator.xml b/astrid/src/main/res/layout/calendar_alarm_list_creator.xml similarity index 100% rename from astrid/res/layout/calendar_alarm_list_creator.xml rename to astrid/src/main/res/layout/calendar_alarm_list_creator.xml diff --git a/astrid/res/layout/calendar_reminder_activity.xml b/astrid/src/main/res/layout/calendar_reminder_activity.xml similarity index 100% rename from astrid/res/layout/calendar_reminder_activity.xml rename to astrid/src/main/res/layout/calendar_reminder_activity.xml diff --git a/astrid/res/layout/contact_adapter_row.xml b/astrid/src/main/res/layout/contact_adapter_row.xml similarity index 100% rename from astrid/res/layout/contact_adapter_row.xml rename to astrid/src/main/res/layout/contact_adapter_row.xml diff --git a/astrid/res/layout/contact_edit_row.xml b/astrid/src/main/res/layout/contact_edit_row.xml similarity index 100% rename from astrid/res/layout/contact_edit_row.xml rename to astrid/src/main/res/layout/contact_edit_row.xml diff --git a/astrid/res/layout/control_dialog_ok.xml b/astrid/src/main/res/layout/control_dialog_ok.xml similarity index 100% rename from astrid/res/layout/control_dialog_ok.xml rename to astrid/src/main/res/layout/control_dialog_ok.xml diff --git a/astrid/res/layout/control_set_alarms.xml b/astrid/src/main/res/layout/control_set_alarms.xml similarity index 100% rename from astrid/res/layout/control_set_alarms.xml rename to astrid/src/main/res/layout/control_set_alarms.xml diff --git a/astrid/res/layout/control_set_deadline.xml b/astrid/src/main/res/layout/control_set_deadline.xml similarity index 100% rename from astrid/res/layout/control_set_deadline.xml rename to astrid/src/main/res/layout/control_set_deadline.xml diff --git a/astrid/res/layout/control_set_deadline_display.xml b/astrid/src/main/res/layout/control_set_deadline_display.xml similarity index 100% rename from astrid/res/layout/control_set_deadline_display.xml rename to astrid/src/main/res/layout/control_set_deadline_display.xml diff --git a/astrid/res/layout/control_set_default_display.xml b/astrid/src/main/res/layout/control_set_default_display.xml similarity index 100% rename from astrid/res/layout/control_set_default_display.xml rename to astrid/src/main/res/layout/control_set_default_display.xml diff --git a/astrid/res/layout/control_set_files.xml b/astrid/src/main/res/layout/control_set_files.xml similarity index 100% rename from astrid/res/layout/control_set_files.xml rename to astrid/src/main/res/layout/control_set_files.xml diff --git a/astrid/res/layout/control_set_files_display.xml b/astrid/src/main/res/layout/control_set_files_display.xml similarity index 100% rename from astrid/res/layout/control_set_files_display.xml rename to astrid/src/main/res/layout/control_set_files_display.xml diff --git a/astrid/res/layout/control_set_gcal.xml b/astrid/src/main/res/layout/control_set_gcal.xml similarity index 100% rename from astrid/res/layout/control_set_gcal.xml rename to astrid/src/main/res/layout/control_set_gcal.xml diff --git a/astrid/res/layout/control_set_gcal_display.xml b/astrid/src/main/res/layout/control_set_gcal_display.xml similarity index 100% rename from astrid/res/layout/control_set_gcal_display.xml rename to astrid/src/main/res/layout/control_set_gcal_display.xml diff --git a/astrid/res/layout/control_set_hide.xml b/astrid/src/main/res/layout/control_set_hide.xml similarity index 100% rename from astrid/res/layout/control_set_hide.xml rename to astrid/src/main/res/layout/control_set_hide.xml diff --git a/astrid/res/layout/control_set_importance.xml b/astrid/src/main/res/layout/control_set_importance.xml similarity index 100% rename from astrid/res/layout/control_set_importance.xml rename to astrid/src/main/res/layout/control_set_importance.xml diff --git a/astrid/res/layout/control_set_notes.xml b/astrid/src/main/res/layout/control_set_notes.xml similarity index 100% rename from astrid/res/layout/control_set_notes.xml rename to astrid/src/main/res/layout/control_set_notes.xml diff --git a/astrid/res/layout/control_set_notes_display.xml b/astrid/src/main/res/layout/control_set_notes_display.xml similarity index 100% rename from astrid/res/layout/control_set_notes_display.xml rename to astrid/src/main/res/layout/control_set_notes_display.xml diff --git a/astrid/res/layout/control_set_opencrx.xml b/astrid/src/main/res/layout/control_set_opencrx.xml similarity index 100% rename from astrid/res/layout/control_set_opencrx.xml rename to astrid/src/main/res/layout/control_set_opencrx.xml diff --git a/astrid/res/layout/control_set_opencrx_display.xml b/astrid/src/main/res/layout/control_set_opencrx_display.xml similarity index 100% rename from astrid/res/layout/control_set_opencrx_display.xml rename to astrid/src/main/res/layout/control_set_opencrx_display.xml diff --git a/astrid/res/layout/control_set_reminders.xml b/astrid/src/main/res/layout/control_set_reminders.xml similarity index 100% rename from astrid/res/layout/control_set_reminders.xml rename to astrid/src/main/res/layout/control_set_reminders.xml diff --git a/astrid/res/layout/control_set_repeat.xml b/astrid/src/main/res/layout/control_set_repeat.xml similarity index 100% rename from astrid/res/layout/control_set_repeat.xml rename to astrid/src/main/res/layout/control_set_repeat.xml diff --git a/astrid/res/layout/control_set_repeat_display.xml b/astrid/src/main/res/layout/control_set_repeat_display.xml similarity index 100% rename from astrid/res/layout/control_set_repeat_display.xml rename to astrid/src/main/res/layout/control_set_repeat_display.xml diff --git a/astrid/res/layout/control_set_tags.xml b/astrid/src/main/res/layout/control_set_tags.xml similarity index 100% rename from astrid/res/layout/control_set_tags.xml rename to astrid/src/main/res/layout/control_set_tags.xml diff --git a/astrid/res/layout/control_set_timers.xml b/astrid/src/main/res/layout/control_set_timers.xml similarity index 100% rename from astrid/res/layout/control_set_timers.xml rename to astrid/src/main/res/layout/control_set_timers.xml diff --git a/astrid/res/layout/control_set_title.xml b/astrid/src/main/res/layout/control_set_title.xml similarity index 100% rename from astrid/res/layout/control_set_title.xml rename to astrid/src/main/res/layout/control_set_title.xml diff --git a/astrid/res/layout/custom_filter_activity.xml b/astrid/src/main/res/layout/custom_filter_activity.xml similarity index 100% rename from astrid/res/layout/custom_filter_activity.xml rename to astrid/src/main/res/layout/custom_filter_activity.xml diff --git a/astrid/res/layout/custom_filter_row.xml b/astrid/src/main/res/layout/custom_filter_row.xml similarity index 100% rename from astrid/res/layout/custom_filter_row.xml rename to astrid/src/main/res/layout/custom_filter_row.xml diff --git a/astrid/res/layout/date_time_dialog.xml b/astrid/src/main/res/layout/date_time_dialog.xml similarity index 100% rename from astrid/res/layout/date_time_dialog.xml rename to astrid/src/main/res/layout/date_time_dialog.xml diff --git a/astrid/res/layout/date_time_picker.xml b/astrid/src/main/res/layout/date_time_picker.xml similarity index 100% rename from astrid/res/layout/date_time_picker.xml rename to astrid/src/main/res/layout/date_time_picker.xml diff --git a/astrid/res/layout/date_time_picker_no_shortcuts.xml b/astrid/src/main/res/layout/date_time_picker_no_shortcuts.xml similarity index 100% rename from astrid/res/layout/date_time_picker_no_shortcuts.xml rename to astrid/src/main/res/layout/date_time_picker_no_shortcuts.xml diff --git a/astrid/res/layout/deadline_number_picker.xml b/astrid/src/main/res/layout/deadline_number_picker.xml similarity index 100% rename from astrid/res/layout/deadline_number_picker.xml rename to astrid/src/main/res/layout/deadline_number_picker.xml diff --git a/astrid/res/layout/feedback_prompt.xml b/astrid/src/main/res/layout/feedback_prompt.xml similarity index 100% rename from astrid/res/layout/feedback_prompt.xml rename to astrid/src/main/res/layout/feedback_prompt.xml diff --git a/astrid/res/layout/file_display_row.xml b/astrid/src/main/res/layout/file_display_row.xml similarity index 100% rename from astrid/res/layout/file_display_row.xml rename to astrid/src/main/res/layout/file_display_row.xml diff --git a/astrid/res/layout/file_row.xml b/astrid/src/main/res/layout/file_row.xml similarity index 100% rename from astrid/res/layout/file_row.xml rename to astrid/src/main/res/layout/file_row.xml diff --git a/astrid/res/layout/filter_adapter_row.xml b/astrid/src/main/res/layout/filter_adapter_row.xml similarity index 100% rename from astrid/res/layout/filter_adapter_row.xml rename to astrid/src/main/res/layout/filter_adapter_row.xml diff --git a/astrid/res/layout/filter_list_activity.xml b/astrid/src/main/res/layout/filter_list_activity.xml similarity index 100% rename from astrid/res/layout/filter_list_activity.xml rename to astrid/src/main/res/layout/filter_list_activity.xml diff --git a/astrid/res/layout/filter_list_activity_3pane.xml b/astrid/src/main/res/layout/filter_list_activity_3pane.xml similarity index 100% rename from astrid/res/layout/filter_list_activity_3pane.xml rename to astrid/src/main/res/layout/filter_list_activity_3pane.xml diff --git a/astrid/res/layout/filter_list_fragment_alternative.xml b/astrid/src/main/res/layout/filter_list_fragment_alternative.xml similarity index 100% rename from astrid/res/layout/filter_list_fragment_alternative.xml rename to astrid/src/main/res/layout/filter_list_fragment_alternative.xml diff --git a/astrid/res/layout/filter_list_fragment_alternative_3pane.xml b/astrid/src/main/res/layout/filter_list_fragment_alternative_3pane.xml similarity index 100% rename from astrid/res/layout/filter_list_fragment_alternative_3pane.xml rename to astrid/src/main/res/layout/filter_list_fragment_alternative_3pane.xml diff --git a/astrid/res/layout/fla_separator.xml b/astrid/src/main/res/layout/fla_separator.xml similarity index 100% rename from astrid/res/layout/fla_separator.xml rename to astrid/src/main/res/layout/fla_separator.xml diff --git a/astrid/res/layout/gtasks_login_activity.xml b/astrid/src/main/res/layout/gtasks_login_activity.xml similarity index 100% rename from astrid/res/layout/gtasks_login_activity.xml rename to astrid/src/main/res/layout/gtasks_login_activity.xml diff --git a/astrid/res/layout/header_nav_views.xml b/astrid/src/main/res/layout/header_nav_views.xml similarity index 100% rename from astrid/res/layout/header_nav_views.xml rename to astrid/src/main/res/layout/header_nav_views.xml diff --git a/astrid/res/layout/header_title_view.xml b/astrid/src/main/res/layout/header_title_view.xml similarity index 100% rename from astrid/res/layout/header_title_view.xml rename to astrid/src/main/res/layout/header_title_view.xml diff --git a/astrid/res/layout/list_dropdown_popover.xml b/astrid/src/main/res/layout/list_dropdown_popover.xml similarity index 100% rename from astrid/res/layout/list_dropdown_popover.xml rename to astrid/src/main/res/layout/list_dropdown_popover.xml diff --git a/astrid/res/layout/list_header.xml b/astrid/src/main/res/layout/list_header.xml similarity index 100% rename from astrid/res/layout/list_header.xml rename to astrid/src/main/res/layout/list_header.xml diff --git a/astrid/res/layout/locale_edit_alerts.xml b/astrid/src/main/res/layout/locale_edit_alerts.xml similarity index 100% rename from astrid/res/layout/locale_edit_alerts.xml rename to astrid/src/main/res/layout/locale_edit_alerts.xml diff --git a/astrid/res/layout/main_menu_popover.xml b/astrid/src/main/res/layout/main_menu_popover.xml similarity index 100% rename from astrid/res/layout/main_menu_popover.xml rename to astrid/src/main/res/layout/main_menu_popover.xml diff --git a/astrid/res/layout/main_menu_popover_body.xml b/astrid/src/main/res/layout/main_menu_popover_body.xml similarity index 100% rename from astrid/res/layout/main_menu_popover_body.xml rename to astrid/src/main/res/layout/main_menu_popover_body.xml diff --git a/astrid/res/layout/main_menu_popover_body_tablet.xml b/astrid/src/main/res/layout/main_menu_popover_body_tablet.xml similarity index 100% rename from astrid/res/layout/main_menu_popover_body_tablet.xml rename to astrid/src/main/res/layout/main_menu_popover_body_tablet.xml diff --git a/astrid/res/layout/main_menu_popover_body_tablet_phone_layout.xml b/astrid/src/main/res/layout/main_menu_popover_body_tablet_phone_layout.xml similarity index 100% rename from astrid/res/layout/main_menu_popover_body_tablet_phone_layout.xml rename to astrid/src/main/res/layout/main_menu_popover_body_tablet_phone_layout.xml diff --git a/astrid/res/layout/main_menu_popover_tablet.xml b/astrid/src/main/res/layout/main_menu_popover_tablet.xml similarity index 100% rename from astrid/res/layout/main_menu_popover_tablet.xml rename to astrid/src/main/res/layout/main_menu_popover_tablet.xml diff --git a/astrid/res/layout/main_menu_popover_tablet_phone_layout.xml b/astrid/src/main/res/layout/main_menu_popover_tablet_phone_layout.xml similarity index 100% rename from astrid/res/layout/main_menu_popover_tablet_phone_layout.xml rename to astrid/src/main/res/layout/main_menu_popover_tablet_phone_layout.xml diff --git a/astrid/res/layout/main_menu_row.xml b/astrid/src/main/res/layout/main_menu_row.xml similarity index 100% rename from astrid/res/layout/main_menu_row.xml rename to astrid/src/main/res/layout/main_menu_row.xml diff --git a/astrid/res/layout/main_menu_row_tablet.xml b/astrid/src/main/res/layout/main_menu_row_tablet.xml similarity index 100% rename from astrid/res/layout/main_menu_row_tablet.xml rename to astrid/src/main/res/layout/main_menu_row_tablet.xml diff --git a/astrid/res/layout/missed_call_activity.xml b/astrid/src/main/res/layout/missed_call_activity.xml similarity index 100% rename from astrid/res/layout/missed_call_activity.xml rename to astrid/src/main/res/layout/missed_call_activity.xml diff --git a/astrid/res/layout/n_number_picker_dialog.xml b/astrid/src/main/res/layout/n_number_picker_dialog.xml similarity index 100% rename from astrid/res/layout/n_number_picker_dialog.xml rename to astrid/src/main/res/layout/n_number_picker_dialog.xml diff --git a/astrid/res/layout/note_decoration.xml b/astrid/src/main/res/layout/note_decoration.xml similarity index 100% rename from astrid/res/layout/note_decoration.xml rename to astrid/src/main/res/layout/note_decoration.xml diff --git a/astrid/res/layout/notes_view_dialog.xml b/astrid/src/main/res/layout/notes_view_dialog.xml similarity index 100% rename from astrid/res/layout/notes_view_dialog.xml rename to astrid/src/main/res/layout/notes_view_dialog.xml diff --git a/astrid/res/layout/number_picker.xml b/astrid/src/main/res/layout/number_picker.xml similarity index 100% rename from astrid/res/layout/number_picker.xml rename to astrid/src/main/res/layout/number_picker.xml diff --git a/astrid/res/layout/number_picker_dialog.xml b/astrid/src/main/res/layout/number_picker_dialog.xml similarity index 100% rename from astrid/res/layout/number_picker_dialog.xml rename to astrid/src/main/res/layout/number_picker_dialog.xml diff --git a/astrid/res/layout/preference_draggable_row.xml b/astrid/src/main/res/layout/preference_draggable_row.xml similarity index 100% rename from astrid/res/layout/preference_draggable_row.xml rename to astrid/src/main/res/layout/preference_draggable_row.xml diff --git a/astrid/res/layout/quick_add_bar.xml b/astrid/src/main/res/layout/quick_add_bar.xml similarity index 100% rename from astrid/res/layout/quick_add_bar.xml rename to astrid/src/main/res/layout/quick_add_bar.xml diff --git a/astrid/res/layout/repeat_until_dialog.xml b/astrid/src/main/res/layout/repeat_until_dialog.xml similarity index 100% rename from astrid/res/layout/repeat_until_dialog.xml rename to astrid/src/main/res/layout/repeat_until_dialog.xml diff --git a/astrid/res/layout/reusable_task_adapter_row.xml b/astrid/src/main/res/layout/reusable_task_adapter_row.xml similarity index 100% rename from astrid/res/layout/reusable_task_adapter_row.xml rename to astrid/src/main/res/layout/reusable_task_adapter_row.xml diff --git a/astrid/res/layout/simple_list_item_multiple_choice_themed.xml b/astrid/src/main/res/layout/simple_list_item_multiple_choice_themed.xml similarity index 100% rename from astrid/res/layout/simple_list_item_multiple_choice_themed.xml rename to astrid/src/main/res/layout/simple_list_item_multiple_choice_themed.xml diff --git a/astrid/res/layout/snooze_dialog.xml b/astrid/src/main/res/layout/snooze_dialog.xml similarity index 100% rename from astrid/res/layout/snooze_dialog.xml rename to astrid/src/main/res/layout/snooze_dialog.xml diff --git a/astrid/res/layout/sort_selection_dialog.xml b/astrid/src/main/res/layout/sort_selection_dialog.xml similarity index 100% rename from astrid/res/layout/sort_selection_dialog.xml rename to astrid/src/main/res/layout/sort_selection_dialog.xml diff --git a/astrid/res/layout/tag_edit_row.xml b/astrid/src/main/res/layout/tag_edit_row.xml similarity index 100% rename from astrid/res/layout/tag_edit_row.xml rename to astrid/src/main/res/layout/tag_edit_row.xml diff --git a/astrid/res/layout/tag_settings_activity.xml b/astrid/src/main/res/layout/tag_settings_activity.xml similarity index 100% rename from astrid/res/layout/tag_settings_activity.xml rename to astrid/src/main/res/layout/tag_settings_activity.xml diff --git a/astrid/res/layout/tag_updates_activity.xml b/astrid/src/main/res/layout/tag_updates_activity.xml similarity index 100% rename from astrid/res/layout/tag_updates_activity.xml rename to astrid/src/main/res/layout/tag_updates_activity.xml diff --git a/astrid/res/layout/tag_updates_fragment.xml b/astrid/src/main/res/layout/tag_updates_fragment.xml similarity index 100% rename from astrid/res/layout/tag_updates_fragment.xml rename to astrid/src/main/res/layout/tag_updates_fragment.xml diff --git a/astrid/res/layout/tag_updates_header.xml b/astrid/src/main/res/layout/tag_updates_header.xml similarity index 100% rename from astrid/res/layout/tag_updates_header.xml rename to astrid/src/main/res/layout/tag_updates_header.xml diff --git a/astrid/res/layout/task_adapter_row.xml b/astrid/src/main/res/layout/task_adapter_row.xml similarity index 100% rename from astrid/res/layout/task_adapter_row.xml rename to astrid/src/main/res/layout/task_adapter_row.xml diff --git a/astrid/res/layout/task_adapter_row_simple.xml b/astrid/src/main/res/layout/task_adapter_row_simple.xml similarity index 100% rename from astrid/res/layout/task_adapter_row_simple.xml rename to astrid/src/main/res/layout/task_adapter_row_simple.xml diff --git a/astrid/res/layout/task_adapter_row_title_only.xml b/astrid/src/main/res/layout/task_adapter_row_title_only.xml similarity index 100% rename from astrid/res/layout/task_adapter_row_title_only.xml rename to astrid/src/main/res/layout/task_adapter_row_title_only.xml diff --git a/astrid/res/layout/task_edit_activity.xml b/astrid/src/main/res/layout/task_edit_activity.xml similarity index 100% rename from astrid/res/layout/task_edit_activity.xml rename to astrid/src/main/res/layout/task_edit_activity.xml diff --git a/astrid/res/layout/task_edit_when_controls.xml b/astrid/src/main/res/layout/task_edit_when_controls.xml similarity index 100% rename from astrid/res/layout/task_edit_when_controls.xml rename to astrid/src/main/res/layout/task_edit_when_controls.xml diff --git a/astrid/res/layout/task_edit_wrapper_activity.xml b/astrid/src/main/res/layout/task_edit_wrapper_activity.xml similarity index 100% rename from astrid/res/layout/task_edit_wrapper_activity.xml rename to astrid/src/main/res/layout/task_edit_wrapper_activity.xml diff --git a/astrid/res/layout/task_list_activity.xml b/astrid/src/main/res/layout/task_list_activity.xml similarity index 100% rename from astrid/res/layout/task_list_activity.xml rename to astrid/src/main/res/layout/task_list_activity.xml diff --git a/astrid/res/layout/task_list_body_featured_list.xml b/astrid/src/main/res/layout/task_list_body_featured_list.xml similarity index 100% rename from astrid/res/layout/task_list_body_featured_list.xml rename to astrid/src/main/res/layout/task_list_body_featured_list.xml diff --git a/astrid/res/layout/task_list_body_reengagement.xml b/astrid/src/main/res/layout/task_list_body_reengagement.xml similarity index 100% rename from astrid/res/layout/task_list_body_reengagement.xml rename to astrid/src/main/res/layout/task_list_body_reengagement.xml diff --git a/astrid/res/layout/task_list_body_standard.xml b/astrid/src/main/res/layout/task_list_body_standard.xml similarity index 100% rename from astrid/res/layout/task_list_body_standard.xml rename to astrid/src/main/res/layout/task_list_body_standard.xml diff --git a/astrid/res/layout/task_list_body_subtasks.xml b/astrid/src/main/res/layout/task_list_body_subtasks.xml similarity index 100% rename from astrid/res/layout/task_list_body_subtasks.xml rename to astrid/src/main/res/layout/task_list_body_subtasks.xml diff --git a/astrid/res/layout/task_list_body_tag.xml b/astrid/src/main/res/layout/task_list_body_tag.xml similarity index 100% rename from astrid/res/layout/task_list_body_tag.xml rename to astrid/src/main/res/layout/task_list_body_tag.xml diff --git a/astrid/res/layout/task_list_body_user.xml b/astrid/src/main/res/layout/task_list_body_user.xml similarity index 100% rename from astrid/res/layout/task_list_body_user.xml rename to astrid/src/main/res/layout/task_list_body_user.xml diff --git a/astrid/res/layout/task_list_wrapper_activity.xml b/astrid/src/main/res/layout/task_list_wrapper_activity.xml similarity index 100% rename from astrid/res/layout/task_list_wrapper_activity.xml rename to astrid/src/main/res/layout/task_list_wrapper_activity.xml diff --git a/astrid/res/layout/task_list_wrapper_activity_3pane.xml b/astrid/src/main/res/layout/task_list_wrapper_activity_3pane.xml similarity index 100% rename from astrid/res/layout/task_list_wrapper_activity_3pane.xml rename to astrid/src/main/res/layout/task_list_wrapper_activity_3pane.xml diff --git a/astrid/res/layout/task_list_wrapper_activity_no_swipe.xml b/astrid/src/main/res/layout/task_list_wrapper_activity_no_swipe.xml similarity index 100% rename from astrid/res/layout/task_list_wrapper_activity_no_swipe.xml rename to astrid/src/main/res/layout/task_list_wrapper_activity_no_swipe.xml diff --git a/astrid/res/layout/time_picker_dialog.xml b/astrid/src/main/res/layout/time_picker_dialog.xml similarity index 100% rename from astrid/res/layout/time_picker_dialog.xml rename to astrid/src/main/res/layout/time_picker_dialog.xml diff --git a/astrid/res/layout/timer_decoration.xml b/astrid/src/main/res/layout/timer_decoration.xml similarity index 100% rename from astrid/res/layout/timer_decoration.xml rename to astrid/src/main/res/layout/timer_decoration.xml diff --git a/astrid/res/layout/update_adapter_row.xml b/astrid/src/main/res/layout/update_adapter_row.xml similarity index 100% rename from astrid/res/layout/update_adapter_row.xml rename to astrid/src/main/res/layout/update_adapter_row.xml diff --git a/astrid/res/layout/update_message_speech_bubble.xml b/astrid/src/main/res/layout/update_message_speech_bubble.xml similarity index 100% rename from astrid/res/layout/update_message_speech_bubble.xml rename to astrid/src/main/res/layout/update_message_speech_bubble.xml diff --git a/astrid/res/layout/update_message_view.xml b/astrid/src/main/res/layout/update_message_view.xml similarity index 100% rename from astrid/res/layout/update_message_view.xml rename to astrid/src/main/res/layout/update_message_view.xml diff --git a/astrid/res/layout/widget_config_activity.xml b/astrid/src/main/res/layout/widget_config_activity.xml similarity index 100% rename from astrid/res/layout/widget_config_activity.xml rename to astrid/src/main/res/layout/widget_config_activity.xml diff --git a/astrid/res/layout/widget_initialized.xml b/astrid/src/main/res/layout/widget_initialized.xml similarity index 100% rename from astrid/res/layout/widget_initialized.xml rename to astrid/src/main/res/layout/widget_initialized.xml diff --git a/astrid/res/layout/widget_initialized_dark.xml b/astrid/src/main/res/layout/widget_initialized_dark.xml similarity index 100% rename from astrid/res/layout/widget_initialized_dark.xml rename to astrid/src/main/res/layout/widget_initialized_dark.xml diff --git a/astrid/res/layout/widget_initialized_dark_transparent.xml b/astrid/src/main/res/layout/widget_initialized_dark_transparent.xml similarity index 100% rename from astrid/res/layout/widget_initialized_dark_transparent.xml rename to astrid/src/main/res/layout/widget_initialized_dark_transparent.xml diff --git a/astrid/res/layout/widget_initialized_legacy.xml b/astrid/src/main/res/layout/widget_initialized_legacy.xml similarity index 100% rename from astrid/res/layout/widget_initialized_legacy.xml rename to astrid/src/main/res/layout/widget_initialized_legacy.xml diff --git a/astrid/res/layout/widget_initialized_red.xml b/astrid/src/main/res/layout/widget_initialized_red.xml similarity index 100% rename from astrid/res/layout/widget_initialized_red.xml rename to astrid/src/main/res/layout/widget_initialized_red.xml diff --git a/astrid/res/layout/widget_initialized_transparent.xml b/astrid/src/main/res/layout/widget_initialized_transparent.xml similarity index 100% rename from astrid/res/layout/widget_initialized_transparent.xml rename to astrid/src/main/res/layout/widget_initialized_transparent.xml diff --git a/astrid/res/layout/widget_loading.xml b/astrid/src/main/res/layout/widget_loading.xml similarity index 100% rename from astrid/res/layout/widget_loading.xml rename to astrid/src/main/res/layout/widget_loading.xml diff --git a/astrid/res/layout/widget_row.xml b/astrid/src/main/res/layout/widget_row.xml similarity index 100% rename from astrid/res/layout/widget_row.xml rename to astrid/src/main/res/layout/widget_row.xml diff --git a/astrid/res/layout/widget_separator.xml b/astrid/src/main/res/layout/widget_separator.xml similarity index 100% rename from astrid/res/layout/widget_separator.xml rename to astrid/src/main/res/layout/widget_separator.xml diff --git a/astrid/res/raw/eula b/astrid/src/main/res/raw/eula similarity index 100% rename from astrid/res/raw/eula rename to astrid/src/main/res/raw/eula diff --git a/astrid/res/raw/gestures b/astrid/src/main/res/raw/gestures similarity index 100% rename from astrid/res/raw/gestures rename to astrid/src/main/res/raw/gestures diff --git a/astrid/res/values-ca/strings.xml b/astrid/src/main/res/values-ca/strings.xml similarity index 100% rename from astrid/res/values-ca/strings.xml rename to astrid/src/main/res/values-ca/strings.xml diff --git a/astrid/res/values-cs/strings.xml b/astrid/src/main/res/values-cs/strings.xml similarity index 100% rename from astrid/res/values-cs/strings.xml rename to astrid/src/main/res/values-cs/strings.xml diff --git a/astrid/res/values-da/strings.xml b/astrid/src/main/res/values-da/strings.xml similarity index 100% rename from astrid/res/values-da/strings.xml rename to astrid/src/main/res/values-da/strings.xml diff --git a/astrid/res/values-de/strings.xml b/astrid/src/main/res/values-de/strings.xml similarity index 100% rename from astrid/res/values-de/strings.xml rename to astrid/src/main/res/values-de/strings.xml diff --git a/astrid/res/values-es/strings.xml b/astrid/src/main/res/values-es/strings.xml similarity index 100% rename from astrid/res/values-es/strings.xml rename to astrid/src/main/res/values-es/strings.xml diff --git a/astrid/res/values-fr/strings.xml b/astrid/src/main/res/values-fr/strings.xml similarity index 100% rename from astrid/res/values-fr/strings.xml rename to astrid/src/main/res/values-fr/strings.xml diff --git a/astrid/res/values-it/strings.xml b/astrid/src/main/res/values-it/strings.xml similarity index 100% rename from astrid/res/values-it/strings.xml rename to astrid/src/main/res/values-it/strings.xml diff --git a/astrid/res/values-iw/strings.xml b/astrid/src/main/res/values-iw/strings.xml similarity index 100% rename from astrid/res/values-iw/strings.xml rename to astrid/src/main/res/values-iw/strings.xml diff --git a/astrid/res/values-ja/strings.xml b/astrid/src/main/res/values-ja/strings.xml similarity index 100% rename from astrid/res/values-ja/strings.xml rename to astrid/src/main/res/values-ja/strings.xml diff --git a/astrid/res/values-ko/strings.xml b/astrid/src/main/res/values-ko/strings.xml similarity index 100% rename from astrid/res/values-ko/strings.xml rename to astrid/src/main/res/values-ko/strings.xml diff --git a/astrid/res/values-nb/strings.xml b/astrid/src/main/res/values-nb/strings.xml similarity index 100% rename from astrid/res/values-nb/strings.xml rename to astrid/src/main/res/values-nb/strings.xml diff --git a/astrid/res/values-nl/strings.xml b/astrid/src/main/res/values-nl/strings.xml similarity index 100% rename from astrid/res/values-nl/strings.xml rename to astrid/src/main/res/values-nl/strings.xml diff --git a/astrid/res/values-pl/strings.xml b/astrid/src/main/res/values-pl/strings.xml similarity index 100% rename from astrid/res/values-pl/strings.xml rename to astrid/src/main/res/values-pl/strings.xml diff --git a/astrid/res/values-pt-rBR/strings.xml b/astrid/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from astrid/res/values-pt-rBR/strings.xml rename to astrid/src/main/res/values-pt-rBR/strings.xml diff --git a/astrid/res/values-pt/strings.xml b/astrid/src/main/res/values-pt/strings.xml similarity index 100% rename from astrid/res/values-pt/strings.xml rename to astrid/src/main/res/values-pt/strings.xml diff --git a/astrid/res/values-ru/strings.xml b/astrid/src/main/res/values-ru/strings.xml similarity index 100% rename from astrid/res/values-ru/strings.xml rename to astrid/src/main/res/values-ru/strings.xml diff --git a/astrid/res/values-sv/strings.xml b/astrid/src/main/res/values-sv/strings.xml similarity index 100% rename from astrid/res/values-sv/strings.xml rename to astrid/src/main/res/values-sv/strings.xml diff --git a/astrid/res/values-th/strings.xml b/astrid/src/main/res/values-th/strings.xml similarity index 100% rename from astrid/res/values-th/strings.xml rename to astrid/src/main/res/values-th/strings.xml diff --git a/astrid/res/values-tr/strings.xml b/astrid/src/main/res/values-tr/strings.xml similarity index 100% rename from astrid/res/values-tr/strings.xml rename to astrid/src/main/res/values-tr/strings.xml diff --git a/astrid/res/values-zh-rCN/strings.xml b/astrid/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from astrid/res/values-zh-rCN/strings.xml rename to astrid/src/main/res/values-zh-rCN/strings.xml diff --git a/astrid/res/values-zh-rTW/strings.xml b/astrid/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from astrid/res/values-zh-rTW/strings.xml rename to astrid/src/main/res/values-zh-rTW/strings.xml diff --git a/astrid/res/values/attrs.xml b/astrid/src/main/res/values/attrs.xml similarity index 100% rename from astrid/res/values/attrs.xml rename to astrid/src/main/res/values/attrs.xml diff --git a/astrid/res/values/colors.xml b/astrid/src/main/res/values/colors.xml similarity index 100% rename from astrid/res/values/colors.xml rename to astrid/src/main/res/values/colors.xml diff --git a/astrid/res/values/cwac_touchlist_attrs.xml b/astrid/src/main/res/values/cwac_touchlist_attrs.xml similarity index 100% rename from astrid/res/values/cwac_touchlist_attrs.xml rename to astrid/src/main/res/values/cwac_touchlist_attrs.xml diff --git a/astrid/res/values/keys-opencrx.xml b/astrid/src/main/res/values/keys-opencrx.xml similarity index 100% rename from astrid/res/values/keys-opencrx.xml rename to astrid/src/main/res/values/keys-opencrx.xml diff --git a/astrid/res/values/keys.xml b/astrid/src/main/res/values/keys.xml similarity index 100% rename from astrid/res/values/keys.xml rename to astrid/src/main/res/values/keys.xml diff --git a/astrid/res/values/strings-actfm.xml b/astrid/src/main/res/values/strings-actfm.xml similarity index 100% rename from astrid/res/values/strings-actfm.xml rename to astrid/src/main/res/values/strings-actfm.xml diff --git a/astrid/res/values/strings-alarms.xml b/astrid/src/main/res/values/strings-alarms.xml similarity index 100% rename from astrid/res/values/strings-alarms.xml rename to astrid/src/main/res/values/strings-alarms.xml diff --git a/astrid/res/values/strings-backup.xml b/astrid/src/main/res/values/strings-backup.xml similarity index 100% rename from astrid/res/values/strings-backup.xml rename to astrid/src/main/res/values/strings-backup.xml diff --git a/astrid/res/values/strings-core.xml b/astrid/src/main/res/values/strings-core.xml similarity index 100% rename from astrid/res/values/strings-core.xml rename to astrid/src/main/res/values/strings-core.xml diff --git a/astrid/res/values/strings-defaults.xml b/astrid/src/main/res/values/strings-defaults.xml similarity index 100% rename from astrid/res/values/strings-defaults.xml rename to astrid/src/main/res/values/strings-defaults.xml diff --git a/astrid/res/values/strings-filters.xml b/astrid/src/main/res/values/strings-filters.xml similarity index 100% rename from astrid/res/values/strings-filters.xml rename to astrid/src/main/res/values/strings-filters.xml diff --git a/astrid/res/values/strings-gcal.xml b/astrid/src/main/res/values/strings-gcal.xml similarity index 100% rename from astrid/res/values/strings-gcal.xml rename to astrid/src/main/res/values/strings-gcal.xml diff --git a/astrid/res/values/strings-gtasks.xml b/astrid/src/main/res/values/strings-gtasks.xml similarity index 100% rename from astrid/res/values/strings-gtasks.xml rename to astrid/src/main/res/values/strings-gtasks.xml diff --git a/astrid/res/values/strings-intro.xml b/astrid/src/main/res/values/strings-intro.xml similarity index 100% rename from astrid/res/values/strings-intro.xml rename to astrid/src/main/res/values/strings-intro.xml diff --git a/astrid/res/values/strings-locale.xml b/astrid/src/main/res/values/strings-locale.xml similarity index 100% rename from astrid/res/values/strings-locale.xml rename to astrid/src/main/res/values/strings-locale.xml diff --git a/astrid/res/values/strings-opencrx.xml b/astrid/src/main/res/values/strings-opencrx.xml similarity index 100% rename from astrid/res/values/strings-opencrx.xml rename to astrid/src/main/res/values/strings-opencrx.xml diff --git a/astrid/res/values/strings-ppack.xml b/astrid/src/main/res/values/strings-ppack.xml similarity index 100% rename from astrid/res/values/strings-ppack.xml rename to astrid/src/main/res/values/strings-ppack.xml diff --git a/astrid/res/values/strings-premium.xml b/astrid/src/main/res/values/strings-premium.xml similarity index 100% rename from astrid/res/values/strings-premium.xml rename to astrid/src/main/res/values/strings-premium.xml diff --git a/astrid/res/values/strings-reminders.xml b/astrid/src/main/res/values/strings-reminders.xml similarity index 100% rename from astrid/res/values/strings-reminders.xml rename to astrid/src/main/res/values/strings-reminders.xml diff --git a/astrid/res/values/strings-repeat.xml b/astrid/src/main/res/values/strings-repeat.xml similarity index 100% rename from astrid/res/values/strings-repeat.xml rename to astrid/src/main/res/values/strings-repeat.xml diff --git a/astrid/res/values/strings-subtasks.xml b/astrid/src/main/res/values/strings-subtasks.xml similarity index 100% rename from astrid/res/values/strings-subtasks.xml rename to astrid/src/main/res/values/strings-subtasks.xml diff --git a/astrid/res/values/strings-tags.xml b/astrid/src/main/res/values/strings-tags.xml similarity index 100% rename from astrid/res/values/strings-tags.xml rename to astrid/src/main/res/values/strings-tags.xml diff --git a/astrid/res/values/strings-timers.xml b/astrid/src/main/res/values/strings-timers.xml similarity index 100% rename from astrid/res/values/strings-timers.xml rename to astrid/src/main/res/values/strings-timers.xml diff --git a/astrid/res/values/strings-updates.xml b/astrid/src/main/res/values/strings-updates.xml similarity index 100% rename from astrid/res/values/strings-updates.xml rename to astrid/src/main/res/values/strings-updates.xml diff --git a/astrid/res/values/strings-voice.xml b/astrid/src/main/res/values/strings-voice.xml similarity index 100% rename from astrid/res/values/strings-voice.xml rename to astrid/src/main/res/values/strings-voice.xml diff --git a/astrid/res/values/strings-welcome.xml b/astrid/src/main/res/values/strings-welcome.xml similarity index 100% rename from astrid/res/values/strings-welcome.xml rename to astrid/src/main/res/values/strings-welcome.xml diff --git a/astrid/res/values/strings-widget.xml b/astrid/src/main/res/values/strings-widget.xml similarity index 100% rename from astrid/res/values/strings-widget.xml rename to astrid/src/main/res/values/strings-widget.xml diff --git a/astrid/res/values/styles-locale.xml b/astrid/src/main/res/values/styles-locale.xml similarity index 100% rename from astrid/res/values/styles-locale.xml rename to astrid/src/main/res/values/styles-locale.xml diff --git a/astrid/res/values/styles.xml b/astrid/src/main/res/values/styles.xml similarity index 99% rename from astrid/res/values/styles.xml rename to astrid/src/main/res/values/styles.xml index 8e526bdaa..6cd8ffc82 100644 --- a/astrid/res/values/styles.xml +++ b/astrid/src/main/res/values/styles.xml @@ -206,7 +206,7 @@