diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1b9d6274..39f687cb 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="org.microg.gms.api">
-<!-- This is not needed, it's just here to stop build systems from complaining -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="org.microg.gms.api">
+
+    <uses-sdk android:minSdkVersion="9"/>
 </manifest>
diff --git a/src/com/google/android/gms/common/api/CommonStatusCodes.java b/src/com/google/android/gms/common/api/CommonStatusCodes.java
index c0c1beb8..402d501e 100644
--- a/src/com/google/android/gms/common/api/CommonStatusCodes.java
+++ b/src/com/google/android/gms/common/api/CommonStatusCodes.java
@@ -16,7 +16,7 @@
 
 package com.google.android.gms.common.api;
 
-import org.microg.gms.PublicApi;
+import org.microg.gms.common.PublicApi;
 
 @PublicApi
 public class CommonStatusCodes {
diff --git a/src/com/google/android/gms/common/api/Result.java b/src/com/google/android/gms/common/api/Result.java
index e1bf524c..394234d0 100644
--- a/src/com/google/android/gms/common/api/Result.java
+++ b/src/com/google/android/gms/common/api/Result.java
@@ -1,6 +1,6 @@
 package com.google.android.gms.common.api;
 
-import org.microg.gms.PublicApi;
+import org.microg.gms.common.PublicApi;
 
 /**
  * Represents the final result of invoking an API method in Google Play Services.
diff --git a/src/com/google/android/gms/common/api/Scope.java b/src/com/google/android/gms/common/api/Scope.java
index f1ed8f9d..47c05291 100644
--- a/src/com/google/android/gms/common/api/Scope.java
+++ b/src/com/google/android/gms/common/api/Scope.java
@@ -1,6 +1,6 @@
 package com.google.android.gms.common.api;
 
-import org.microg.gms.PublicApi;
+import org.microg.gms.common.PublicApi;
 import org.microg.safeparcel.AutoSafeParcelable;
 import org.microg.safeparcel.SafeParceled;
 
diff --git a/src/com/google/android/gms/common/api/Status.java b/src/com/google/android/gms/common/api/Status.java
index eadbefbb..52e2cf7f 100644
--- a/src/com/google/android/gms/common/api/Status.java
+++ b/src/com/google/android/gms/common/api/Status.java
@@ -2,7 +2,7 @@ package com.google.android.gms.common.api;
 
 import android.app.PendingIntent;
 
-import org.microg.gms.PublicApi;
+import org.microg.gms.common.PublicApi;
 import org.microg.safeparcel.AutoSafeParcelable;
 
 /**
diff --git a/src/com/google/android/gms/maps/model/BitmapDescriptor.java b/src/com/google/android/gms/maps/model/BitmapDescriptor.java
index 5a8b3088..9b45597b 100644
--- a/src/com/google/android/gms/maps/model/BitmapDescriptor.java
+++ b/src/com/google/android/gms/maps/model/BitmapDescriptor.java
@@ -18,7 +18,7 @@ package com.google.android.gms.maps.model;
 
 import com.google.android.gms.dynamic.IObjectWrapper;
 
-import org.microg.gms.PublicApi;
+import org.microg.gms.common.PublicApi;
 
 /**
  * Defines an image. For a marker, it can be used to set the image of the marker icon. For a ground
diff --git a/src/com/google/android/gms/maps/model/CameraPosition.java b/src/com/google/android/gms/maps/model/CameraPosition.java
index cff10680..86c2b255 100644
--- a/src/com/google/android/gms/maps/model/CameraPosition.java
+++ b/src/com/google/android/gms/maps/model/CameraPosition.java
@@ -19,7 +19,7 @@ package com.google.android.gms.maps.model;
 import android.content.Context;
 import android.util.AttributeSet;
 
-import org.microg.gms.PublicApi;
+import org.microg.gms.common.PublicApi;
 import org.microg.safeparcel.AutoSafeParcelable;
 import org.microg.safeparcel.SafeParceled;
 
diff --git a/src/com/google/android/gms/maps/model/CircleOptions.java b/src/com/google/android/gms/maps/model/CircleOptions.java
index eb3e2561..0629d6fa 100644
--- a/src/com/google/android/gms/maps/model/CircleOptions.java
+++ b/src/com/google/android/gms/maps/model/CircleOptions.java
@@ -18,7 +18,7 @@ package com.google.android.gms.maps.model;
 
 import android.graphics.Color;
 
-import org.microg.gms.PublicApi;
+import org.microg.gms.common.PublicApi;
 import org.microg.safeparcel.AutoSafeParcelable;
 import org.microg.safeparcel.SafeParceled;
 
diff --git a/src/com/google/android/gms/maps/model/GroundOverlayOptions.java b/src/com/google/android/gms/maps/model/GroundOverlayOptions.java
index 25c024d4..191afda1 100644
--- a/src/com/google/android/gms/maps/model/GroundOverlayOptions.java
+++ b/src/com/google/android/gms/maps/model/GroundOverlayOptions.java
@@ -19,7 +19,7 @@ package com.google.android.gms.maps.model;
 import android.os.IBinder;
 import com.google.android.gms.dynamic.ObjectWrapper;
 
-import org.microg.gms.PublicApi;
+import org.microg.gms.common.PublicApi;
 import org.microg.safeparcel.AutoSafeParcelable;
 import org.microg.safeparcel.SafeParceled;
 
diff --git a/src/com/google/android/gms/maps/model/LatLng.java b/src/com/google/android/gms/maps/model/LatLng.java
index f1eb4b12..356e04d6 100644
--- a/src/com/google/android/gms/maps/model/LatLng.java
+++ b/src/com/google/android/gms/maps/model/LatLng.java
@@ -16,7 +16,7 @@
 
 package com.google.android.gms.maps.model;
 
-import org.microg.gms.PublicApi;
+import org.microg.gms.common.PublicApi;
 import org.microg.safeparcel.AutoSafeParcelable;
 import org.microg.safeparcel.SafeParceled;
 
diff --git a/src/com/google/android/gms/maps/model/LatLngBounds.java b/src/com/google/android/gms/maps/model/LatLngBounds.java
index 1ef2c39c..eae9cb2d 100644
--- a/src/com/google/android/gms/maps/model/LatLngBounds.java
+++ b/src/com/google/android/gms/maps/model/LatLngBounds.java
@@ -16,7 +16,7 @@
 
 package com.google.android.gms.maps.model;
 
-import org.microg.gms.PublicApi;
+import org.microg.gms.common.PublicApi;
 import org.microg.safeparcel.AutoSafeParcelable;
 import org.microg.safeparcel.SafeParceled;
 
diff --git a/src/com/google/android/gms/maps/model/MarkerOptions.java b/src/com/google/android/gms/maps/model/MarkerOptions.java
index 34ddaaf5..bb289362 100644
--- a/src/com/google/android/gms/maps/model/MarkerOptions.java
+++ b/src/com/google/android/gms/maps/model/MarkerOptions.java
@@ -19,7 +19,7 @@ package com.google.android.gms.maps.model;
 import android.os.IBinder;
 import com.google.android.gms.dynamic.ObjectWrapper;
 
-import org.microg.gms.PublicApi;
+import org.microg.gms.common.PublicApi;
 import org.microg.safeparcel.AutoSafeParcelable;
 import org.microg.safeparcel.SafeParceled;
 
diff --git a/src/com/google/android/gms/maps/model/PolygonOptions.java b/src/com/google/android/gms/maps/model/PolygonOptions.java
index 162ae2fa..0b5aaa59 100644
--- a/src/com/google/android/gms/maps/model/PolygonOptions.java
+++ b/src/com/google/android/gms/maps/model/PolygonOptions.java
@@ -16,7 +16,7 @@
 
 package com.google.android.gms.maps.model;
 
-import org.microg.gms.PublicApi;
+import org.microg.gms.common.PublicApi;
 import org.microg.safeparcel.AutoSafeParcelable;
 
 /**
diff --git a/src/com/google/android/gms/maps/model/PolylineOptions.java b/src/com/google/android/gms/maps/model/PolylineOptions.java
index 6a0b809e..ce34b343 100644
--- a/src/com/google/android/gms/maps/model/PolylineOptions.java
+++ b/src/com/google/android/gms/maps/model/PolylineOptions.java
@@ -16,7 +16,7 @@
 
 package com.google.android.gms.maps.model;
 
-import org.microg.gms.PublicApi;
+import org.microg.gms.common.PublicApi;
 import org.microg.safeparcel.AutoSafeParcelable;
 import org.microg.safeparcel.SafeParceled;
 
diff --git a/src/com/google/android/gms/maps/model/StreetViewPanoramaCamera.java b/src/com/google/android/gms/maps/model/StreetViewPanoramaCamera.java
index 1281fcbc..585fc072 100644
--- a/src/com/google/android/gms/maps/model/StreetViewPanoramaCamera.java
+++ b/src/com/google/android/gms/maps/model/StreetViewPanoramaCamera.java
@@ -1,6 +1,6 @@
 package com.google.android.gms.maps.model;
 
-import org.microg.gms.PublicApi;
+import org.microg.gms.common.PublicApi;
 
 @PublicApi
 public class StreetViewPanoramaCamera {
diff --git a/src/com/google/android/gms/maps/model/StreetViewPanoramaLink.java b/src/com/google/android/gms/maps/model/StreetViewPanoramaLink.java
index 0b85a6e6..88cf0542 100644
--- a/src/com/google/android/gms/maps/model/StreetViewPanoramaLink.java
+++ b/src/com/google/android/gms/maps/model/StreetViewPanoramaLink.java
@@ -1,6 +1,6 @@
 package com.google.android.gms.maps.model;
 
-import org.microg.gms.PublicApi;
+import org.microg.gms.common.PublicApi;
 
 @PublicApi
 public class StreetViewPanoramaLink {
diff --git a/src/com/google/android/gms/maps/model/StreetViewPanoramaLocation.java b/src/com/google/android/gms/maps/model/StreetViewPanoramaLocation.java
index cfd3a29d..75422e12 100644
--- a/src/com/google/android/gms/maps/model/StreetViewPanoramaLocation.java
+++ b/src/com/google/android/gms/maps/model/StreetViewPanoramaLocation.java
@@ -1,6 +1,6 @@
 package com.google.android.gms.maps.model;
 
-import org.microg.gms.PublicApi;
+import org.microg.gms.common.PublicApi;
 
 @PublicApi
 public class StreetViewPanoramaLocation {
diff --git a/src/com/google/android/gms/maps/model/StreetViewPanoramaOrientation.java b/src/com/google/android/gms/maps/model/StreetViewPanoramaOrientation.java
index 32eec064..9b77f9b4 100644
--- a/src/com/google/android/gms/maps/model/StreetViewPanoramaOrientation.java
+++ b/src/com/google/android/gms/maps/model/StreetViewPanoramaOrientation.java
@@ -1,6 +1,6 @@
 package com.google.android.gms.maps.model;
 
-import org.microg.gms.PublicApi;
+import org.microg.gms.common.PublicApi;
 
 @PublicApi
 public class StreetViewPanoramaOrientation {
diff --git a/src/com/google/android/gms/maps/model/Tile.java b/src/com/google/android/gms/maps/model/Tile.java
index 3e5031c5..cf6f437a 100644
--- a/src/com/google/android/gms/maps/model/Tile.java
+++ b/src/com/google/android/gms/maps/model/Tile.java
@@ -1,6 +1,6 @@
 package com.google.android.gms.maps.model;
 
-import org.microg.gms.PublicApi;
+import org.microg.gms.common.PublicApi;
 import org.microg.safeparcel.AutoSafeParcelable;
 import org.microg.safeparcel.SafeParceled;
 
diff --git a/src/com/google/android/gms/maps/model/TileOverlayOptions.java b/src/com/google/android/gms/maps/model/TileOverlayOptions.java
index 55825613..85ab38f0 100644
--- a/src/com/google/android/gms/maps/model/TileOverlayOptions.java
+++ b/src/com/google/android/gms/maps/model/TileOverlayOptions.java
@@ -20,7 +20,7 @@ import android.os.IBinder;
 import android.os.RemoteException;
 import com.google.android.gms.maps.model.internal.ITileProviderDelegate;
 
-import org.microg.gms.PublicApi;
+import org.microg.gms.common.PublicApi;
 import org.microg.safeparcel.AutoSafeParcelable;
 import org.microg.safeparcel.SafeParceled;
 
diff --git a/src/com/google/android/gms/maps/model/VisibleRegion.java b/src/com/google/android/gms/maps/model/VisibleRegion.java
index 601f1509..ab0e20b7 100644
--- a/src/com/google/android/gms/maps/model/VisibleRegion.java
+++ b/src/com/google/android/gms/maps/model/VisibleRegion.java
@@ -16,7 +16,7 @@
 
 package com.google.android.gms.maps.model;
 
-import org.microg.gms.PublicApi;
+import org.microg.gms.common.PublicApi;
 import org.microg.safeparcel.AutoSafeParcelable;
 import org.microg.safeparcel.SafeParceled;
 
diff --git a/src/com/google/android/gms/wearable/Node.java b/src/com/google/android/gms/wearable/Node.java
index 9c7d5796..f308c611 100644
--- a/src/com/google/android/gms/wearable/Node.java
+++ b/src/com/google/android/gms/wearable/Node.java
@@ -16,7 +16,7 @@
 
 package com.google.android.gms.wearable;
 
-import org.microg.gms.PublicApi;
+import org.microg.gms.common.PublicApi;
 
 /**
  * Information about a particular node in the Android Wear network.
diff --git a/src/com/google/android/gms/wearable/WearableStatusCodes.java b/src/com/google/android/gms/wearable/WearableStatusCodes.java
index 46e4dbdd..13cc75d2 100644
--- a/src/com/google/android/gms/wearable/WearableStatusCodes.java
+++ b/src/com/google/android/gms/wearable/WearableStatusCodes.java
@@ -18,7 +18,7 @@ package com.google.android.gms.wearable;
 
 import com.google.android.gms.common.api.CommonStatusCodes;
 
-import org.microg.gms.PublicApi;
+import org.microg.gms.common.PublicApi;
 
 /**
  * Error codes for wearable API failures. These values may be returned by APIs to indicate the
diff --git a/src/org/microg/gms/Constants.java b/src/org/microg/gms/common/Constants.java
similarity index 97%
rename from src/org/microg/gms/Constants.java
rename to src/org/microg/gms/common/Constants.java
index 8e6c6844..1197f46a 100644
--- a/src/org/microg/gms/Constants.java
+++ b/src/org/microg/gms/common/Constants.java
@@ -1,4 +1,4 @@
-package org.microg.gms;
+package org.microg.gms.common;
 
 public class Constants {
     /**
diff --git a/src/org/microg/gms/PublicApi.java b/src/org/microg/gms/common/PublicApi.java
similarity index 97%
rename from src/org/microg/gms/PublicApi.java
rename to src/org/microg/gms/common/PublicApi.java
index 488f6c3a..45afeb22 100644
--- a/src/org/microg/gms/PublicApi.java
+++ b/src/org/microg/gms/common/PublicApi.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms;
+package org.microg.gms.common;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;