diff --git a/src/com/google/android/gms/location/internal/ILocationListener.aidl b/src/com/google/android/gms/location/ILocationListener.aidl
similarity index 70%
rename from src/com/google/android/gms/location/internal/ILocationListener.aidl
rename to src/com/google/android/gms/location/ILocationListener.aidl
index 055d6fdf..323f9059 100644
--- a/src/com/google/android/gms/location/internal/ILocationListener.aidl
+++ b/src/com/google/android/gms/location/ILocationListener.aidl
@@ -1,4 +1,4 @@
-package com.google.android.gms.location.internal;
+package com.google.android.gms.location;
 
 import android.location.Location;
 
diff --git a/src/com/google/android/gms/location/internal/IGoogleLocationManagerService.aidl b/src/com/google/android/gms/location/internal/IGoogleLocationManagerService.aidl
index 295de798..a60350fd 100644
--- a/src/com/google/android/gms/location/internal/IGoogleLocationManagerService.aidl
+++ b/src/com/google/android/gms/location/internal/IGoogleLocationManagerService.aidl
@@ -15,7 +15,7 @@ import com.google.android.gms.location.GeofencingRequest;
 import com.google.android.gms.location.LocationRequest;
 import com.google.android.gms.location.LocationStatus;
 import com.google.android.gms.location.internal.IGeofencerCallbacks;
-import com.google.android.gms.location.internal.ILocationListener;
+import com.google.android.gms.location.ILocationListener;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.LatLngBounds;
 
@@ -29,32 +29,32 @@ interface IGoogleLocationManagerService {
     Location getLastLocation() = 6;
     void requestLocationUpdatesWithListener(in LocationRequest request, ILocationListener listener) = 7;
     void requestLocationUpdatesWithIntent(in LocationRequest request, in PendingIntent callbackIntent) = 8;
-    void removeLocationUpdatesWithListener(ILocationListener listener) = 9; // TODO
-    void removeLocationUpdatesWithIntent(in PendingIntent callbackIntent) = 11;
-    void setMockMode(boolean mockMode) = 12;
-    void setMockLocation(in Location mockLocation) = 13;
-    void iglms14(in LatLngBounds var1, int var2, in PlaceFilter var3, in PlacesParams var4, IPlacesCallbacks var5) = 14;
-    void iglms15(String var1, in PlacesParams var2, IPlacesCallbacks var3) = 15;
-    void iglms16(in LatLng var1, in PlaceFilter var2, in PlacesParams var3, IPlacesCallbacks var4) = 16;
-    void iglms17(in PlaceFilter var1, in PlacesParams var2, IPlacesCallbacks var3) = 17;
-    void iglms18(in PlaceRequest var1, in PlacesParams var2, in PendingIntent var3) = 18;
-    void iglms19(in PlacesParams var1, in PendingIntent var2) = 19;
-    void requestLocationUpdates(in LocationRequest request, ILocationListener listener, String packageName) = 20;
-    Location getLastLocationWithPackage(String packageName) = 21;
-    void iglms25(in PlaceReport var1, in PlacesParams var2) = 25;
-    void iglms26(in Location var1, int var2) = 26;
-    LocationStatus iglms34(String var1) = 34;
-    void iglms42(String var1, in PlacesParams var2, IPlacesCallbacks var3) = 42;
-    void iglms46(in UserAddedPlace var1, in PlacesParams var2, IPlacesCallbacks var3) = 46;
-    void iglms47(in LatLngBounds var1, int var2, String var3, in PlaceFilter var4, in PlacesParams var5, IPlacesCallbacks var6) = 47;
-    void iglms48(in NearbyAlertRequest var1, in PlacesParams var2, in PendingIntent var3) = 48;
-    void iglms49(in PlacesParams var1, in PendingIntent var2) = 49;
-    void iglms50(in UserDataType var1, in LatLngBounds var2, in List var3, in PlacesParams var4, IPlacesCallbacks var5) = 50;
-    IBinder iglms51() = 51;
-    void requestLocationUpdatesInternalWithListener(in LocationRequestInternal request, ILocationListener listener) = 52;
-    void requestLocationUpdatesInternalWithIntent(in LocationRequestInternal request, in PendingIntent callbackIntent) = 53;
-    IBinder iglms54() = 54;
-    void iglms55(String var1, in LatLngBounds var2, in AutocompleteFilter var3, in PlacesParams var4, IPlacesCallbacks var5) = 55;
-    void addGeofences(in GeofencingRequest geofencingRequest, in PendingIntent pendingIntent, IGeofencerCallbacks callbacks) = 57;
-    void iglms58(in List var1, in PlacesParams var2, IPlacesCallbacks var3) = 58;
+    void removeLocationUpdatesWithListener(ILocationListener listener) = 9;
+    void removeLocationUpdatesWithIntent(in PendingIntent callbackIntent) = 10;
+    void setMockMode(boolean mockMode) = 11;
+    void setMockLocation(in Location mockLocation) = 12;
+    void iglms14(in LatLngBounds var1, int var2, in PlaceFilter var3, in PlacesParams var4, IPlacesCallbacks var5) = 13;
+    void iglms15(String var1, in PlacesParams var2, IPlacesCallbacks var3) = 14;
+    void iglms16(in LatLng var1, in PlaceFilter var2, in PlacesParams var3, IPlacesCallbacks var4) = 15;
+    void iglms17(in PlaceFilter var1, in PlacesParams var2, IPlacesCallbacks var3) = 16;
+    void iglms18(in PlaceRequest var1, in PlacesParams var2, in PendingIntent var3) = 17;
+    void iglms19(in PlacesParams var1, in PendingIntent var2) = 18;
+    void requestLocationUpdatesWithPackage(in LocationRequest request, ILocationListener listener, String packageName) = 19;
+    Location getLastLocationWithPackage(String packageName) = 20;
+    void iglms25(in PlaceReport var1, in PlacesParams var2) = 24;
+    void iglms26(in Location var1, int var2) = 25;
+    LocationStatus iglms34(String var1) = 33;
+    void iglms42(String var1, in PlacesParams var2, IPlacesCallbacks var3) = 41;
+    void iglms46(in UserAddedPlace var1, in PlacesParams var2, IPlacesCallbacks var3) = 45;
+    void iglms47(in LatLngBounds var1, int var2, String var3, in PlaceFilter var4, in PlacesParams var5, IPlacesCallbacks var6) = 46;
+    void iglms48(in NearbyAlertRequest var1, in PlacesParams var2, in PendingIntent var3) = 47;
+    void iglms49(in PlacesParams var1, in PendingIntent var2) = 48;
+    void iglms50(in UserDataType var1, in LatLngBounds var2, in List var3, in PlacesParams var4, IPlacesCallbacks var5) = 49;
+    IBinder iglms51() = 50;
+    void requestLocationUpdatesInternalWithListener(in LocationRequestInternal request, ILocationListener listener) = 51;
+    void requestLocationUpdatesInternalWithIntent(in LocationRequestInternal request, in PendingIntent callbackIntent) = 52;
+    IBinder iglms54() = 53;
+    void iglms55(String var1, in LatLngBounds var2, in AutocompleteFilter var3, in PlacesParams var4, IPlacesCallbacks var5) = 54;
+    void addGeofences(in GeofencingRequest geofencingRequest, in PendingIntent pendingIntent, IGeofencerCallbacks callbacks) = 56;
+    void iglms58(in List var1, in PlacesParams var2, IPlacesCallbacks var3) = 57;
 }