diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md
similarity index 98%
rename from packages/google_maps_flutter/CHANGELOG.md
rename to packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md
index 9e87ada..713a7cb 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.23+1
+
+* Move core plugin to its own subdirectory, to prepare for federation.
+
 ## 0.5.23
 
 * Add methods to programmatically control markers info windows.
diff --git a/packages/google_maps_flutter/LICENSE b/packages/google_maps_flutter/google_maps_flutter/LICENSE
similarity index 100%
rename from packages/google_maps_flutter/LICENSE
rename to packages/google_maps_flutter/google_maps_flutter/LICENSE
diff --git a/packages/google_maps_flutter/README.md b/packages/google_maps_flutter/google_maps_flutter/README.md
similarity index 100%
rename from packages/google_maps_flutter/README.md
rename to packages/google_maps_flutter/google_maps_flutter/README.md
diff --git a/packages/google_maps_flutter/android/build.gradle b/packages/google_maps_flutter/google_maps_flutter/android/build.gradle
similarity index 100%
rename from packages/google_maps_flutter/android/build.gradle
rename to packages/google_maps_flutter/google_maps_flutter/android/build.gradle
diff --git a/packages/google_maps_flutter/android/gradle.properties b/packages/google_maps_flutter/google_maps_flutter/android/gradle.properties
similarity index 100%
rename from packages/google_maps_flutter/android/gradle.properties
rename to packages/google_maps_flutter/google_maps_flutter/android/gradle.properties
diff --git a/packages/google_maps_flutter/android/settings.gradle b/packages/google_maps_flutter/google_maps_flutter/android/settings.gradle
similarity index 100%
rename from packages/google_maps_flutter/android/settings.gradle
rename to packages/google_maps_flutter/google_maps_flutter/android/settings.gradle
diff --git a/packages/google_maps_flutter/android/src/main/AndroidManifest.xml b/packages/google_maps_flutter/google_maps_flutter/android/src/main/AndroidManifest.xml
similarity index 100%
rename from packages/google_maps_flutter/android/src/main/AndroidManifest.xml
rename to packages/google_maps_flutter/google_maps_flutter/android/src/main/AndroidManifest.xml
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/CircleBuilder.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/CircleBuilder.java
similarity index 100%
rename from packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/CircleBuilder.java
rename to packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/CircleBuilder.java
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/CircleController.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/CircleController.java
similarity index 100%
rename from packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/CircleController.java
rename to packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/CircleController.java
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/CircleOptionsSink.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/CircleOptionsSink.java
similarity index 100%
rename from packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/CircleOptionsSink.java
rename to packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/CircleOptionsSink.java
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/CirclesController.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/CirclesController.java
similarity index 100%
rename from packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/CirclesController.java
rename to packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/CirclesController.java
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
similarity index 100%
rename from packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
rename to packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java
similarity index 100%
rename from packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java
rename to packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
similarity index 100%
rename from packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
rename to packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapFactory.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapFactory.java
similarity index 100%
rename from packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapFactory.java
rename to packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapFactory.java
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapOptionsSink.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapOptionsSink.java
similarity index 100%
rename from packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapOptionsSink.java
rename to packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapOptionsSink.java
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapsPlugin.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapsPlugin.java
similarity index 100%
rename from packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapsPlugin.java
rename to packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapsPlugin.java
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkerBuilder.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkerBuilder.java
similarity index 100%
rename from packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkerBuilder.java
rename to packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkerBuilder.java
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkerController.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkerController.java
similarity index 100%
rename from packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkerController.java
rename to packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkerController.java
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkerOptionsSink.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkerOptionsSink.java
similarity index 100%
rename from packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkerOptionsSink.java
rename to packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkerOptionsSink.java
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkersController.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkersController.java
similarity index 100%
rename from packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkersController.java
rename to packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/MarkersController.java
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolygonBuilder.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolygonBuilder.java
similarity index 100%
rename from packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolygonBuilder.java
rename to packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolygonBuilder.java
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolygonController.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolygonController.java
similarity index 100%
rename from packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolygonController.java
rename to packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolygonController.java
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolygonOptionsSink.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolygonOptionsSink.java
similarity index 100%
rename from packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolygonOptionsSink.java
rename to packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolygonOptionsSink.java
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolygonsController.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolygonsController.java
similarity index 100%
rename from packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolygonsController.java
rename to packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolygonsController.java
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolylineBuilder.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolylineBuilder.java
similarity index 100%
rename from packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolylineBuilder.java
rename to packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolylineBuilder.java
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolylineController.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolylineController.java
similarity index 100%
rename from packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolylineController.java
rename to packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolylineController.java
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolylineOptionsSink.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolylineOptionsSink.java
similarity index 100%
rename from packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolylineOptionsSink.java
rename to packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolylineOptionsSink.java
diff --git a/packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolylinesController.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolylinesController.java
similarity index 100%
rename from packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolylinesController.java
rename to packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolylinesController.java
diff --git a/packages/google_maps_flutter/android/src/test/java/io/flutter/plugins/googlemaps/CircleBuilderTest.java b/packages/google_maps_flutter/google_maps_flutter/android/src/test/java/io/flutter/plugins/googlemaps/CircleBuilderTest.java
similarity index 100%
rename from packages/google_maps_flutter/android/src/test/java/io/flutter/plugins/googlemaps/CircleBuilderTest.java
rename to packages/google_maps_flutter/google_maps_flutter/android/src/test/java/io/flutter/plugins/googlemaps/CircleBuilderTest.java
diff --git a/packages/google_maps_flutter/android/src/test/java/io/flutter/plugins/googlemaps/CircleControllerTest.java b/packages/google_maps_flutter/google_maps_flutter/android/src/test/java/io/flutter/plugins/googlemaps/CircleControllerTest.java
similarity index 100%
rename from packages/google_maps_flutter/android/src/test/java/io/flutter/plugins/googlemaps/CircleControllerTest.java
rename to packages/google_maps_flutter/google_maps_flutter/android/src/test/java/io/flutter/plugins/googlemaps/CircleControllerTest.java
diff --git a/packages/google_maps_flutter/android/src/test/java/io/flutter/plugins/googlemaps/PolygonBuilderTest.java b/packages/google_maps_flutter/google_maps_flutter/android/src/test/java/io/flutter/plugins/googlemaps/PolygonBuilderTest.java
similarity index 100%
rename from packages/google_maps_flutter/android/src/test/java/io/flutter/plugins/googlemaps/PolygonBuilderTest.java
rename to packages/google_maps_flutter/google_maps_flutter/android/src/test/java/io/flutter/plugins/googlemaps/PolygonBuilderTest.java
diff --git a/packages/google_maps_flutter/android/src/test/java/io/flutter/plugins/googlemaps/PolygonControllerTest.java b/packages/google_maps_flutter/google_maps_flutter/android/src/test/java/io/flutter/plugins/googlemaps/PolygonControllerTest.java
similarity index 100%
rename from packages/google_maps_flutter/android/src/test/java/io/flutter/plugins/googlemaps/PolygonControllerTest.java
rename to packages/google_maps_flutter/google_maps_flutter/android/src/test/java/io/flutter/plugins/googlemaps/PolygonControllerTest.java
diff --git a/packages/google_maps_flutter/android/src/test/java/io/flutter/plugins/googlemaps/PolylineBuilderTest.java b/packages/google_maps_flutter/google_maps_flutter/android/src/test/java/io/flutter/plugins/googlemaps/PolylineBuilderTest.java
similarity index 100%
rename from packages/google_maps_flutter/android/src/test/java/io/flutter/plugins/googlemaps/PolylineBuilderTest.java
rename to packages/google_maps_flutter/google_maps_flutter/android/src/test/java/io/flutter/plugins/googlemaps/PolylineBuilderTest.java
diff --git a/packages/google_maps_flutter/android/src/test/java/io/flutter/plugins/googlemaps/PolylineControllerTest.java b/packages/google_maps_flutter/google_maps_flutter/android/src/test/java/io/flutter/plugins/googlemaps/PolylineControllerTest.java
similarity index 100%
rename from packages/google_maps_flutter/android/src/test/java/io/flutter/plugins/googlemaps/PolylineControllerTest.java
rename to packages/google_maps_flutter/google_maps_flutter/android/src/test/java/io/flutter/plugins/googlemaps/PolylineControllerTest.java
diff --git a/packages/google_maps_flutter/android/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/packages/google_maps_flutter/google_maps_flutter/android/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
similarity index 100%
rename from packages/google_maps_flutter/android/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
rename to packages/google_maps_flutter/google_maps_flutter/android/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
diff --git a/packages/google_maps_flutter/example/.metadata b/packages/google_maps_flutter/google_maps_flutter/example/.metadata
similarity index 100%
rename from packages/google_maps_flutter/example/.metadata
rename to packages/google_maps_flutter/google_maps_flutter/example/.metadata
diff --git a/packages/google_maps_flutter/example/README.md b/packages/google_maps_flutter/google_maps_flutter/example/README.md
similarity index 100%
rename from packages/google_maps_flutter/example/README.md
rename to packages/google_maps_flutter/google_maps_flutter/example/README.md
diff --git a/packages/google_maps_flutter/example/android.iml b/packages/google_maps_flutter/google_maps_flutter/example/android.iml
similarity index 100%
rename from packages/google_maps_flutter/example/android.iml
rename to packages/google_maps_flutter/google_maps_flutter/example/android.iml
diff --git a/packages/google_maps_flutter/example/android/app/build.gradle b/packages/google_maps_flutter/google_maps_flutter/example/android/app/build.gradle
similarity index 100%
rename from packages/google_maps_flutter/example/android/app/build.gradle
rename to packages/google_maps_flutter/google_maps_flutter/example/android/app/build.gradle
diff --git a/packages/google_maps_flutter/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/google_maps_flutter/google_maps_flutter/example/android/app/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from packages/google_maps_flutter/example/android/app/gradle/wrapper/gradle-wrapper.properties
rename to packages/google_maps_flutter/google_maps_flutter/example/android/app/gradle/wrapper/gradle-wrapper.properties
diff --git a/packages/google_maps_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/googlemaps/EmbeddingV1ActivityTest.java b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/googlemaps/EmbeddingV1ActivityTest.java
similarity index 100%
rename from packages/google_maps_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/googlemaps/EmbeddingV1ActivityTest.java
rename to packages/google_maps_flutter/google_maps_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/googlemaps/EmbeddingV1ActivityTest.java
diff --git a/packages/google_maps_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/googlemaps/MainActivityTest.java b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/googlemaps/MainActivityTest.java
similarity index 100%
rename from packages/google_maps_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/googlemaps/MainActivityTest.java
rename to packages/google_maps_flutter/google_maps_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/googlemaps/MainActivityTest.java
diff --git a/packages/google_maps_flutter/example/android/app/src/main/AndroidManifest.xml b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/AndroidManifest.xml
similarity index 100%
rename from packages/google_maps_flutter/example/android/app/src/main/AndroidManifest.xml
rename to packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/AndroidManifest.xml
diff --git a/packages/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/EmbeddingV1Activity.java b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/EmbeddingV1Activity.java
similarity index 100%
rename from packages/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/EmbeddingV1Activity.java
rename to packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/EmbeddingV1Activity.java
diff --git a/packages/google_maps_flutter/example/android/app/src/main/res/drawable/launch_background.xml b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/res/drawable/launch_background.xml
similarity index 100%
rename from packages/google_maps_flutter/example/android/app/src/main/res/drawable/launch_background.xml
rename to packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/res/drawable/launch_background.xml
diff --git a/packages/google_maps_flutter/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from packages/google_maps_flutter/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/packages/google_maps_flutter/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from packages/google_maps_flutter/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/packages/google_maps_flutter/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from packages/google_maps_flutter/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/packages/google_maps_flutter/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from packages/google_maps_flutter/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/packages/google_maps_flutter/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from packages/google_maps_flutter/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ
diff --git a/packages/google_maps_flutter/example/android/app/src/main/res/values/styles.xml b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/res/values/styles.xml
similarity index 100%
rename from packages/google_maps_flutter/example/android/app/src/main/res/values/styles.xml
rename to packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/res/values/styles.xml
diff --git a/packages/google_maps_flutter/example/android/build.gradle b/packages/google_maps_flutter/google_maps_flutter/example/android/build.gradle
similarity index 100%
rename from packages/google_maps_flutter/example/android/build.gradle
rename to packages/google_maps_flutter/google_maps_flutter/example/android/build.gradle
diff --git a/packages/google_maps_flutter/example/android/gradle.properties b/packages/google_maps_flutter/google_maps_flutter/example/android/gradle.properties
similarity index 100%
rename from packages/google_maps_flutter/example/android/gradle.properties
rename to packages/google_maps_flutter/google_maps_flutter/example/android/gradle.properties
diff --git a/packages/google_maps_flutter/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/google_maps_flutter/google_maps_flutter/example/android/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from packages/google_maps_flutter/example/android/gradle/wrapper/gradle-wrapper.properties
rename to packages/google_maps_flutter/google_maps_flutter/example/android/gradle/wrapper/gradle-wrapper.properties
diff --git a/packages/google_maps_flutter/example/android/settings.gradle b/packages/google_maps_flutter/google_maps_flutter/example/android/settings.gradle
similarity index 100%
rename from packages/google_maps_flutter/example/android/settings.gradle
rename to packages/google_maps_flutter/google_maps_flutter/example/android/settings.gradle
diff --git a/packages/google_maps_flutter/example/assets/2.0x/red_square.png b/packages/google_maps_flutter/google_maps_flutter/example/assets/2.0x/red_square.png
similarity index 100%
rename from packages/google_maps_flutter/example/assets/2.0x/red_square.png
rename to packages/google_maps_flutter/google_maps_flutter/example/assets/2.0x/red_square.png
Binary files differ
diff --git a/packages/google_maps_flutter/example/assets/3.0x/red_square.png b/packages/google_maps_flutter/google_maps_flutter/example/assets/3.0x/red_square.png
similarity index 100%
rename from packages/google_maps_flutter/example/assets/3.0x/red_square.png
rename to packages/google_maps_flutter/google_maps_flutter/example/assets/3.0x/red_square.png
Binary files differ
diff --git a/packages/google_maps_flutter/example/assets/night_mode.json b/packages/google_maps_flutter/google_maps_flutter/example/assets/night_mode.json
similarity index 100%
rename from packages/google_maps_flutter/example/assets/night_mode.json
rename to packages/google_maps_flutter/google_maps_flutter/example/assets/night_mode.json
diff --git a/packages/google_maps_flutter/example/assets/red_square.png b/packages/google_maps_flutter/google_maps_flutter/example/assets/red_square.png
similarity index 100%
rename from packages/google_maps_flutter/example/assets/red_square.png
rename to packages/google_maps_flutter/google_maps_flutter/example/assets/red_square.png
Binary files differ
diff --git a/packages/google_maps_flutter/example/google_maps_flutter_example.iml b/packages/google_maps_flutter/google_maps_flutter/example/google_maps_flutter_example.iml
similarity index 100%
rename from packages/google_maps_flutter/example/google_maps_flutter_example.iml
rename to packages/google_maps_flutter/google_maps_flutter/example/google_maps_flutter_example.iml
diff --git a/packages/google_maps_flutter/example/google_maps_flutter_example_android.iml b/packages/google_maps_flutter/google_maps_flutter/example/google_maps_flutter_example_android.iml
similarity index 100%
rename from packages/google_maps_flutter/example/google_maps_flutter_example_android.iml
rename to packages/google_maps_flutter/google_maps_flutter/example/google_maps_flutter_example_android.iml
diff --git a/packages/google_maps_flutter/example/ios/Flutter/AppFrameworkInfo.plist b/packages/google_maps_flutter/google_maps_flutter/example/ios/Flutter/AppFrameworkInfo.plist
similarity index 100%
rename from packages/google_maps_flutter/example/ios/Flutter/AppFrameworkInfo.plist
rename to packages/google_maps_flutter/google_maps_flutter/example/ios/Flutter/AppFrameworkInfo.plist
diff --git a/packages/google_maps_flutter/example/ios/Flutter/Debug.xcconfig b/packages/google_maps_flutter/google_maps_flutter/example/ios/Flutter/Debug.xcconfig
similarity index 100%
rename from packages/google_maps_flutter/example/ios/Flutter/Debug.xcconfig
rename to packages/google_maps_flutter/google_maps_flutter/example/ios/Flutter/Debug.xcconfig
diff --git a/packages/google_maps_flutter/example/ios/Flutter/Release.xcconfig b/packages/google_maps_flutter/google_maps_flutter/example/ios/Flutter/Release.xcconfig
similarity index 100%
rename from packages/google_maps_flutter/example/ios/Flutter/Release.xcconfig
rename to packages/google_maps_flutter/google_maps_flutter/example/ios/Flutter/Release.xcconfig
diff --git a/packages/google_maps_flutter/example/ios/Runner.xcodeproj/project.pbxproj b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/project.pbxproj
similarity index 100%
rename from packages/google_maps_flutter/example/ios/Runner.xcodeproj/project.pbxproj
rename to packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/project.pbxproj
diff --git a/packages/google_maps_flutter/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from packages/google_maps_flutter/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
rename to packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/packages/google_maps_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
similarity index 100%
rename from packages/google_maps_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
rename to packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
diff --git a/packages/google_maps_flutter/example/ios/Runner.xcworkspace/contents.xcworkspacedata b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from packages/google_maps_flutter/example/ios/Runner.xcworkspace/contents.xcworkspacedata
rename to packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcworkspace/contents.xcworkspacedata
diff --git a/packages/google_maps_flutter/example/ios/Runner/AppDelegate.h b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/AppDelegate.h
similarity index 100%
rename from packages/google_maps_flutter/example/ios/Runner/AppDelegate.h
rename to packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/AppDelegate.h
diff --git a/packages/google_maps_flutter/example/ios/Runner/AppDelegate.m b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/AppDelegate.m
similarity index 100%
rename from packages/google_maps_flutter/example/ios/Runner/AppDelegate.m
rename to packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/AppDelegate.m
diff --git a/packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
similarity index 100%
rename from packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
rename to packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
Binary files differ
diff --git a/packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
similarity index 100%
rename from packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
rename to packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
Binary files differ
diff --git a/packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
similarity index 100%
rename from packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
rename to packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
Binary files differ
diff --git a/packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
similarity index 100%
rename from packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
rename to packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
Binary files differ
diff --git a/packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
similarity index 100%
rename from packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
rename to packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
Binary files differ
diff --git a/packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
similarity index 100%
rename from packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
rename to packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
Binary files differ
diff --git a/packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
similarity index 100%
rename from packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
rename to packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
Binary files differ
diff --git a/packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
similarity index 100%
rename from packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
rename to packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
Binary files differ
diff --git a/packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
similarity index 100%
rename from packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
rename to packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
Binary files differ
diff --git a/packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
similarity index 100%
rename from packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
rename to packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
Binary files differ
diff --git a/packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
similarity index 100%
rename from packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
rename to packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
Binary files differ
diff --git a/packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
similarity index 100%
rename from packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
rename to packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
Binary files differ
diff --git a/packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
similarity index 100%
rename from packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
rename to packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
Binary files differ
diff --git a/packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
similarity index 100%
rename from packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
rename to packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
Binary files differ
diff --git a/packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
similarity index 100%
rename from packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
rename to packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
Binary files differ
diff --git a/packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
similarity index 100%
rename from packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
rename to packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
diff --git a/packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
similarity index 100%
rename from packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
rename to packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
Binary files differ
diff --git a/packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
similarity index 100%
rename from packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
rename to packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
Binary files differ
diff --git a/packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
similarity index 100%
rename from packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
rename to packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
Binary files differ
diff --git a/packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
similarity index 100%
rename from packages/google_maps_flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
rename to packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
diff --git a/packages/google_maps_flutter/example/ios/Runner/Base.lproj/LaunchScreen.storyboard b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Base.lproj/LaunchScreen.storyboard
similarity index 100%
rename from packages/google_maps_flutter/example/ios/Runner/Base.lproj/LaunchScreen.storyboard
rename to packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Base.lproj/LaunchScreen.storyboard
diff --git a/packages/google_maps_flutter/example/ios/Runner/Base.lproj/Main.storyboard b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Base.lproj/Main.storyboard
similarity index 100%
rename from packages/google_maps_flutter/example/ios/Runner/Base.lproj/Main.storyboard
rename to packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Base.lproj/Main.storyboard
diff --git a/packages/google_maps_flutter/example/ios/Runner/Info.plist b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Info.plist
similarity index 100%
rename from packages/google_maps_flutter/example/ios/Runner/Info.plist
rename to packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Info.plist
diff --git a/packages/google_maps_flutter/example/ios/Runner/main.m b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/main.m
similarity index 100%
rename from packages/google_maps_flutter/example/ios/Runner/main.m
rename to packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/main.m
diff --git a/packages/google_maps_flutter/example/lib/animate_camera.dart b/packages/google_maps_flutter/google_maps_flutter/example/lib/animate_camera.dart
similarity index 100%
rename from packages/google_maps_flutter/example/lib/animate_camera.dart
rename to packages/google_maps_flutter/google_maps_flutter/example/lib/animate_camera.dart
diff --git a/packages/google_maps_flutter/example/lib/main.dart b/packages/google_maps_flutter/google_maps_flutter/example/lib/main.dart
similarity index 100%
rename from packages/google_maps_flutter/example/lib/main.dart
rename to packages/google_maps_flutter/google_maps_flutter/example/lib/main.dart
diff --git a/packages/google_maps_flutter/example/lib/map_click.dart b/packages/google_maps_flutter/google_maps_flutter/example/lib/map_click.dart
similarity index 100%
rename from packages/google_maps_flutter/example/lib/map_click.dart
rename to packages/google_maps_flutter/google_maps_flutter/example/lib/map_click.dart
diff --git a/packages/google_maps_flutter/example/lib/map_coordinates.dart b/packages/google_maps_flutter/google_maps_flutter/example/lib/map_coordinates.dart
similarity index 100%
rename from packages/google_maps_flutter/example/lib/map_coordinates.dart
rename to packages/google_maps_flutter/google_maps_flutter/example/lib/map_coordinates.dart
diff --git a/packages/google_maps_flutter/example/lib/map_ui.dart b/packages/google_maps_flutter/google_maps_flutter/example/lib/map_ui.dart
similarity index 100%
rename from packages/google_maps_flutter/example/lib/map_ui.dart
rename to packages/google_maps_flutter/google_maps_flutter/example/lib/map_ui.dart
diff --git a/packages/google_maps_flutter/example/lib/marker_icons.dart b/packages/google_maps_flutter/google_maps_flutter/example/lib/marker_icons.dart
similarity index 100%
rename from packages/google_maps_flutter/example/lib/marker_icons.dart
rename to packages/google_maps_flutter/google_maps_flutter/example/lib/marker_icons.dart
diff --git a/packages/google_maps_flutter/example/lib/move_camera.dart b/packages/google_maps_flutter/google_maps_flutter/example/lib/move_camera.dart
similarity index 100%
rename from packages/google_maps_flutter/example/lib/move_camera.dart
rename to packages/google_maps_flutter/google_maps_flutter/example/lib/move_camera.dart
diff --git a/packages/google_maps_flutter/example/lib/padding.dart b/packages/google_maps_flutter/google_maps_flutter/example/lib/padding.dart
similarity index 100%
rename from packages/google_maps_flutter/example/lib/padding.dart
rename to packages/google_maps_flutter/google_maps_flutter/example/lib/padding.dart
diff --git a/packages/google_maps_flutter/example/lib/page.dart b/packages/google_maps_flutter/google_maps_flutter/example/lib/page.dart
similarity index 100%
rename from packages/google_maps_flutter/example/lib/page.dart
rename to packages/google_maps_flutter/google_maps_flutter/example/lib/page.dart
diff --git a/packages/google_maps_flutter/example/lib/place_circle.dart b/packages/google_maps_flutter/google_maps_flutter/example/lib/place_circle.dart
similarity index 100%
rename from packages/google_maps_flutter/example/lib/place_circle.dart
rename to packages/google_maps_flutter/google_maps_flutter/example/lib/place_circle.dart
diff --git a/packages/google_maps_flutter/example/lib/place_marker.dart b/packages/google_maps_flutter/google_maps_flutter/example/lib/place_marker.dart
similarity index 100%
rename from packages/google_maps_flutter/example/lib/place_marker.dart
rename to packages/google_maps_flutter/google_maps_flutter/example/lib/place_marker.dart
diff --git a/packages/google_maps_flutter/example/lib/place_polygon.dart b/packages/google_maps_flutter/google_maps_flutter/example/lib/place_polygon.dart
similarity index 100%
rename from packages/google_maps_flutter/example/lib/place_polygon.dart
rename to packages/google_maps_flutter/google_maps_flutter/example/lib/place_polygon.dart
diff --git a/packages/google_maps_flutter/example/lib/place_polyline.dart b/packages/google_maps_flutter/google_maps_flutter/example/lib/place_polyline.dart
similarity index 100%
rename from packages/google_maps_flutter/example/lib/place_polyline.dart
rename to packages/google_maps_flutter/google_maps_flutter/example/lib/place_polyline.dart
diff --git a/packages/google_maps_flutter/example/lib/scrolling_map.dart b/packages/google_maps_flutter/google_maps_flutter/example/lib/scrolling_map.dart
similarity index 100%
rename from packages/google_maps_flutter/example/lib/scrolling_map.dart
rename to packages/google_maps_flutter/google_maps_flutter/example/lib/scrolling_map.dart
diff --git a/packages/google_maps_flutter/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml
similarity index 100%
rename from packages/google_maps_flutter/example/pubspec.yaml
rename to packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml
diff --git a/packages/google_maps_flutter/example/test_driver/google_map_inspector.dart b/packages/google_maps_flutter/google_maps_flutter/example/test_driver/google_map_inspector.dart
similarity index 100%
rename from packages/google_maps_flutter/example/test_driver/google_map_inspector.dart
rename to packages/google_maps_flutter/google_maps_flutter/example/test_driver/google_map_inspector.dart
diff --git a/packages/google_maps_flutter/example/test_driver/google_maps_e2e.dart b/packages/google_maps_flutter/google_maps_flutter/example/test_driver/google_maps_e2e.dart
similarity index 100%
rename from packages/google_maps_flutter/example/test_driver/google_maps_e2e.dart
rename to packages/google_maps_flutter/google_maps_flutter/example/test_driver/google_maps_e2e.dart
diff --git a/packages/google_maps_flutter/example/test_driver/google_maps_e2e_test.dart b/packages/google_maps_flutter/google_maps_flutter/example/test_driver/google_maps_e2e_test.dart
similarity index 100%
rename from packages/google_maps_flutter/example/test_driver/google_maps_e2e_test.dart
rename to packages/google_maps_flutter/google_maps_flutter/example/test_driver/google_maps_e2e_test.dart
diff --git a/packages/google_maps_flutter/google_mobile_maps.iml b/packages/google_maps_flutter/google_maps_flutter/google_mobile_maps.iml
similarity index 100%
rename from packages/google_maps_flutter/google_mobile_maps.iml
rename to packages/google_maps_flutter/google_maps_flutter/google_mobile_maps.iml
diff --git a/packages/google_maps_flutter/google_mobile_maps_android.iml b/packages/google_maps_flutter/google_maps_flutter/google_mobile_maps_android.iml
similarity index 100%
rename from packages/google_maps_flutter/google_mobile_maps_android.iml
rename to packages/google_maps_flutter/google_maps_flutter/google_mobile_maps_android.iml
diff --git a/packages/google_maps_flutter/ios/Assets/.gitkeep b/packages/google_maps_flutter/google_maps_flutter/ios/Assets/.gitkeep
similarity index 100%
rename from packages/google_maps_flutter/ios/Assets/.gitkeep
rename to packages/google_maps_flutter/google_maps_flutter/ios/Assets/.gitkeep
diff --git a/packages/google_maps_flutter/ios/Classes/FLTGoogleMapsPlugin.h b/packages/google_maps_flutter/google_maps_flutter/ios/Classes/FLTGoogleMapsPlugin.h
similarity index 100%
rename from packages/google_maps_flutter/ios/Classes/FLTGoogleMapsPlugin.h
rename to packages/google_maps_flutter/google_maps_flutter/ios/Classes/FLTGoogleMapsPlugin.h
diff --git a/packages/google_maps_flutter/ios/Classes/FLTGoogleMapsPlugin.m b/packages/google_maps_flutter/google_maps_flutter/ios/Classes/FLTGoogleMapsPlugin.m
similarity index 100%
rename from packages/google_maps_flutter/ios/Classes/FLTGoogleMapsPlugin.m
rename to packages/google_maps_flutter/google_maps_flutter/ios/Classes/FLTGoogleMapsPlugin.m
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapCircleController.h b/packages/google_maps_flutter/google_maps_flutter/ios/Classes/GoogleMapCircleController.h
similarity index 100%
rename from packages/google_maps_flutter/ios/Classes/GoogleMapCircleController.h
rename to packages/google_maps_flutter/google_maps_flutter/ios/Classes/GoogleMapCircleController.h
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapCircleController.m b/packages/google_maps_flutter/google_maps_flutter/ios/Classes/GoogleMapCircleController.m
similarity index 100%
rename from packages/google_maps_flutter/ios/Classes/GoogleMapCircleController.m
rename to packages/google_maps_flutter/google_maps_flutter/ios/Classes/GoogleMapCircleController.m
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapController.h b/packages/google_maps_flutter/google_maps_flutter/ios/Classes/GoogleMapController.h
similarity index 100%
rename from packages/google_maps_flutter/ios/Classes/GoogleMapController.h
rename to packages/google_maps_flutter/google_maps_flutter/ios/Classes/GoogleMapController.h
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m b/packages/google_maps_flutter/google_maps_flutter/ios/Classes/GoogleMapController.m
similarity index 100%
rename from packages/google_maps_flutter/ios/Classes/GoogleMapController.m
rename to packages/google_maps_flutter/google_maps_flutter/ios/Classes/GoogleMapController.m
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.h b/packages/google_maps_flutter/google_maps_flutter/ios/Classes/GoogleMapMarkerController.h
similarity index 100%
rename from packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.h
rename to packages/google_maps_flutter/google_maps_flutter/ios/Classes/GoogleMapMarkerController.h
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.m b/packages/google_maps_flutter/google_maps_flutter/ios/Classes/GoogleMapMarkerController.m
similarity index 100%
rename from packages/google_maps_flutter/ios/Classes/GoogleMapMarkerController.m
rename to packages/google_maps_flutter/google_maps_flutter/ios/Classes/GoogleMapMarkerController.m
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapPolygonController.h b/packages/google_maps_flutter/google_maps_flutter/ios/Classes/GoogleMapPolygonController.h
similarity index 100%
rename from packages/google_maps_flutter/ios/Classes/GoogleMapPolygonController.h
rename to packages/google_maps_flutter/google_maps_flutter/ios/Classes/GoogleMapPolygonController.h
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapPolygonController.m b/packages/google_maps_flutter/google_maps_flutter/ios/Classes/GoogleMapPolygonController.m
similarity index 100%
rename from packages/google_maps_flutter/ios/Classes/GoogleMapPolygonController.m
rename to packages/google_maps_flutter/google_maps_flutter/ios/Classes/GoogleMapPolygonController.m
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapPolylineController.h b/packages/google_maps_flutter/google_maps_flutter/ios/Classes/GoogleMapPolylineController.h
similarity index 100%
rename from packages/google_maps_flutter/ios/Classes/GoogleMapPolylineController.h
rename to packages/google_maps_flutter/google_maps_flutter/ios/Classes/GoogleMapPolylineController.h
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapPolylineController.m b/packages/google_maps_flutter/google_maps_flutter/ios/Classes/GoogleMapPolylineController.m
similarity index 100%
rename from packages/google_maps_flutter/ios/Classes/GoogleMapPolylineController.m
rename to packages/google_maps_flutter/google_maps_flutter/ios/Classes/GoogleMapPolylineController.m
diff --git a/packages/google_maps_flutter/ios/Classes/JsonConversions.h b/packages/google_maps_flutter/google_maps_flutter/ios/Classes/JsonConversions.h
similarity index 100%
rename from packages/google_maps_flutter/ios/Classes/JsonConversions.h
rename to packages/google_maps_flutter/google_maps_flutter/ios/Classes/JsonConversions.h
diff --git a/packages/google_maps_flutter/ios/Classes/JsonConversions.m b/packages/google_maps_flutter/google_maps_flutter/ios/Classes/JsonConversions.m
similarity index 100%
rename from packages/google_maps_flutter/ios/Classes/JsonConversions.m
rename to packages/google_maps_flutter/google_maps_flutter/ios/Classes/JsonConversions.m
diff --git a/packages/google_maps_flutter/ios/google_maps_flutter.podspec b/packages/google_maps_flutter/google_maps_flutter/ios/google_maps_flutter.podspec
similarity index 100%
rename from packages/google_maps_flutter/ios/google_maps_flutter.podspec
rename to packages/google_maps_flutter/google_maps_flutter/ios/google_maps_flutter.podspec
diff --git a/packages/google_maps_flutter/lib/google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart
similarity index 100%
rename from packages/google_maps_flutter/lib/google_maps_flutter.dart
rename to packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart
diff --git a/packages/google_maps_flutter/lib/src/bitmap.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/bitmap.dart
similarity index 100%
rename from packages/google_maps_flutter/lib/src/bitmap.dart
rename to packages/google_maps_flutter/google_maps_flutter/lib/src/bitmap.dart
diff --git a/packages/google_maps_flutter/lib/src/callbacks.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/callbacks.dart
similarity index 100%
rename from packages/google_maps_flutter/lib/src/callbacks.dart
rename to packages/google_maps_flutter/google_maps_flutter/lib/src/callbacks.dart
diff --git a/packages/google_maps_flutter/lib/src/camera.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/camera.dart
similarity index 100%
rename from packages/google_maps_flutter/lib/src/camera.dart
rename to packages/google_maps_flutter/google_maps_flutter/lib/src/camera.dart
diff --git a/packages/google_maps_flutter/lib/src/cap.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/cap.dart
similarity index 100%
rename from packages/google_maps_flutter/lib/src/cap.dart
rename to packages/google_maps_flutter/google_maps_flutter/lib/src/cap.dart
diff --git a/packages/google_maps_flutter/lib/src/circle.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/circle.dart
similarity index 100%
rename from packages/google_maps_flutter/lib/src/circle.dart
rename to packages/google_maps_flutter/google_maps_flutter/lib/src/circle.dart
diff --git a/packages/google_maps_flutter/lib/src/circle_updates.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/circle_updates.dart
similarity index 100%
rename from packages/google_maps_flutter/lib/src/circle_updates.dart
rename to packages/google_maps_flutter/google_maps_flutter/lib/src/circle_updates.dart
diff --git a/packages/google_maps_flutter/lib/src/controller.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
similarity index 100%
rename from packages/google_maps_flutter/lib/src/controller.dart
rename to packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
diff --git a/packages/google_maps_flutter/lib/src/google_map.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart
similarity index 100%
rename from packages/google_maps_flutter/lib/src/google_map.dart
rename to packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart
diff --git a/packages/google_maps_flutter/lib/src/joint_type.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/joint_type.dart
similarity index 100%
rename from packages/google_maps_flutter/lib/src/joint_type.dart
rename to packages/google_maps_flutter/google_maps_flutter/lib/src/joint_type.dart
diff --git a/packages/google_maps_flutter/lib/src/location.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/location.dart
similarity index 100%
rename from packages/google_maps_flutter/lib/src/location.dart
rename to packages/google_maps_flutter/google_maps_flutter/lib/src/location.dart
diff --git a/packages/google_maps_flutter/lib/src/marker.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/marker.dart
similarity index 100%
rename from packages/google_maps_flutter/lib/src/marker.dart
rename to packages/google_maps_flutter/google_maps_flutter/lib/src/marker.dart
diff --git a/packages/google_maps_flutter/lib/src/marker_updates.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/marker_updates.dart
similarity index 100%
rename from packages/google_maps_flutter/lib/src/marker_updates.dart
rename to packages/google_maps_flutter/google_maps_flutter/lib/src/marker_updates.dart
diff --git a/packages/google_maps_flutter/lib/src/pattern_item.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/pattern_item.dart
similarity index 100%
rename from packages/google_maps_flutter/lib/src/pattern_item.dart
rename to packages/google_maps_flutter/google_maps_flutter/lib/src/pattern_item.dart
diff --git a/packages/google_maps_flutter/lib/src/polygon.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/polygon.dart
similarity index 100%
rename from packages/google_maps_flutter/lib/src/polygon.dart
rename to packages/google_maps_flutter/google_maps_flutter/lib/src/polygon.dart
diff --git a/packages/google_maps_flutter/lib/src/polygon_updates.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/polygon_updates.dart
similarity index 100%
rename from packages/google_maps_flutter/lib/src/polygon_updates.dart
rename to packages/google_maps_flutter/google_maps_flutter/lib/src/polygon_updates.dart
diff --git a/packages/google_maps_flutter/lib/src/polyline.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/polyline.dart
similarity index 100%
rename from packages/google_maps_flutter/lib/src/polyline.dart
rename to packages/google_maps_flutter/google_maps_flutter/lib/src/polyline.dart
diff --git a/packages/google_maps_flutter/lib/src/polyline_updates.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/polyline_updates.dart
similarity index 100%
rename from packages/google_maps_flutter/lib/src/polyline_updates.dart
rename to packages/google_maps_flutter/google_maps_flutter/lib/src/polyline_updates.dart
diff --git a/packages/google_maps_flutter/lib/src/screen_coordinate.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/screen_coordinate.dart
similarity index 100%
rename from packages/google_maps_flutter/lib/src/screen_coordinate.dart
rename to packages/google_maps_flutter/google_maps_flutter/lib/src/screen_coordinate.dart
diff --git a/packages/google_maps_flutter/lib/src/ui.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/ui.dart
similarity index 100%
rename from packages/google_maps_flutter/lib/src/ui.dart
rename to packages/google_maps_flutter/google_maps_flutter/lib/src/ui.dart
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml
similarity index 92%
rename from packages/google_maps_flutter/pubspec.yaml
rename to packages/google_maps_flutter/google_maps_flutter/pubspec.yaml
index d3e751e..51e87e8 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml
@@ -1,7 +1,7 @@
 name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
-homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.5.23
+homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter/google_maps_flutter
+version: 0.5.23+1
 
 dependencies:
   flutter:
diff --git a/packages/google_maps_flutter/test/circle_updates_test.dart b/packages/google_maps_flutter/google_maps_flutter/test/circle_updates_test.dart
similarity index 100%
rename from packages/google_maps_flutter/test/circle_updates_test.dart
rename to packages/google_maps_flutter/google_maps_flutter/test/circle_updates_test.dart
diff --git a/packages/google_maps_flutter/test/fake_maps_controllers.dart b/packages/google_maps_flutter/google_maps_flutter/test/fake_maps_controllers.dart
similarity index 100%
rename from packages/google_maps_flutter/test/fake_maps_controllers.dart
rename to packages/google_maps_flutter/google_maps_flutter/test/fake_maps_controllers.dart
diff --git a/packages/google_maps_flutter/test/google_map_test.dart b/packages/google_maps_flutter/google_maps_flutter/test/google_map_test.dart
similarity index 100%
rename from packages/google_maps_flutter/test/google_map_test.dart
rename to packages/google_maps_flutter/google_maps_flutter/test/google_map_test.dart
diff --git a/packages/google_maps_flutter/test/marker_updates_test.dart b/packages/google_maps_flutter/google_maps_flutter/test/marker_updates_test.dart
similarity index 100%
rename from packages/google_maps_flutter/test/marker_updates_test.dart
rename to packages/google_maps_flutter/google_maps_flutter/test/marker_updates_test.dart
diff --git a/packages/google_maps_flutter/test/polygon_updates_test.dart b/packages/google_maps_flutter/google_maps_flutter/test/polygon_updates_test.dart
similarity index 100%
rename from packages/google_maps_flutter/test/polygon_updates_test.dart
rename to packages/google_maps_flutter/google_maps_flutter/test/polygon_updates_test.dart
diff --git a/packages/google_maps_flutter/test/polyline_updates_test.dart b/packages/google_maps_flutter/google_maps_flutter/test/polyline_updates_test.dart
similarity index 100%
rename from packages/google_maps_flutter/test/polyline_updates_test.dart
rename to packages/google_maps_flutter/google_maps_flutter/test/polyline_updates_test.dart