diff --git a/build.gradle b/build.gradle
index eb5bd3c..4849160 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,19 +10,10 @@ buildscript {
 apply plugin: 'com.android.library'
 
 dependencies {
-    compile project(':SafeParcel')
+    compile project('SafeParcel')
 }
 
 android {
     compileSdkVersion 21
     buildToolsVersion "21.1.2"
-    lintOptions.abortOnError false
-
-    sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-            aidl.srcDirs = ['src']
-        }
-    }
 }
diff --git a/AndroidManifest.xml b/src/main/AndroidManifest.xml
similarity index 100%
rename from AndroidManifest.xml
rename to src/main/AndroidManifest.xml
diff --git a/src/com/google/android/auth/IAuthManagerService.aidl b/src/main/aidl/com/google/android/auth/IAuthManagerService.aidl
similarity index 100%
rename from src/com/google/android/auth/IAuthManagerService.aidl
rename to src/main/aidl/com/google/android/auth/IAuthManagerService.aidl
diff --git a/src/com/google/android/gms/appdatasearch/CorpusStatus.aidl b/src/main/aidl/com/google/android/gms/appdatasearch/CorpusStatus.aidl
similarity index 100%
rename from src/com/google/android/gms/appdatasearch/CorpusStatus.aidl
rename to src/main/aidl/com/google/android/gms/appdatasearch/CorpusStatus.aidl
diff --git a/src/com/google/android/gms/appdatasearch/SuggestSpecification.aidl b/src/main/aidl/com/google/android/gms/appdatasearch/SuggestSpecification.aidl
similarity index 100%
rename from src/com/google/android/gms/appdatasearch/SuggestSpecification.aidl
rename to src/main/aidl/com/google/android/gms/appdatasearch/SuggestSpecification.aidl
diff --git a/src/com/google/android/gms/appdatasearch/SuggestionResults.aidl b/src/main/aidl/com/google/android/gms/appdatasearch/SuggestionResults.aidl
similarity index 100%
rename from src/com/google/android/gms/appdatasearch/SuggestionResults.aidl
rename to src/main/aidl/com/google/android/gms/appdatasearch/SuggestionResults.aidl
diff --git a/src/com/google/android/gms/appdatasearch/UsageInfo.aidl b/src/main/aidl/com/google/android/gms/appdatasearch/UsageInfo.aidl
similarity index 100%
rename from src/com/google/android/gms/appdatasearch/UsageInfo.aidl
rename to src/main/aidl/com/google/android/gms/appdatasearch/UsageInfo.aidl
diff --git a/src/com/google/android/gms/appdatasearch/internal/IAppDataSearch.aidl b/src/main/aidl/com/google/android/gms/appdatasearch/internal/IAppDataSearch.aidl
similarity index 100%
rename from src/com/google/android/gms/appdatasearch/internal/IAppDataSearch.aidl
rename to src/main/aidl/com/google/android/gms/appdatasearch/internal/IAppDataSearch.aidl
diff --git a/src/com/google/android/gms/appdatasearch/internal/ILightweightAppDataSearch.aidl b/src/main/aidl/com/google/android/gms/appdatasearch/internal/ILightweightAppDataSearch.aidl
similarity index 100%
rename from src/com/google/android/gms/appdatasearch/internal/ILightweightAppDataSearch.aidl
rename to src/main/aidl/com/google/android/gms/appdatasearch/internal/ILightweightAppDataSearch.aidl
diff --git a/src/com/google/android/gms/appdatasearch/internal/ILightweightAppDataSearchCallbacks.aidl b/src/main/aidl/com/google/android/gms/appdatasearch/internal/ILightweightAppDataSearchCallbacks.aidl
similarity index 100%
rename from src/com/google/android/gms/appdatasearch/internal/ILightweightAppDataSearchCallbacks.aidl
rename to src/main/aidl/com/google/android/gms/appdatasearch/internal/ILightweightAppDataSearchCallbacks.aidl
diff --git a/src/com/google/android/gms/auth/AccountChangeEventsRequest.aidl b/src/main/aidl/com/google/android/gms/auth/AccountChangeEventsRequest.aidl
similarity index 100%
rename from src/com/google/android/gms/auth/AccountChangeEventsRequest.aidl
rename to src/main/aidl/com/google/android/gms/auth/AccountChangeEventsRequest.aidl
diff --git a/src/com/google/android/gms/auth/AccountChangeEventsResponse.aidl b/src/main/aidl/com/google/android/gms/auth/AccountChangeEventsResponse.aidl
similarity index 100%
rename from src/com/google/android/gms/auth/AccountChangeEventsResponse.aidl
rename to src/main/aidl/com/google/android/gms/auth/AccountChangeEventsResponse.aidl
diff --git a/src/com/google/android/gms/common/data/DataHolder.aidl b/src/main/aidl/com/google/android/gms/common/data/DataHolder.aidl
similarity index 100%
rename from src/com/google/android/gms/common/data/DataHolder.aidl
rename to src/main/aidl/com/google/android/gms/common/data/DataHolder.aidl
diff --git a/src/com/google/android/gms/common/internal/ICancelToken.aidl b/src/main/aidl/com/google/android/gms/common/internal/ICancelToken.aidl
similarity index 100%
rename from src/com/google/android/gms/common/internal/ICancelToken.aidl
rename to src/main/aidl/com/google/android/gms/common/internal/ICancelToken.aidl
diff --git a/src/com/google/android/gms/common/internal/IGmsCallbacks.aidl b/src/main/aidl/com/google/android/gms/common/internal/IGmsCallbacks.aidl
similarity index 100%
rename from src/com/google/android/gms/common/internal/IGmsCallbacks.aidl
rename to src/main/aidl/com/google/android/gms/common/internal/IGmsCallbacks.aidl
diff --git a/src/com/google/android/gms/common/internal/IGmsServiceBroker.aidl b/src/main/aidl/com/google/android/gms/common/internal/IGmsServiceBroker.aidl
similarity index 100%
rename from src/com/google/android/gms/common/internal/IGmsServiceBroker.aidl
rename to src/main/aidl/com/google/android/gms/common/internal/IGmsServiceBroker.aidl
diff --git a/src/com/google/android/gms/common/internal/ISignInButtonCreator.aidl b/src/main/aidl/com/google/android/gms/common/internal/ISignInButtonCreator.aidl
similarity index 100%
rename from src/com/google/android/gms/common/internal/ISignInButtonCreator.aidl
rename to src/main/aidl/com/google/android/gms/common/internal/ISignInButtonCreator.aidl
diff --git a/src/com/google/android/gms/common/server/FavaDiagnosticsEntity.aidl b/src/main/aidl/com/google/android/gms/common/server/FavaDiagnosticsEntity.aidl
similarity index 100%
rename from src/com/google/android/gms/common/server/FavaDiagnosticsEntity.aidl
rename to src/main/aidl/com/google/android/gms/common/server/FavaDiagnosticsEntity.aidl
diff --git a/src/com/google/android/gms/dynamic/IObjectWrapper.aidl b/src/main/aidl/com/google/android/gms/dynamic/IObjectWrapper.aidl
similarity index 100%
rename from src/com/google/android/gms/dynamic/IObjectWrapper.aidl
rename to src/main/aidl/com/google/android/gms/dynamic/IObjectWrapper.aidl
diff --git a/src/com/google/android/gms/location/Geofence.aidl b/src/main/aidl/com/google/android/gms/location/Geofence.aidl
similarity index 100%
rename from src/com/google/android/gms/location/Geofence.aidl
rename to src/main/aidl/com/google/android/gms/location/Geofence.aidl
diff --git a/src/com/google/android/gms/location/GeofencingRequest.aidl b/src/main/aidl/com/google/android/gms/location/GeofencingRequest.aidl
similarity index 100%
rename from src/com/google/android/gms/location/GeofencingRequest.aidl
rename to src/main/aidl/com/google/android/gms/location/GeofencingRequest.aidl
diff --git a/src/com/google/android/gms/location/ILocationListener.aidl b/src/main/aidl/com/google/android/gms/location/ILocationListener.aidl
similarity index 100%
rename from src/com/google/android/gms/location/ILocationListener.aidl
rename to src/main/aidl/com/google/android/gms/location/ILocationListener.aidl
diff --git a/src/com/google/android/gms/location/LocationRequest.aidl b/src/main/aidl/com/google/android/gms/location/LocationRequest.aidl
similarity index 100%
rename from src/com/google/android/gms/location/LocationRequest.aidl
rename to src/main/aidl/com/google/android/gms/location/LocationRequest.aidl
diff --git a/src/com/google/android/gms/location/LocationStatus.aidl b/src/main/aidl/com/google/android/gms/location/LocationStatus.aidl
similarity index 100%
rename from src/com/google/android/gms/location/LocationStatus.aidl
rename to src/main/aidl/com/google/android/gms/location/LocationStatus.aidl
diff --git a/src/com/google/android/gms/location/internal/IGeofencerCallbacks.aidl b/src/main/aidl/com/google/android/gms/location/internal/IGeofencerCallbacks.aidl
similarity index 100%
rename from src/com/google/android/gms/location/internal/IGeofencerCallbacks.aidl
rename to src/main/aidl/com/google/android/gms/location/internal/IGeofencerCallbacks.aidl
diff --git a/src/com/google/android/gms/location/internal/IGoogleLocationManagerService.aidl b/src/main/aidl/com/google/android/gms/location/internal/IGoogleLocationManagerService.aidl
similarity index 100%
rename from src/com/google/android/gms/location/internal/IGoogleLocationManagerService.aidl
rename to src/main/aidl/com/google/android/gms/location/internal/IGoogleLocationManagerService.aidl
diff --git a/src/com/google/android/gms/location/internal/LocationRequestInternal.aidl b/src/main/aidl/com/google/android/gms/location/internal/LocationRequestInternal.aidl
similarity index 100%
rename from src/com/google/android/gms/location/internal/LocationRequestInternal.aidl
rename to src/main/aidl/com/google/android/gms/location/internal/LocationRequestInternal.aidl
diff --git a/src/com/google/android/gms/location/places/AutocompleteFilter.aidl b/src/main/aidl/com/google/android/gms/location/places/AutocompleteFilter.aidl
similarity index 100%
rename from src/com/google/android/gms/location/places/AutocompleteFilter.aidl
rename to src/main/aidl/com/google/android/gms/location/places/AutocompleteFilter.aidl
diff --git a/src/com/google/android/gms/location/places/NearbyAlertRequest.aidl b/src/main/aidl/com/google/android/gms/location/places/NearbyAlertRequest.aidl
similarity index 100%
rename from src/com/google/android/gms/location/places/NearbyAlertRequest.aidl
rename to src/main/aidl/com/google/android/gms/location/places/NearbyAlertRequest.aidl
diff --git a/src/com/google/android/gms/location/places/PlaceFilter.aidl b/src/main/aidl/com/google/android/gms/location/places/PlaceFilter.aidl
similarity index 100%
rename from src/com/google/android/gms/location/places/PlaceFilter.aidl
rename to src/main/aidl/com/google/android/gms/location/places/PlaceFilter.aidl
diff --git a/src/com/google/android/gms/location/places/PlaceReport.aidl b/src/main/aidl/com/google/android/gms/location/places/PlaceReport.aidl
similarity index 100%
rename from src/com/google/android/gms/location/places/PlaceReport.aidl
rename to src/main/aidl/com/google/android/gms/location/places/PlaceReport.aidl
diff --git a/src/com/google/android/gms/location/places/PlaceRequest.aidl b/src/main/aidl/com/google/android/gms/location/places/PlaceRequest.aidl
similarity index 100%
rename from src/com/google/android/gms/location/places/PlaceRequest.aidl
rename to src/main/aidl/com/google/android/gms/location/places/PlaceRequest.aidl
diff --git a/src/com/google/android/gms/location/places/UserAddedPlace.aidl b/src/main/aidl/com/google/android/gms/location/places/UserAddedPlace.aidl
similarity index 100%
rename from src/com/google/android/gms/location/places/UserAddedPlace.aidl
rename to src/main/aidl/com/google/android/gms/location/places/UserAddedPlace.aidl
diff --git a/src/com/google/android/gms/location/places/UserDataType.aidl b/src/main/aidl/com/google/android/gms/location/places/UserDataType.aidl
similarity index 100%
rename from src/com/google/android/gms/location/places/UserDataType.aidl
rename to src/main/aidl/com/google/android/gms/location/places/UserDataType.aidl
diff --git a/src/com/google/android/gms/location/places/internal/IPlacesCallbacks.aidl b/src/main/aidl/com/google/android/gms/location/places/internal/IPlacesCallbacks.aidl
similarity index 100%
rename from src/com/google/android/gms/location/places/internal/IPlacesCallbacks.aidl
rename to src/main/aidl/com/google/android/gms/location/places/internal/IPlacesCallbacks.aidl
diff --git a/src/com/google/android/gms/location/places/internal/PlacesParams.aidl b/src/main/aidl/com/google/android/gms/location/places/internal/PlacesParams.aidl
similarity index 100%
rename from src/com/google/android/gms/location/places/internal/PlacesParams.aidl
rename to src/main/aidl/com/google/android/gms/location/places/internal/PlacesParams.aidl
diff --git a/src/com/google/android/gms/location/reporting/ReportingState.aidl b/src/main/aidl/com/google/android/gms/location/reporting/ReportingState.aidl
similarity index 100%
rename from src/com/google/android/gms/location/reporting/ReportingState.aidl
rename to src/main/aidl/com/google/android/gms/location/reporting/ReportingState.aidl
diff --git a/src/com/google/android/gms/location/reporting/internal/IReportingService.aidl b/src/main/aidl/com/google/android/gms/location/reporting/internal/IReportingService.aidl
similarity index 100%
rename from src/com/google/android/gms/location/reporting/internal/IReportingService.aidl
rename to src/main/aidl/com/google/android/gms/location/reporting/internal/IReportingService.aidl
diff --git a/src/com/google/android/gms/maps/GoogleMapOptions.aidl b/src/main/aidl/com/google/android/gms/maps/GoogleMapOptions.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/GoogleMapOptions.aidl
rename to src/main/aidl/com/google/android/gms/maps/GoogleMapOptions.aidl
diff --git a/src/com/google/android/gms/maps/internal/ICameraUpdateFactoryDelegate.aidl b/src/main/aidl/com/google/android/gms/maps/internal/ICameraUpdateFactoryDelegate.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/internal/ICameraUpdateFactoryDelegate.aidl
rename to src/main/aidl/com/google/android/gms/maps/internal/ICameraUpdateFactoryDelegate.aidl
diff --git a/src/com/google/android/gms/maps/internal/ICancelableCallback.aidl b/src/main/aidl/com/google/android/gms/maps/internal/ICancelableCallback.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/internal/ICancelableCallback.aidl
rename to src/main/aidl/com/google/android/gms/maps/internal/ICancelableCallback.aidl
diff --git a/src/com/google/android/gms/maps/internal/ICreator.aidl b/src/main/aidl/com/google/android/gms/maps/internal/ICreator.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/internal/ICreator.aidl
rename to src/main/aidl/com/google/android/gms/maps/internal/ICreator.aidl
diff --git a/src/com/google/android/gms/maps/internal/IGoogleMapDelegate.aidl b/src/main/aidl/com/google/android/gms/maps/internal/IGoogleMapDelegate.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/internal/IGoogleMapDelegate.aidl
rename to src/main/aidl/com/google/android/gms/maps/internal/IGoogleMapDelegate.aidl
diff --git a/src/com/google/android/gms/maps/internal/IInfoWindowAdapter.aidl b/src/main/aidl/com/google/android/gms/maps/internal/IInfoWindowAdapter.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/internal/IInfoWindowAdapter.aidl
rename to src/main/aidl/com/google/android/gms/maps/internal/IInfoWindowAdapter.aidl
diff --git a/src/com/google/android/gms/maps/internal/ILocationSourceDelegate.aidl b/src/main/aidl/com/google/android/gms/maps/internal/ILocationSourceDelegate.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/internal/ILocationSourceDelegate.aidl
rename to src/main/aidl/com/google/android/gms/maps/internal/ILocationSourceDelegate.aidl
diff --git a/src/com/google/android/gms/maps/internal/IMapFragmentDelegate.aidl b/src/main/aidl/com/google/android/gms/maps/internal/IMapFragmentDelegate.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/internal/IMapFragmentDelegate.aidl
rename to src/main/aidl/com/google/android/gms/maps/internal/IMapFragmentDelegate.aidl
diff --git a/src/com/google/android/gms/maps/internal/IMapViewDelegate.aidl b/src/main/aidl/com/google/android/gms/maps/internal/IMapViewDelegate.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/internal/IMapViewDelegate.aidl
rename to src/main/aidl/com/google/android/gms/maps/internal/IMapViewDelegate.aidl
diff --git a/src/com/google/android/gms/maps/internal/IOnCameraChangeListener.aidl b/src/main/aidl/com/google/android/gms/maps/internal/IOnCameraChangeListener.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/internal/IOnCameraChangeListener.aidl
rename to src/main/aidl/com/google/android/gms/maps/internal/IOnCameraChangeListener.aidl
diff --git a/src/com/google/android/gms/maps/internal/IOnInfoWindowClickListener.aidl b/src/main/aidl/com/google/android/gms/maps/internal/IOnInfoWindowClickListener.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/internal/IOnInfoWindowClickListener.aidl
rename to src/main/aidl/com/google/android/gms/maps/internal/IOnInfoWindowClickListener.aidl
diff --git a/src/com/google/android/gms/maps/internal/IOnMapClickListener.aidl b/src/main/aidl/com/google/android/gms/maps/internal/IOnMapClickListener.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/internal/IOnMapClickListener.aidl
rename to src/main/aidl/com/google/android/gms/maps/internal/IOnMapClickListener.aidl
diff --git a/src/com/google/android/gms/maps/internal/IOnMapLoadedCallback.aidl b/src/main/aidl/com/google/android/gms/maps/internal/IOnMapLoadedCallback.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/internal/IOnMapLoadedCallback.aidl
rename to src/main/aidl/com/google/android/gms/maps/internal/IOnMapLoadedCallback.aidl
diff --git a/src/com/google/android/gms/maps/internal/IOnMapLongClickListener.aidl b/src/main/aidl/com/google/android/gms/maps/internal/IOnMapLongClickListener.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/internal/IOnMapLongClickListener.aidl
rename to src/main/aidl/com/google/android/gms/maps/internal/IOnMapLongClickListener.aidl
diff --git a/src/com/google/android/gms/maps/internal/IOnMarkerClickListener.aidl b/src/main/aidl/com/google/android/gms/maps/internal/IOnMarkerClickListener.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/internal/IOnMarkerClickListener.aidl
rename to src/main/aidl/com/google/android/gms/maps/internal/IOnMarkerClickListener.aidl
diff --git a/src/com/google/android/gms/maps/internal/IOnMarkerDragListener.aidl b/src/main/aidl/com/google/android/gms/maps/internal/IOnMarkerDragListener.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/internal/IOnMarkerDragListener.aidl
rename to src/main/aidl/com/google/android/gms/maps/internal/IOnMarkerDragListener.aidl
diff --git a/src/com/google/android/gms/maps/internal/IOnMyLocationButtonClickListener.aidl b/src/main/aidl/com/google/android/gms/maps/internal/IOnMyLocationButtonClickListener.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/internal/IOnMyLocationButtonClickListener.aidl
rename to src/main/aidl/com/google/android/gms/maps/internal/IOnMyLocationButtonClickListener.aidl
diff --git a/src/com/google/android/gms/maps/internal/IOnMyLocationChangeListener.aidl b/src/main/aidl/com/google/android/gms/maps/internal/IOnMyLocationChangeListener.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/internal/IOnMyLocationChangeListener.aidl
rename to src/main/aidl/com/google/android/gms/maps/internal/IOnMyLocationChangeListener.aidl
diff --git a/src/com/google/android/gms/maps/internal/IProjectionDelegate.aidl b/src/main/aidl/com/google/android/gms/maps/internal/IProjectionDelegate.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/internal/IProjectionDelegate.aidl
rename to src/main/aidl/com/google/android/gms/maps/internal/IProjectionDelegate.aidl
diff --git a/src/com/google/android/gms/maps/internal/ISnapshotReadyCallback.aidl b/src/main/aidl/com/google/android/gms/maps/internal/ISnapshotReadyCallback.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/internal/ISnapshotReadyCallback.aidl
rename to src/main/aidl/com/google/android/gms/maps/internal/ISnapshotReadyCallback.aidl
diff --git a/src/com/google/android/gms/maps/internal/IUiSettingsDelegate.aidl b/src/main/aidl/com/google/android/gms/maps/internal/IUiSettingsDelegate.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/internal/IUiSettingsDelegate.aidl
rename to src/main/aidl/com/google/android/gms/maps/internal/IUiSettingsDelegate.aidl
diff --git a/src/com/google/android/gms/maps/model/CameraPosition.aidl b/src/main/aidl/com/google/android/gms/maps/model/CameraPosition.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/model/CameraPosition.aidl
rename to src/main/aidl/com/google/android/gms/maps/model/CameraPosition.aidl
diff --git a/src/com/google/android/gms/maps/model/CircleOptions.aidl b/src/main/aidl/com/google/android/gms/maps/model/CircleOptions.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/model/CircleOptions.aidl
rename to src/main/aidl/com/google/android/gms/maps/model/CircleOptions.aidl
diff --git a/src/com/google/android/gms/maps/model/GroundOverlayOptions.aidl b/src/main/aidl/com/google/android/gms/maps/model/GroundOverlayOptions.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/model/GroundOverlayOptions.aidl
rename to src/main/aidl/com/google/android/gms/maps/model/GroundOverlayOptions.aidl
diff --git a/src/com/google/android/gms/maps/model/LatLng.aidl b/src/main/aidl/com/google/android/gms/maps/model/LatLng.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/model/LatLng.aidl
rename to src/main/aidl/com/google/android/gms/maps/model/LatLng.aidl
diff --git a/src/com/google/android/gms/maps/model/LatLngBounds.aidl b/src/main/aidl/com/google/android/gms/maps/model/LatLngBounds.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/model/LatLngBounds.aidl
rename to src/main/aidl/com/google/android/gms/maps/model/LatLngBounds.aidl
diff --git a/src/com/google/android/gms/maps/model/MarkerOptions.aidl b/src/main/aidl/com/google/android/gms/maps/model/MarkerOptions.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/model/MarkerOptions.aidl
rename to src/main/aidl/com/google/android/gms/maps/model/MarkerOptions.aidl
diff --git a/src/com/google/android/gms/maps/model/PolygonOptions.aidl b/src/main/aidl/com/google/android/gms/maps/model/PolygonOptions.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/model/PolygonOptions.aidl
rename to src/main/aidl/com/google/android/gms/maps/model/PolygonOptions.aidl
diff --git a/src/com/google/android/gms/maps/model/PolylineOptions.aidl b/src/main/aidl/com/google/android/gms/maps/model/PolylineOptions.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/model/PolylineOptions.aidl
rename to src/main/aidl/com/google/android/gms/maps/model/PolylineOptions.aidl
diff --git a/src/com/google/android/gms/maps/model/Tile.aidl b/src/main/aidl/com/google/android/gms/maps/model/Tile.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/model/Tile.aidl
rename to src/main/aidl/com/google/android/gms/maps/model/Tile.aidl
diff --git a/src/com/google/android/gms/maps/model/TileOverlayOptions.aidl b/src/main/aidl/com/google/android/gms/maps/model/TileOverlayOptions.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/model/TileOverlayOptions.aidl
rename to src/main/aidl/com/google/android/gms/maps/model/TileOverlayOptions.aidl
diff --git a/src/com/google/android/gms/maps/model/VisibleRegion.aidl b/src/main/aidl/com/google/android/gms/maps/model/VisibleRegion.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/model/VisibleRegion.aidl
rename to src/main/aidl/com/google/android/gms/maps/model/VisibleRegion.aidl
diff --git a/src/com/google/android/gms/maps/model/internal/IBitmapDescriptorFactoryDelegate.aidl b/src/main/aidl/com/google/android/gms/maps/model/internal/IBitmapDescriptorFactoryDelegate.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/model/internal/IBitmapDescriptorFactoryDelegate.aidl
rename to src/main/aidl/com/google/android/gms/maps/model/internal/IBitmapDescriptorFactoryDelegate.aidl
diff --git a/src/com/google/android/gms/maps/model/internal/ICircleDelegate.aidl b/src/main/aidl/com/google/android/gms/maps/model/internal/ICircleDelegate.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/model/internal/ICircleDelegate.aidl
rename to src/main/aidl/com/google/android/gms/maps/model/internal/ICircleDelegate.aidl
diff --git a/src/com/google/android/gms/maps/model/internal/IGroundOverlayDelegate.aidl b/src/main/aidl/com/google/android/gms/maps/model/internal/IGroundOverlayDelegate.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/model/internal/IGroundOverlayDelegate.aidl
rename to src/main/aidl/com/google/android/gms/maps/model/internal/IGroundOverlayDelegate.aidl
diff --git a/src/com/google/android/gms/maps/model/internal/IMarkerDelegate.aidl b/src/main/aidl/com/google/android/gms/maps/model/internal/IMarkerDelegate.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/model/internal/IMarkerDelegate.aidl
rename to src/main/aidl/com/google/android/gms/maps/model/internal/IMarkerDelegate.aidl
diff --git a/src/com/google/android/gms/maps/model/internal/IPolygonDelegate.aidl b/src/main/aidl/com/google/android/gms/maps/model/internal/IPolygonDelegate.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/model/internal/IPolygonDelegate.aidl
rename to src/main/aidl/com/google/android/gms/maps/model/internal/IPolygonDelegate.aidl
diff --git a/src/com/google/android/gms/maps/model/internal/IPolylineDelegate.aidl b/src/main/aidl/com/google/android/gms/maps/model/internal/IPolylineDelegate.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/model/internal/IPolylineDelegate.aidl
rename to src/main/aidl/com/google/android/gms/maps/model/internal/IPolylineDelegate.aidl
diff --git a/src/com/google/android/gms/maps/model/internal/ITileOverlayDelegate.aidl b/src/main/aidl/com/google/android/gms/maps/model/internal/ITileOverlayDelegate.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/model/internal/ITileOverlayDelegate.aidl
rename to src/main/aidl/com/google/android/gms/maps/model/internal/ITileOverlayDelegate.aidl
diff --git a/src/com/google/android/gms/maps/model/internal/ITileProviderDelegate.aidl b/src/main/aidl/com/google/android/gms/maps/model/internal/ITileProviderDelegate.aidl
similarity index 100%
rename from src/com/google/android/gms/maps/model/internal/ITileProviderDelegate.aidl
rename to src/main/aidl/com/google/android/gms/maps/model/internal/ITileProviderDelegate.aidl
diff --git a/src/com/google/android/gms/people/internal/IPeopleCallbacks.aidl b/src/main/aidl/com/google/android/gms/people/internal/IPeopleCallbacks.aidl
similarity index 100%
rename from src/com/google/android/gms/people/internal/IPeopleCallbacks.aidl
rename to src/main/aidl/com/google/android/gms/people/internal/IPeopleCallbacks.aidl
diff --git a/src/com/google/android/gms/people/internal/IPeopleService.aidl b/src/main/aidl/com/google/android/gms/people/internal/IPeopleService.aidl
similarity index 100%
rename from src/com/google/android/gms/people/internal/IPeopleService.aidl
rename to src/main/aidl/com/google/android/gms/people/internal/IPeopleService.aidl
diff --git a/src/com/google/android/gms/plus/internal/IPlusOneButtonCreator.aidl b/src/main/aidl/com/google/android/gms/plus/internal/IPlusOneButtonCreator.aidl
similarity index 100%
rename from src/com/google/android/gms/plus/internal/IPlusOneButtonCreator.aidl
rename to src/main/aidl/com/google/android/gms/plus/internal/IPlusOneButtonCreator.aidl
diff --git a/src/com/google/android/gms/appdatasearch/CorpusStatus.java b/src/main/java/com/google/android/gms/appdatasearch/CorpusStatus.java
similarity index 100%
rename from src/com/google/android/gms/appdatasearch/CorpusStatus.java
rename to src/main/java/com/google/android/gms/appdatasearch/CorpusStatus.java
diff --git a/src/com/google/android/gms/appdatasearch/SuggestSpecification.java b/src/main/java/com/google/android/gms/appdatasearch/SuggestSpecification.java
similarity index 100%
rename from src/com/google/android/gms/appdatasearch/SuggestSpecification.java
rename to src/main/java/com/google/android/gms/appdatasearch/SuggestSpecification.java
diff --git a/src/com/google/android/gms/appdatasearch/SuggestionResults.java b/src/main/java/com/google/android/gms/appdatasearch/SuggestionResults.java
similarity index 100%
rename from src/com/google/android/gms/appdatasearch/SuggestionResults.java
rename to src/main/java/com/google/android/gms/appdatasearch/SuggestionResults.java
diff --git a/src/com/google/android/gms/appdatasearch/UsageInfo.java b/src/main/java/com/google/android/gms/appdatasearch/UsageInfo.java
similarity index 100%
rename from src/com/google/android/gms/appdatasearch/UsageInfo.java
rename to src/main/java/com/google/android/gms/appdatasearch/UsageInfo.java
diff --git a/src/com/google/android/gms/auth/AccountChangeEvent.java b/src/main/java/com/google/android/gms/auth/AccountChangeEvent.java
similarity index 100%
rename from src/com/google/android/gms/auth/AccountChangeEvent.java
rename to src/main/java/com/google/android/gms/auth/AccountChangeEvent.java
diff --git a/src/com/google/android/gms/auth/AccountChangeEventsRequest.java b/src/main/java/com/google/android/gms/auth/AccountChangeEventsRequest.java
similarity index 100%
rename from src/com/google/android/gms/auth/AccountChangeEventsRequest.java
rename to src/main/java/com/google/android/gms/auth/AccountChangeEventsRequest.java
diff --git a/src/com/google/android/gms/auth/AccountChangeEventsResponse.java b/src/main/java/com/google/android/gms/auth/AccountChangeEventsResponse.java
similarity index 100%
rename from src/com/google/android/gms/auth/AccountChangeEventsResponse.java
rename to src/main/java/com/google/android/gms/auth/AccountChangeEventsResponse.java
diff --git a/src/com/google/android/gms/auth/firstparty/dataservice/TokenRequest.java b/src/main/java/com/google/android/gms/auth/firstparty/dataservice/TokenRequest.java
similarity index 100%
rename from src/com/google/android/gms/auth/firstparty/dataservice/TokenRequest.java
rename to src/main/java/com/google/android/gms/auth/firstparty/dataservice/TokenRequest.java
diff --git a/src/com/google/android/gms/auth/firstparty/dataservice/TokenResponse.java b/src/main/java/com/google/android/gms/auth/firstparty/dataservice/TokenResponse.java
similarity index 100%
rename from src/com/google/android/gms/auth/firstparty/dataservice/TokenResponse.java
rename to src/main/java/com/google/android/gms/auth/firstparty/dataservice/TokenResponse.java
diff --git a/src/com/google/android/gms/auth/firstparty/proximity/data/Permit.java b/src/main/java/com/google/android/gms/auth/firstparty/proximity/data/Permit.java
similarity index 100%
rename from src/com/google/android/gms/auth/firstparty/proximity/data/Permit.java
rename to src/main/java/com/google/android/gms/auth/firstparty/proximity/data/Permit.java
diff --git a/src/com/google/android/gms/common/Scopes.java b/src/main/java/com/google/android/gms/common/Scopes.java
similarity index 100%
rename from src/com/google/android/gms/common/Scopes.java
rename to src/main/java/com/google/android/gms/common/Scopes.java
diff --git a/src/com/google/android/gms/common/api/AccountInfo.java b/src/main/java/com/google/android/gms/common/api/AccountInfo.java
similarity index 100%
rename from src/com/google/android/gms/common/api/AccountInfo.java
rename to src/main/java/com/google/android/gms/common/api/AccountInfo.java
diff --git a/src/com/google/android/gms/common/api/CommonStatusCodes.java b/src/main/java/com/google/android/gms/common/api/CommonStatusCodes.java
similarity index 100%
rename from src/com/google/android/gms/common/api/CommonStatusCodes.java
rename to src/main/java/com/google/android/gms/common/api/CommonStatusCodes.java
diff --git a/src/com/google/android/gms/common/api/Result.java b/src/main/java/com/google/android/gms/common/api/Result.java
similarity index 100%
rename from src/com/google/android/gms/common/api/Result.java
rename to src/main/java/com/google/android/gms/common/api/Result.java
diff --git a/src/com/google/android/gms/common/api/Scope.java b/src/main/java/com/google/android/gms/common/api/Scope.java
similarity index 100%
rename from src/com/google/android/gms/common/api/Scope.java
rename to src/main/java/com/google/android/gms/common/api/Scope.java
diff --git a/src/com/google/android/gms/common/api/Status.java b/src/main/java/com/google/android/gms/common/api/Status.java
similarity index 100%
rename from src/com/google/android/gms/common/api/Status.java
rename to src/main/java/com/google/android/gms/common/api/Status.java
diff --git a/src/com/google/android/gms/common/data/DataHolder.java b/src/main/java/com/google/android/gms/common/data/DataHolder.java
similarity index 64%
rename from src/com/google/android/gms/common/data/DataHolder.java
rename to src/main/java/com/google/android/gms/common/data/DataHolder.java
index 75a57dd..99811a1 100644
--- a/src/com/google/android/gms/common/data/DataHolder.java
+++ b/src/main/java/com/google/android/gms/common/data/DataHolder.java
@@ -1,7 +1,10 @@
 package com.google.android.gms.common.data;
 
