[image_picker] Move core plugin to its own subdir. (#2712)

* [image_picker] Move to its own subdirectory.

```
mkdir image_picker
git mv -k ./* image_picker
```

* Bump version
diff --git a/packages/image_picker/CHANGELOG.md b/packages/image_picker/image_picker/CHANGELOG.md
similarity index 98%
rename from packages/image_picker/CHANGELOG.md
rename to packages/image_picker/image_picker/CHANGELOG.md
index 50d893c..2d9cff5 100644
--- a/packages/image_picker/CHANGELOG.md
+++ b/packages/image_picker/image_picker/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.6.5+3
+
+* Move core plugin to a subdirectory to allow for federation.
+
 ## 0.6.5+2
 
 * iOS: Fixes crash when an image in the gallery is tapped more than once.
diff --git a/packages/image_picker/LICENSE b/packages/image_picker/image_picker/LICENSE
similarity index 100%
rename from packages/image_picker/LICENSE
rename to packages/image_picker/image_picker/LICENSE
diff --git a/packages/image_picker/README.md b/packages/image_picker/image_picker/README.md
similarity index 100%
rename from packages/image_picker/README.md
rename to packages/image_picker/image_picker/README.md
diff --git a/packages/image_picker/android/build.gradle b/packages/image_picker/image_picker/android/build.gradle
similarity index 100%
rename from packages/image_picker/android/build.gradle
rename to packages/image_picker/image_picker/android/build.gradle
diff --git a/packages/image_picker/android/gradle.properties b/packages/image_picker/image_picker/android/gradle.properties
similarity index 100%
rename from packages/image_picker/android/gradle.properties
rename to packages/image_picker/image_picker/android/gradle.properties
diff --git a/packages/image_picker/android/settings.gradle b/packages/image_picker/image_picker/android/settings.gradle
similarity index 100%
rename from packages/image_picker/android/settings.gradle
rename to packages/image_picker/image_picker/android/settings.gradle
diff --git a/packages/image_picker/android/src/main/AndroidManifest.xml b/packages/image_picker/image_picker/android/src/main/AndroidManifest.xml
similarity index 100%
rename from packages/image_picker/android/src/main/AndroidManifest.xml
rename to packages/image_picker/image_picker/android/src/main/AndroidManifest.xml
diff --git a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ExifDataCopier.java b/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ExifDataCopier.java
similarity index 100%
rename from packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ExifDataCopier.java
rename to packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ExifDataCopier.java
diff --git a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java b/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java
similarity index 100%
rename from packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java
rename to packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java
diff --git a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerCache.java b/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerCache.java
similarity index 100%
rename from packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerCache.java
rename to packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerCache.java
diff --git a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java b/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java
similarity index 100%
rename from packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java
rename to packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java
diff --git a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerFileProvider.java b/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerFileProvider.java
similarity index 100%
rename from packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerFileProvider.java
rename to packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerFileProvider.java
diff --git a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java b/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java
similarity index 100%
rename from packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java
rename to packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java
diff --git a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerUtils.java b/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerUtils.java
similarity index 100%
rename from packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerUtils.java
rename to packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerUtils.java
diff --git a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImageResizer.java b/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImageResizer.java
similarity index 100%
rename from packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImageResizer.java
rename to packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImageResizer.java
diff --git a/packages/image_picker/android/src/main/res/xml/flutter_image_picker_file_paths.xml b/packages/image_picker/image_picker/android/src/main/res/xml/flutter_image_picker_file_paths.xml
similarity index 100%
rename from packages/image_picker/android/src/main/res/xml/flutter_image_picker_file_paths.xml
rename to packages/image_picker/image_picker/android/src/main/res/xml/flutter_image_picker_file_paths.xml
diff --git a/packages/image_picker/example/README.md b/packages/image_picker/image_picker/example/README.md
similarity index 100%
rename from packages/image_picker/example/README.md
rename to packages/image_picker/image_picker/example/README.md
diff --git a/packages/image_picker/example/android.iml b/packages/image_picker/image_picker/example/android.iml
similarity index 100%
rename from packages/image_picker/example/android.iml
rename to packages/image_picker/image_picker/example/android.iml
diff --git a/packages/image_picker/example/android/app/build.gradle b/packages/image_picker/image_picker/example/android/app/build.gradle
similarity index 100%
rename from packages/image_picker/example/android/app/build.gradle
rename to packages/image_picker/image_picker/example/android/app/build.gradle
diff --git a/packages/image_picker/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/image_picker/image_picker/example/android/app/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from packages/image_picker/example/android/app/gradle/wrapper/gradle-wrapper.properties
rename to packages/image_picker/image_picker/example/android/app/gradle/wrapper/gradle-wrapper.properties
diff --git a/packages/image_picker/example/android/app/src/main/AndroidManifest.xml b/packages/image_picker/image_picker/example/android/app/src/main/AndroidManifest.xml
similarity index 100%
rename from packages/image_picker/example/android/app/src/main/AndroidManifest.xml
rename to packages/image_picker/image_picker/example/android/app/src/main/AndroidManifest.xml
diff --git a/packages/image_picker/example/android/app/src/main/java/io/flutter/plugins/.gitignore b/packages/image_picker/image_picker/example/android/app/src/main/java/io/flutter/plugins/.gitignore
similarity index 100%
rename from packages/image_picker/example/android/app/src/main/java/io/flutter/plugins/.gitignore
rename to packages/image_picker/image_picker/example/android/app/src/main/java/io/flutter/plugins/.gitignore
diff --git a/packages/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/EmbeddingV1Activity.java b/packages/image_picker/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/EmbeddingV1Activity.java
similarity index 100%
rename from packages/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/EmbeddingV1Activity.java
rename to packages/image_picker/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/EmbeddingV1Activity.java
diff --git a/packages/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/EmbeddingV1ActivityTest.java b/packages/image_picker/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/EmbeddingV1ActivityTest.java
similarity index 100%
rename from packages/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/EmbeddingV1ActivityTest.java
rename to packages/image_picker/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/EmbeddingV1ActivityTest.java
diff --git a/packages/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/FlutterActivityTest.java b/packages/image_picker/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/FlutterActivityTest.java
similarity index 100%
rename from packages/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/FlutterActivityTest.java
rename to packages/image_picker/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/FlutterActivityTest.java
diff --git a/packages/image_picker/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/packages/image_picker/image_picker/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from packages/image_picker/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to packages/image_picker/image_picker/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/packages/image_picker/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/packages/image_picker/image_picker/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from packages/image_picker/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to packages/image_picker/image_picker/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/packages/image_picker/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/packages/image_picker/image_picker/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from packages/image_picker/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to packages/image_picker/image_picker/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/packages/image_picker/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/packages/image_picker/image_picker/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from packages/image_picker/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to packages/image_picker/image_picker/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/packages/image_picker/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/packages/image_picker/image_picker/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from packages/image_picker/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to packages/image_picker/image_picker/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ
diff --git a/packages/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerCacheTest.java b/packages/image_picker/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerCacheTest.java
similarity index 100%
rename from packages/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerCacheTest.java
rename to packages/image_picker/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerCacheTest.java
diff --git a/packages/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerDelegateTest.java b/packages/image_picker/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerDelegateTest.java
similarity index 100%
rename from packages/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerDelegateTest.java
rename to packages/image_picker/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerDelegateTest.java
diff --git a/packages/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerPluginTest.java b/packages/image_picker/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerPluginTest.java
similarity index 100%
rename from packages/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerPluginTest.java
rename to packages/image_picker/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerPluginTest.java
diff --git a/packages/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImageResizerTest.java b/packages/image_picker/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImageResizerTest.java
similarity index 100%
rename from packages/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImageResizerTest.java
rename to packages/image_picker/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImageResizerTest.java
diff --git a/packages/image_picker/example/android/app/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/packages/image_picker/image_picker/example/android/app/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
similarity index 100%
rename from packages/image_picker/example/android/app/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
rename to packages/image_picker/image_picker/example/android/app/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
diff --git a/packages/image_picker/example/android/app/src/test/resources/pngImage.png b/packages/image_picker/image_picker/example/android/app/src/test/resources/pngImage.png
similarity index 100%
rename from packages/image_picker/example/android/app/src/test/resources/pngImage.png
rename to packages/image_picker/image_picker/example/android/app/src/test/resources/pngImage.png
Binary files differ
diff --git a/packages/image_picker/example/android/build.gradle b/packages/image_picker/image_picker/example/android/build.gradle
similarity index 100%
rename from packages/image_picker/example/android/build.gradle
rename to packages/image_picker/image_picker/example/android/build.gradle
diff --git a/packages/image_picker/example/android/gradle.properties b/packages/image_picker/image_picker/example/android/gradle.properties
similarity index 100%
rename from packages/image_picker/example/android/gradle.properties
rename to packages/image_picker/image_picker/example/android/gradle.properties
diff --git a/packages/image_picker/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/image_picker/image_picker/example/android/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from packages/image_picker/example/android/gradle/wrapper/gradle-wrapper.properties
rename to packages/image_picker/image_picker/example/android/gradle/wrapper/gradle-wrapper.properties
diff --git a/packages/image_picker/example/android/settings.gradle b/packages/image_picker/image_picker/example/android/settings.gradle
similarity index 100%
rename from packages/image_picker/example/android/settings.gradle
rename to packages/image_picker/image_picker/example/android/settings.gradle
diff --git a/packages/image_picker/example/image_picker_example.iml b/packages/image_picker/image_picker/example/image_picker_example.iml
similarity index 100%
rename from packages/image_picker/example/image_picker_example.iml
rename to packages/image_picker/image_picker/example/image_picker_example.iml
diff --git a/packages/image_picker/example/ios/Flutter/AppFrameworkInfo.plist b/packages/image_picker/image_picker/example/ios/Flutter/AppFrameworkInfo.plist
similarity index 100%
rename from packages/image_picker/example/ios/Flutter/AppFrameworkInfo.plist
rename to packages/image_picker/image_picker/example/ios/Flutter/AppFrameworkInfo.plist
diff --git a/packages/image_picker/example/ios/Flutter/Debug.xcconfig b/packages/image_picker/image_picker/example/ios/Flutter/Debug.xcconfig
similarity index 100%
rename from packages/image_picker/example/ios/Flutter/Debug.xcconfig
rename to packages/image_picker/image_picker/example/ios/Flutter/Debug.xcconfig
diff --git a/packages/image_picker/example/ios/Flutter/Release.xcconfig b/packages/image_picker/image_picker/example/ios/Flutter/Release.xcconfig
similarity index 100%
rename from packages/image_picker/example/ios/Flutter/Release.xcconfig
rename to packages/image_picker/image_picker/example/ios/Flutter/Release.xcconfig
diff --git a/packages/image_picker/example/ios/Runner.xcodeproj/project.pbxproj b/packages/image_picker/image_picker/example/ios/Runner.xcodeproj/project.pbxproj
similarity index 100%
rename from packages/image_picker/example/ios/Runner.xcodeproj/project.pbxproj
rename to packages/image_picker/image_picker/example/ios/Runner.xcodeproj/project.pbxproj
diff --git a/packages/image_picker/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/packages/image_picker/image_picker/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from packages/image_picker/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
rename to packages/image_picker/image_picker/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/packages/image_picker/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/image_picker/image_picker/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
similarity index 100%
rename from packages/image_picker/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
rename to packages/image_picker/image_picker/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
diff --git a/packages/image_picker/example/ios/Runner.xcworkspace/contents.xcworkspacedata b/packages/image_picker/image_picker/example/ios/Runner.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from packages/image_picker/example/ios/Runner.xcworkspace/contents.xcworkspacedata
rename to packages/image_picker/image_picker/example/ios/Runner.xcworkspace/contents.xcworkspacedata
diff --git a/packages/image_picker/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/image_picker/image_picker/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
similarity index 100%
rename from packages/image_picker/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
rename to packages/image_picker/image_picker/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/packages/image_picker/example/ios/Runner/.gitignore b/packages/image_picker/image_picker/example/ios/Runner/.gitignore
similarity index 100%
rename from packages/image_picker/example/ios/Runner/.gitignore
rename to packages/image_picker/image_picker/example/ios/Runner/.gitignore
diff --git a/packages/image_picker/example/ios/Runner/AppDelegate.h b/packages/image_picker/image_picker/example/ios/Runner/AppDelegate.h
similarity index 100%
rename from packages/image_picker/example/ios/Runner/AppDelegate.h
rename to packages/image_picker/image_picker/example/ios/Runner/AppDelegate.h
diff --git a/packages/image_picker/example/ios/Runner/AppDelegate.m b/packages/image_picker/image_picker/example/ios/Runner/AppDelegate.m
similarity index 100%
rename from packages/image_picker/example/ios/Runner/AppDelegate.m
rename to packages/image_picker/image_picker/example/ios/Runner/AppDelegate.m
diff --git a/packages/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/packages/image_picker/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from packages/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to packages/image_picker/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/packages/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/packages/image_picker/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
similarity index 100%
rename from packages/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
rename to packages/image_picker/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
Binary files differ
diff --git a/packages/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/packages/image_picker/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
similarity index 100%
rename from packages/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
rename to packages/image_picker/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
Binary files differ
diff --git a/packages/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/packages/image_picker/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
similarity index 100%
rename from packages/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
rename to packages/image_picker/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
Binary files differ
diff --git a/packages/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/packages/image_picker/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
similarity index 100%
rename from packages/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
rename to packages/image_picker/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
Binary files differ
diff --git a/packages/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/packages/image_picker/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
similarity index 100%
rename from packages/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
rename to packages/image_picker/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
Binary files differ
diff --git a/packages/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/packages/image_picker/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
similarity index 100%
rename from packages/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
rename to packages/image_picker/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
Binary files differ
diff --git a/packages/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/packages/image_picker/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
similarity index 100%
rename from packages/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
rename to packages/image_picker/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
Binary files differ
diff --git a/packages/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/packages/image_picker/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
similarity index 100%
rename from packages/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
rename to packages/image_picker/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
Binary files differ
diff --git a/packages/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/packages/image_picker/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
similarity index 100%
rename from packages/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
rename to packages/image_picker/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
Binary files differ
diff --git a/packages/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/packages/image_picker/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
similarity index 100%
rename from packages/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
rename to packages/image_picker/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
Binary files differ
diff --git a/packages/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/packages/image_picker/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
similarity index 100%
rename from packages/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
rename to packages/image_picker/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
Binary files differ
diff --git a/packages/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/packages/image_picker/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
similarity index 100%
rename from packages/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
rename to packages/image_picker/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
Binary files differ
diff --git a/packages/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/packages/image_picker/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
similarity index 100%
rename from packages/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
rename to packages/image_picker/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
Binary files differ
diff --git a/packages/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/packages/image_picker/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
similarity index 100%
rename from packages/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
rename to packages/image_picker/image_picker/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
Binary files differ
diff --git a/packages/image_picker/example/ios/Runner/Assets.xcassets/Contents.json b/packages/image_picker/image_picker/example/ios/Runner/Assets.xcassets/Contents.json
similarity index 100%
rename from packages/image_picker/example/ios/Runner/Assets.xcassets/Contents.json
rename to packages/image_picker/image_picker/example/ios/Runner/Assets.xcassets/Contents.json
diff --git a/packages/image_picker/example/ios/Runner/Base.lproj/LaunchScreen.storyboard b/packages/image_picker/image_picker/example/ios/Runner/Base.lproj/LaunchScreen.storyboard
similarity index 100%
rename from packages/image_picker/example/ios/Runner/Base.lproj/LaunchScreen.storyboard
rename to packages/image_picker/image_picker/example/ios/Runner/Base.lproj/LaunchScreen.storyboard
diff --git a/packages/image_picker/example/ios/Runner/Base.lproj/Main.storyboard b/packages/image_picker/image_picker/example/ios/Runner/Base.lproj/Main.storyboard
similarity index 100%
rename from packages/image_picker/example/ios/Runner/Base.lproj/Main.storyboard
rename to packages/image_picker/image_picker/example/ios/Runner/Base.lproj/Main.storyboard
diff --git a/packages/image_picker/example/ios/Runner/Info.plist b/packages/image_picker/image_picker/example/ios/Runner/Info.plist
similarity index 100%
rename from packages/image_picker/example/ios/Runner/Info.plist
rename to packages/image_picker/image_picker/example/ios/Runner/Info.plist
diff --git a/packages/image_picker/example/ios/Runner/main.m b/packages/image_picker/image_picker/example/ios/Runner/main.m
similarity index 100%
rename from packages/image_picker/example/ios/Runner/main.m
rename to packages/image_picker/image_picker/example/ios/Runner/main.m
diff --git a/packages/image_picker/example/ios/TestImages/gifImage.gif b/packages/image_picker/image_picker/example/ios/TestImages/gifImage.gif
similarity index 100%
rename from packages/image_picker/example/ios/TestImages/gifImage.gif
rename to packages/image_picker/image_picker/example/ios/TestImages/gifImage.gif
Binary files differ
diff --git a/packages/image_picker/example/ios/TestImages/jpgImage.jpg b/packages/image_picker/image_picker/example/ios/TestImages/jpgImage.jpg
similarity index 100%
rename from packages/image_picker/example/ios/TestImages/jpgImage.jpg
rename to packages/image_picker/image_picker/example/ios/TestImages/jpgImage.jpg
Binary files differ
diff --git a/packages/image_picker/example/ios/TestImages/pngImage.png b/packages/image_picker/image_picker/example/ios/TestImages/pngImage.png
similarity index 100%
rename from packages/image_picker/example/ios/TestImages/pngImage.png
rename to packages/image_picker/image_picker/example/ios/TestImages/pngImage.png
Binary files differ
diff --git a/packages/image_picker/example/ios/image_picker_exampleTests/Info.plist b/packages/image_picker/image_picker/example/ios/image_picker_exampleTests/Info.plist
similarity index 100%
rename from packages/image_picker/example/ios/image_picker_exampleTests/Info.plist
rename to packages/image_picker/image_picker/example/ios/image_picker_exampleTests/Info.plist
diff --git a/packages/image_picker/example/lib/main.dart b/packages/image_picker/image_picker/example/lib/main.dart
similarity index 100%
rename from packages/image_picker/example/lib/main.dart
rename to packages/image_picker/image_picker/example/lib/main.dart
diff --git a/packages/image_picker/example/pubspec.yaml b/packages/image_picker/image_picker/example/pubspec.yaml
similarity index 100%
rename from packages/image_picker/example/pubspec.yaml
rename to packages/image_picker/image_picker/example/pubspec.yaml
diff --git a/packages/image_picker/example/test_driver/test/image_picker_e2e_test.dart b/packages/image_picker/image_picker/example/test_driver/test/image_picker_e2e_test.dart
similarity index 100%
rename from packages/image_picker/example/test_driver/test/image_picker_e2e_test.dart
rename to packages/image_picker/image_picker/example/test_driver/test/image_picker_e2e_test.dart
diff --git a/packages/image_picker/ios/Assets/.gitkeep b/packages/image_picker/image_picker/ios/Assets/.gitkeep
similarity index 100%
rename from packages/image_picker/ios/Assets/.gitkeep
rename to packages/image_picker/image_picker/ios/Assets/.gitkeep
diff --git a/packages/image_picker/ios/Classes/FLTImagePickerImageUtil.h b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerImageUtil.h
similarity index 100%
rename from packages/image_picker/ios/Classes/FLTImagePickerImageUtil.h
rename to packages/image_picker/image_picker/ios/Classes/FLTImagePickerImageUtil.h
diff --git a/packages/image_picker/ios/Classes/FLTImagePickerImageUtil.m b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerImageUtil.m
similarity index 100%
rename from packages/image_picker/ios/Classes/FLTImagePickerImageUtil.m
rename to packages/image_picker/image_picker/ios/Classes/FLTImagePickerImageUtil.m
diff --git a/packages/image_picker/ios/Classes/FLTImagePickerMetaDataUtil.h b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerMetaDataUtil.h
similarity index 100%
rename from packages/image_picker/ios/Classes/FLTImagePickerMetaDataUtil.h
rename to packages/image_picker/image_picker/ios/Classes/FLTImagePickerMetaDataUtil.h
diff --git a/packages/image_picker/ios/Classes/FLTImagePickerMetaDataUtil.m b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerMetaDataUtil.m
similarity index 100%
rename from packages/image_picker/ios/Classes/FLTImagePickerMetaDataUtil.m
rename to packages/image_picker/image_picker/ios/Classes/FLTImagePickerMetaDataUtil.m
diff --git a/packages/image_picker/ios/Classes/FLTImagePickerPhotoAssetUtil.h b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPhotoAssetUtil.h
similarity index 100%
rename from packages/image_picker/ios/Classes/FLTImagePickerPhotoAssetUtil.h
rename to packages/image_picker/image_picker/ios/Classes/FLTImagePickerPhotoAssetUtil.h
diff --git a/packages/image_picker/ios/Classes/FLTImagePickerPhotoAssetUtil.m b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPhotoAssetUtil.m
similarity index 100%
rename from packages/image_picker/ios/Classes/FLTImagePickerPhotoAssetUtil.m
rename to packages/image_picker/image_picker/ios/Classes/FLTImagePickerPhotoAssetUtil.m
diff --git a/packages/image_picker/ios/Classes/FLTImagePickerPlugin.h b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.h
similarity index 100%
rename from packages/image_picker/ios/Classes/FLTImagePickerPlugin.h
rename to packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.h
diff --git a/packages/image_picker/ios/Classes/FLTImagePickerPlugin.m b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
similarity index 100%
rename from packages/image_picker/ios/Classes/FLTImagePickerPlugin.m
rename to packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
diff --git a/packages/image_picker/ios/Tests/ImagePickerPluginTests.m b/packages/image_picker/image_picker/ios/Tests/ImagePickerPluginTests.m
similarity index 100%
rename from packages/image_picker/ios/Tests/ImagePickerPluginTests.m
rename to packages/image_picker/image_picker/ios/Tests/ImagePickerPluginTests.m
diff --git a/packages/image_picker/ios/Tests/ImagePickerTestImages.h b/packages/image_picker/image_picker/ios/Tests/ImagePickerTestImages.h
similarity index 100%
rename from packages/image_picker/ios/Tests/ImagePickerTestImages.h
rename to packages/image_picker/image_picker/ios/Tests/ImagePickerTestImages.h
diff --git a/packages/image_picker/ios/Tests/ImagePickerTestImages.m b/packages/image_picker/image_picker/ios/Tests/ImagePickerTestImages.m
similarity index 100%
rename from packages/image_picker/ios/Tests/ImagePickerTestImages.m
rename to packages/image_picker/image_picker/ios/Tests/ImagePickerTestImages.m
diff --git a/packages/image_picker/ios/Tests/ImageUtilTests.m b/packages/image_picker/image_picker/ios/Tests/ImageUtilTests.m
similarity index 100%
rename from packages/image_picker/ios/Tests/ImageUtilTests.m
rename to packages/image_picker/image_picker/ios/Tests/ImageUtilTests.m
diff --git a/packages/image_picker/ios/Tests/MetaDataUtilTests.m b/packages/image_picker/image_picker/ios/Tests/MetaDataUtilTests.m
similarity index 100%
rename from packages/image_picker/ios/Tests/MetaDataUtilTests.m
rename to packages/image_picker/image_picker/ios/Tests/MetaDataUtilTests.m
diff --git a/packages/image_picker/ios/Tests/PhotoAssetUtilTests.m b/packages/image_picker/image_picker/ios/Tests/PhotoAssetUtilTests.m
similarity index 100%
rename from packages/image_picker/ios/Tests/PhotoAssetUtilTests.m
rename to packages/image_picker/image_picker/ios/Tests/PhotoAssetUtilTests.m
diff --git a/packages/image_picker/ios/image_picker.podspec b/packages/image_picker/image_picker/ios/image_picker.podspec
similarity index 100%
rename from packages/image_picker/ios/image_picker.podspec
rename to packages/image_picker/image_picker/ios/image_picker.podspec
diff --git a/packages/image_picker/lib/image_picker.dart b/packages/image_picker/image_picker/lib/image_picker.dart
similarity index 100%
rename from packages/image_picker/lib/image_picker.dart
rename to packages/image_picker/image_picker/lib/image_picker.dart
diff --git a/packages/image_picker/pubspec.yaml b/packages/image_picker/image_picker/pubspec.yaml
similarity index 93%
rename from packages/image_picker/pubspec.yaml
rename to packages/image_picker/image_picker/pubspec.yaml
index 02ff283..015474d 100755
--- a/packages/image_picker/pubspec.yaml
+++ b/packages/image_picker/image_picker/pubspec.yaml
@@ -1,8 +1,8 @@
 name: image_picker
 description: Flutter plugin for selecting images from the Android and iOS image
   library, and taking new pictures with the camera.
-homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker
-version: 0.6.5+2
+homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker/image_picker
+version: 0.6.5+3
 
 flutter:
   plugin:
diff --git a/packages/image_picker/test/image_picker_e2e.dart b/packages/image_picker/image_picker/test/image_picker_e2e.dart
similarity index 100%
rename from packages/image_picker/test/image_picker_e2e.dart
rename to packages/image_picker/image_picker/test/image_picker_e2e.dart
diff --git a/packages/image_picker/test/image_picker_test.dart b/packages/image_picker/image_picker/test/image_picker_test.dart
similarity index 100%
rename from packages/image_picker/test/image_picker_test.dart
rename to packages/image_picker/image_picker/test/image_picker_test.dart