+import android.annotation.SuppressLint;
+import android.database.AbstractWindowedCursor;
 import android.database.Cursor;
 import android.database.CursorWindow;
+import android.os.Build;
 import android.os.Bundle;
 
 import org.microg.safeparcel.AutoSafeParcelable;
@@ -39,6 +42,37 @@ public class DataHolder extends AutoSafeParcelable {
         this.metadata = metadata;
     }
 
+    protected static final int FIELD_TYPE_BLOB = 4;
+    protected static final int FIELD_TYPE_FLOAT = 2;
+    protected static final int FIELD_TYPE_INTEGER = 1;
+    protected static final int FIELD_TYPE_NULL = 0;
+    protected static final int FIELD_TYPE_STRING = 3;
+
+    @SuppressLint("NewApi")
+    static int getCursorType(Cursor cursor, int i) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+            return cursor.getType(i);
+        }
+        if (cursor instanceof AbstractWindowedCursor) {
+            CursorWindow cursorWindow = ((AbstractWindowedCursor)cursor).getWindow();
+            int pos = cursor.getPosition();
+            int type = -1;
+            if (cursorWindow.isNull(pos, i)) {
+                type = FIELD_TYPE_NULL;
+            } else if (cursorWindow.isLong(pos, i)) {
+                type = FIELD_TYPE_INTEGER;
+            } else if (cursorWindow.isFloat(pos, i)) {
+                type = FIELD_TYPE_FLOAT;
+            } else if (cursorWindow.isString(pos, i)) {
+                type = FIELD_TYPE_STRING;
+            } else if (cursorWindow.isBlob(pos, i)) {
+                type = FIELD_TYPE_BLOB;
+            }
+
+            return type;
+        }
+        throw new RuntimeException("Unsupported cursor on this platform!");
+    }
 
     public static DataHolder fromCursor(Cursor cursor, int statusCode, Bundle metadata) {
         List<CursorWindow> windows = new ArrayList<>();
@@ -54,20 +88,20 @@ public class DataHolder extends AutoSafeParcelable {
                 row = 0;
             }
             for (int i = 0; i < cursor.getColumnCount(); i++) {
-                switch (cursor.getType(i)) {
-                    case Cursor.FIELD_TYPE_NULL:
+                switch (getCursorType(cursor, i)) {
+                    case FIELD_TYPE_NULL:
                         cursorWindow.putNull(row, i);
                         break;
-                    case Cursor.FIELD_TYPE_BLOB:
+                    case FIELD_TYPE_BLOB:
                         cursorWindow.putBlob(cursor.getBlob(i), row, i);
                         break;
-                    case Cursor.FIELD_TYPE_FLOAT:
+                    case FIELD_TYPE_FLOAT:
                         cursorWindow.putDouble(cursor.getDouble(i), row, i);
                         break;
-                    case Cursor.FIELD_TYPE_INTEGER:
+                    case FIELD_TYPE_INTEGER:
                         cursorWindow.putLong(cursor.getLong(i), row, i);
                         break;
-                    case Cursor.FIELD_TYPE_STRING:
+                    case FIELD_TYPE_STRING:
                         cursorWindow.putString(cursor.getString(i), row, i);
                         break;
                 }
diff --git a/src/com/google/android/gms/common/server/FavaDiagnosticsEntity.java b/src/main/java/com/google/android/gms/common/server/FavaDiagnosticsEntity.java
similarity index 100%
rename from src/com/google/android/gms/common/server/FavaDiagnosticsEntity.java
rename to src/main/java/com/google/android/gms/common/server/FavaDiagnosticsEntity.java
diff --git a/src/com/google/android/gms/drive/metadata/internal/MetadataBundle.java b/src/main/java/com/google/android/gms/drive/metadata/internal/MetadataBundle.java
similarity index 100%
rename from src/com/google/android/gms/drive/metadata/internal/MetadataBundle.java
rename to src/main/java/com/google/android/gms/drive/metadata/internal/MetadataBundle.java
diff --git a/src/com/google/android/gms/dynamic/ObjectWrapper.java b/src/main/java/com/google/android/gms/dynamic/ObjectWrapper.java
similarity index 100%
rename from src/com/google/android/gms/dynamic/ObjectWrapper.java
rename to src/main/java/com/google/android/gms/dynamic/ObjectWrapper.java
diff --git a/src/com/google/android/gms/fitness/data/DataPoint.java b/src/main/java/com/google/android/gms/fitness/data/DataPoint.java
similarity index 100%
rename from src/com/google/android/gms/fitness/data/DataPoint.java
rename to src/main/java/com/google/android/gms/fitness/data/DataPoint.java
diff --git a/src/com/google/android/gms/fitness/data/Device.java b/src/main/java/com/google/android/gms/fitness/data/Device.java
similarity index 100%
rename from src/com/google/android/gms/fitness/data/Device.java
rename to src/main/java/com/google/android/gms/fitness/data/Device.java
diff --git a/src/com/google/android/gms/fitness/data/Field.java b/src/main/java/com/google/android/gms/fitness/data/Field.java
similarity index 100%
rename from src/com/google/android/gms/fitness/data/Field.java
rename to src/main/java/com/google/android/gms/fitness/data/Field.java
diff --git a/src/com/google/android/gms/fitness/data/Value.java b/src/main/java/com/google/android/gms/fitness/data/Value.java
similarity index 100%
rename from src/com/google/android/gms/fitness/data/Value.java
rename to src/main/java/com/google/android/gms/fitness/data/Value.java
diff --git a/src/com/google/android/gms/identity/accounts/api/AccountData.java b/src/main/java/com/google/android/gms/identity/accounts/api/AccountData.java
similarity index 100%
rename from src/com/google/android/gms/identity/accounts/api/AccountData.java
rename to src/main/java/com/google/android/gms/identity/accounts/api/AccountData.java
diff --git a/src/com/google/android/gms/identity/intents/model/CountrySpecification.java b/src/main/java/com/google/android/gms/identity/intents/model/CountrySpecification.java
similarity index 100%
rename from src/com/google/android/gms/identity/intents/model/CountrySpecification.java
rename to src/main/java/com/google/android/gms/identity/intents/model/CountrySpecification.java
diff --git a/src/com/google/android/gms/identity/intents/model/UserAddress.java b/src/main/java/com/google/android/gms/identity/intents/model/UserAddress.java
similarity index 100%
rename from src/com/google/android/gms/identity/intents/model/UserAddress.java
rename to src/main/java/com/google/android/gms/identity/intents/model/UserAddress.java
diff --git a/src/com/google/android/gms/location/Geofence.java b/src/main/java/com/google/android/gms/location/Geofence.java
similarity index 100%
rename from src/com/google/android/gms/location/Geofence.java
rename to src/main/java/com/google/android/gms/location/Geofence.java
diff --git a/src/com/google/android/gms/location/GeofencingRequest.java b/src/main/java/com/google/android/gms/location/GeofencingRequest.java
similarity index 100%
rename from src/com/google/android/gms/location/GeofencingRequest.java
rename to src/main/java/com/google/android/gms/location/GeofencingRequest.java
diff --git a/src/com/google/android/gms/location/LocationRequest.java b/src/main/java/com/google/android/gms/location/LocationRequest.java
similarity index 100%
rename from src/com/google/android/gms/location/LocationRequest.java
rename to src/main/java/com/google/android/gms/location/LocationRequest.java
diff --git a/src/com/google/android/gms/location/LocationStatus.java b/src/main/java/com/google/android/gms/location/LocationStatus.java
similarity index 100%
rename from src/com/google/android/gms/location/LocationStatus.java
rename to src/main/java/com/google/android/gms/location/LocationStatus.java
diff --git a/src/com/google/android/gms/location/internal/ClientIdentity.java b/src/main/java/com/google/android/gms/location/internal/ClientIdentity.java
similarity index 100%
rename from src/com/google/android/gms/location/internal/ClientIdentity.java
rename to src/main/java/com/google/android/gms/location/internal/ClientIdentity.java
diff --git a/src/com/google/android/gms/location/internal/LocationRequestInternal.java b/src/main/java/com/google/android/gms/location/internal/LocationRequestInternal.java
similarity index 100%
rename from src/com/google/android/gms/location/internal/LocationRequestInternal.java
rename to src/main/java/com/google/android/gms/location/internal/LocationRequestInternal.java
diff --git a/src/com/google/android/gms/location/places/AutocompleteFilter.java b/src/main/java/com/google/android/gms/location/places/AutocompleteFilter.java
similarity index 100%
rename from src/com/google/android/gms/location/places/AutocompleteFilter.java
rename to src/main/java/com/google/android/gms/location/places/AutocompleteFilter.java
diff --git a/src/com/google/android/gms/location/places/NearbyAlertRequest.java b/src/main/java/com/google/android/gms/location/places/NearbyAlertRequest.java
similarity index 100%
rename from src/com/google/android/gms/location/places/NearbyAlertRequest.java
rename to src/main/java/com/google/android/gms/location/places/NearbyAlertRequest.java
diff --git a/src/com/google/android/gms/location/places/PlaceFilter.java b/src/main/java/com/google/android/gms/location/places/PlaceFilter.java
similarity index 100%
rename from src/com/google/android/gms/location/places/PlaceFilter.java
rename to src/main/java/com/google/android/gms/location/places/PlaceFilter.java
diff --git a/src/com/google/android/gms/location/places/PlaceReport.java b/src/main/java/com/google/android/gms/location/places/PlaceReport.java
similarity index 100%
rename from src/com/google/android/gms/location/places/PlaceReport.java
rename to src/main/java/com/google/android/gms/location/places/PlaceReport.java
diff --git a/src/com/google/android/gms/location/places/PlaceRequest.java b/src/main/java/com/google/android/gms/location/places/PlaceRequest.java
similarity index 100%
rename from src/com/google/android/gms/location/places/PlaceRequest.java
rename to src/main/java/com/google/android/gms/location/places/PlaceRequest.java
diff --git a/src/com/google/android/gms/location/places/UserAddedPlace.java b/src/main/java/com/google/android/gms/location/places/UserAddedPlace.java
similarity index 100%
rename from src/com/google/android/gms/location/places/UserAddedPlace.java
rename to src/main/java/com/google/android/gms/location/places/UserAddedPlace.java
diff --git a/src/com/google/android/gms/location/places/UserDataType.java b/src/main/java/com/google/android/gms/location/places/UserDataType.java
similarity index 100%
rename from src/com/google/android/gms/location/places/UserDataType.java
rename to src/main/java/com/google/android/gms/location/places/UserDataType.java
diff --git a/src/com/google/android/gms/location/places/internal/PlacesParams.java b/src/main/java/com/google/android/gms/location/places/internal/PlacesParams.java
similarity index 100%
rename from src/com/google/android/gms/location/places/internal/PlacesParams.java
rename to src/main/java/com/google/android/gms/location/places/internal/PlacesParams.java
diff --git a/src/com/google/android/gms/location/reporting/ReportingState.java b/src/main/java/com/google/android/gms/location/reporting/ReportingState.java
similarity index 100%
rename from src/com/google/android/gms/location/reporting/ReportingState.java
rename to src/main/java/com/google/android/gms/location/reporting/ReportingState.java
diff --git a/src/com/google/android/gms/maps/GoogleMapOptions.java b/src/main/java/com/google/android/gms/maps/GoogleMapOptions.java
similarity index 100%
rename from src/com/google/android/gms/maps/GoogleMapOptions.java
rename to src/main/java/com/google/android/gms/maps/GoogleMapOptions.java
diff --git a/src/com/google/android/gms/maps/StreetViewPanoramaOptions.java b/src/main/java/com/google/android/gms/maps/StreetViewPanoramaOptions.java
similarity index 100%
rename from src/com/google/android/gms/maps/StreetViewPanoramaOptions.java
rename to src/main/java/com/google/android/gms/maps/StreetViewPanoramaOptions.java
diff --git a/src/com/google/android/gms/maps/internal/Point.java b/src/main/java/com/google/android/gms/maps/internal/Point.java
similarity index 100%
rename from src/com/google/android/gms/maps/internal/Point.java
rename to src/main/java/com/google/android/gms/maps/internal/Point.java
diff --git a/src/com/google/android/gms/maps/model/BitmapDescriptor.java b/src/main/java/com/google/android/gms/maps/model/BitmapDescriptor.java
similarity index 100%
rename from src/com/google/android/gms/maps/model/BitmapDescriptor.java
rename to src/main/java/com/google/android/gms/maps/model/BitmapDescriptor.java
diff --git a/src/com/google/android/gms/maps/model/CameraPosition.java b/src/main/java/com/google/android/gms/maps/model/CameraPosition.java
similarity index 100%
rename from src/com/google/android/gms/maps/model/CameraPosition.java
rename to src/main/java/com/google/android/gms/maps/model/CameraPosition.java
diff --git a/src/com/google/android/gms/maps/model/CircleOptions.java b/src/main/java/com/google/android/gms/maps/model/CircleOptions.java
similarity index 100%
rename from src/com/google/android/gms/maps/model/CircleOptions.java
rename to src/main/java/com/google/android/gms/maps/model/CircleOptions.java
diff --git a/src/com/google/android/gms/maps/model/GroundOverlayOptions.java b/src/main/java/com/google/android/gms/maps/model/GroundOverlayOptions.java
similarity index 100%
rename from src/com/google/android/gms/maps/model/GroundOverlayOptions.java
rename to src/main/java/com/google/android/gms/maps/model/GroundOverlayOptions.java
diff --git a/src/com/google/android/gms/maps/model/LatLng.java b/src/main/java/com/google/android/gms/maps/model/LatLng.java
similarity index 100%
rename from src/com/google/android/gms/maps/model/LatLng.java
rename to src/main/java/com/google/android/gms/maps/model/LatLng.java
diff --git a/src/com/google/android/gms/maps/model/LatLngBounds.java b/src/main/java/com/google/android/gms/maps/model/LatLngBounds.java
similarity index 100%
rename from src/com/google/android/gms/maps/model/LatLngBounds.java
rename to src/main/java/com/google/android/gms/maps/model/LatLngBounds.java
diff --git a/src/com/google/android/gms/maps/model/MarkerOptions.java b/src/main/java/com/google/android/gms/maps/model/MarkerOptions.java
similarity index 100%
rename from src/com/google/android/gms/maps/model/MarkerOptions.java
rename to src/main/java/com/google/android/gms/maps/model/MarkerOptions.java
diff --git a/src/com/google/android/gms/maps/model/PolygonOptions.java b/src/main/java/com/google/android/gms/maps/model/PolygonOptions.java
similarity index 100%
rename from src/com/google/android/gms/maps/model/PolygonOptions.java
rename to src/main/java/com/google/android/gms/maps/model/PolygonOptions.java
diff --git a/src/com/google/android/gms/maps/model/PolylineOptions.java b/src/main/java/com/google/android/gms/maps/model/PolylineOptions.java
similarity index 100%
rename from src/com/google/android/gms/maps/model/PolylineOptions.java
rename to src/main/java/com/google/android/gms/maps/model/PolylineOptions.java
diff --git a/src/com/google/android/gms/maps/model/StreetViewPanoramaCamera.java b/src/main/java/com/google/android/gms/maps/model/StreetViewPanoramaCamera.java
similarity index 100%
rename from src/com/google/android/gms/maps/model/StreetViewPanoramaCamera.java
rename to src/main/java/com/google/android/gms/maps/model/StreetViewPanoramaCamera.java
diff --git a/src/com/google/android/gms/maps/model/StreetViewPanoramaLink.java b/src/main/java/com/google/android/gms/maps/model/StreetViewPanoramaLink.java
similarity index 100%
rename from src/com/google/android/gms/maps/model/StreetViewPanoramaLink.java
rename to src/main/java/com/google/android/gms/maps/model/StreetViewPanoramaLink.java
diff --git a/src/com/google/android/gms/maps/model/StreetViewPanoramaLocation.java b/src/main/java/com/google/android/gms/maps/model/StreetViewPanoramaLocation.java
similarity index 100%
rename from src/com/google/android/gms/maps/model/StreetViewPanoramaLocation.java
rename to src/main/java/com/google/android/gms/maps/model/StreetViewPanoramaLocation.java
diff --git a/src/com/google/android/gms/maps/model/StreetViewPanoramaOrientation.java b/src/main/java/com/google/android/gms/maps/model/StreetViewPanoramaOrientation.java
similarity index 100%
rename from src/com/google/android/gms/maps/model/StreetViewPanoramaOrientation.java
rename to src/main/java/com/google/android/gms/maps/model/StreetViewPanoramaOrientation.java
diff --git a/src/com/google/android/gms/maps/model/Tile.java b/src/main/java/com/google/android/gms/maps/model/Tile.java
similarity index 100%
rename from src/com/google/android/gms/maps/model/Tile.java
rename to src/main/java/com/google/android/gms/maps/model/Tile.java
diff --git a/src/com/google/android/gms/maps/model/TileOverlayOptions.java b/src/main/java/com/google/android/gms/maps/model/TileOverlayOptions.java
similarity index 100%
rename from src/com/google/android/gms/maps/model/TileOverlayOptions.java
rename to src/main/java/com/google/android/gms/maps/model/TileOverlayOptions.java
diff --git a/src/com/google/android/gms/maps/model/TileProvider.java b/src/main/java/com/google/android/gms/maps/model/TileProvider.java
similarity index 100%
rename from src/com/google/android/gms/maps/model/TileProvider.java
rename to src/main/java/com/google/android/gms/maps/model/TileProvider.java
diff --git a/src/com/google/android/gms/maps/model/VisibleRegion.java b/src/main/java/com/google/android/gms/maps/model/VisibleRegion.java
similarity index 100%
rename from src/com/google/android/gms/maps/model/VisibleRegion.java
rename to src/main/java/com/google/android/gms/maps/model/VisibleRegion.java
diff --git a/src/com/google/android/gms/maps/model/package-info.java b/src/main/java/com/google/android/gms/maps/model/package-info.java
similarity index 100%
rename from src/com/google/android/gms/maps/model/package-info.java
rename to src/main/java/com/google/android/gms/maps/model/package-info.java
diff --git a/src/com/google/android/gms/people/model/AccountMetadata.java b/src/main/java/com/google/android/gms/people/model/AccountMetadata.java
similarity index 100%
rename from src/com/google/android/gms/people/model/AccountMetadata.java
rename to src/main/java/com/google/android/gms/people/model/AccountMetadata.java
diff --git a/src/com/google/android/gms/plus/internal/PlusCommonExtras.java b/src/main/java/com/google/android/gms/plus/internal/PlusCommonExtras.java
similarity index 100%
rename from src/com/google/android/gms/plus/internal/PlusCommonExtras.java
rename to src/main/java/com/google/android/gms/plus/internal/PlusCommonExtras.java
diff --git a/src/com/google/android/gms/plus/internal/PlusSession.java b/src/main/java/com/google/android/gms/plus/internal/PlusSession.java
similarity index 100%
rename from src/com/google/android/gms/plus/internal/PlusSession.java
rename to src/main/java/com/google/android/gms/plus/internal/PlusSession.java
diff --git a/src/com/google/android/gms/plus/internal/model/smart_profile/CardsRequest.java b/src/main/java/com/google/android/gms/plus/internal/model/smart_profile/CardsRequest.java
similarity index 100%
rename from src/com/google/android/gms/plus/internal/model/smart_profile/CardsRequest.java
rename to src/main/java/com/google/android/gms/plus/internal/model/smart_profile/CardsRequest.java
diff --git a/src/com/google/android/gms/plus/internal/model/smart_profile/CardsResponse.java b/src/main/java/com/google/android/gms/plus/internal/model/smart_profile/CardsResponse.java
similarity index 100%
rename from src/com/google/android/gms/plus/internal/model/smart_profile/CardsResponse.java
rename to src/main/java/com/google/android/gms/plus/internal/model/smart_profile/CardsResponse.java
diff --git a/src/com/google/android/gms/plus/internal/model/smart_profile/PeopleForProfilesRequest.java b/src/main/java/com/google/android/gms/plus/internal/model/smart_profile/PeopleForProfilesRequest.java
similarity index 100%
rename from src/com/google/android/gms/plus/internal/model/smart_profile/PeopleForProfilesRequest.java
rename to src/main/java/com/google/android/gms/plus/internal/model/smart_profile/PeopleForProfilesRequest.java
diff --git a/src/com/google/android/gms/plus/internal/model/smart_profile/PeopleForProfilesResponse.java b/src/main/java/com/google/android/gms/plus/internal/model/smart_profile/PeopleForProfilesResponse.java
similarity index 100%
rename from src/com/google/android/gms/plus/internal/model/smart_profile/PeopleForProfilesResponse.java
rename to src/main/java/com/google/android/gms/plus/internal/model/smart_profile/PeopleForProfilesResponse.java
diff --git a/src/com/google/android/gms/plus/model/posts/Comment.java b/src/main/java/com/google/android/gms/plus/model/posts/Comment.java
similarity index 100%
rename from src/com/google/android/gms/plus/model/posts/Comment.java
rename to src/main/java/com/google/android/gms/plus/model/posts/Comment.java
diff --git a/src/com/google/android/gms/plus/model/posts/Post.java b/src/main/java/com/google/android/gms/plus/model/posts/Post.java
similarity index 100%
rename from src/com/google/android/gms/plus/model/posts/Post.java
rename to src/main/java/com/google/android/gms/plus/model/posts/Post.java
diff --git a/src/com/google/android/gms/plus/model/posts/Settings.java b/src/main/java/com/google/android/gms/plus/model/posts/Settings.java
similarity index 100%
rename from src/com/google/android/gms/plus/model/posts/Settings.java
rename to src/main/java/com/google/android/gms/plus/model/posts/Settings.java
diff --git a/src/com/google/android/gms/wearable/ConnectionConfiguration.java b/src/main/java/com/google/android/gms/wearable/ConnectionConfiguration.java
similarity index 100%
rename from src/com/google/android/gms/wearable/ConnectionConfiguration.java
rename to src/main/java/com/google/android/gms/wearable/ConnectionConfiguration.java
diff --git a/src/com/google/android/gms/wearable/Node.java b/src/main/java/com/google/android/gms/wearable/Node.java
similarity index 100%
rename from src/com/google/android/gms/wearable/Node.java
rename to src/main/java/com/google/android/gms/wearable/Node.java
diff --git a/src/com/google/android/gms/wearable/WearableStatusCodes.java b/src/main/java/com/google/android/gms/wearable/WearableStatusCodes.java
similarity index 100%
rename from src/com/google/android/gms/wearable/WearableStatusCodes.java
rename to src/main/java/com/google/android/gms/wearable/WearableStatusCodes.java
diff --git a/src/com/google/android/gms/wearable/internal/NodeParcelable.java b/src/main/java/com/google/android/gms/wearable/internal/NodeParcelable.java
similarity index 100%
rename from src/com/google/android/gms/wearable/internal/NodeParcelable.java
rename to src/main/java/com/google/android/gms/wearable/internal/NodeParcelable.java
diff --git a/src/org/microg/gms/common/Constants.java b/src/main/java/org/microg/gms/common/Constants.java
similarity index 100%
rename from src/org/microg/gms/common/Constants.java
rename to src/main/java/org/microg/gms/common/Constants.java
diff --git a/src/org/microg/gms/common/PublicApi.java b/src/main/java/org/microg/gms/common/PublicApi.java
similarity index 100%
rename from src/org/microg/gms/common/PublicApi.java
rename to src/main/java/org/microg/gms/common/PublicApi.java