diff --git a/packages/path_provider/example/android.iml b/packages/path_provider/example/android.iml
deleted file mode 100644
index 462b903..0000000
--- a/packages/path_provider/example/android.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/android">
-      <sourceFolder url="file://$MODULE_DIR$/android/app/src/main/java" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Flutter for Android" level="project" />
-  </component>
-</module>
diff --git a/packages/path_provider/example/path_provider_example.iml b/packages/path_provider/example/path_provider_example.iml
deleted file mode 100644
index 9d5dae1..0000000
--- a/packages/path_provider/example/path_provider_example.iml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="FLUTTER_MODULE_TYPE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.idea" />
-      <excludeFolder url="file://$MODULE_DIR$/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-      <excludeFolder url="file://$MODULE_DIR$/packages" />
-    </content>
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Dart Packages" level="project" />
-    <orderEntry type="library" name="Dart SDK" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/packages/path_provider/CHANGELOG.md b/packages/path_provider/path_provider/CHANGELOG.md
similarity index 97%
rename from packages/path_provider/CHANGELOG.md
rename to packages/path_provider/path_provider/CHANGELOG.md
index ba2d0a9..439c0c5 100644
--- a/packages/path_provider/CHANGELOG.md
+++ b/packages/path_provider/path_provider/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.6.2
+
+* Move package contents into `path_provider` for platform federation.
+
 ## 1.6.1
 
 * Make the pedantic dev_dependency explicit.
diff --git a/packages/path_provider/LICENSE b/packages/path_provider/path_provider/LICENSE
similarity index 100%
rename from packages/path_provider/LICENSE
rename to packages/path_provider/path_provider/LICENSE
diff --git a/packages/path_provider/README.md b/packages/path_provider/path_provider/README.md
similarity index 100%
rename from packages/path_provider/README.md
rename to packages/path_provider/path_provider/README.md
diff --git a/packages/path_provider/android/build.gradle b/packages/path_provider/path_provider/android/build.gradle
similarity index 100%
rename from packages/path_provider/android/build.gradle
rename to packages/path_provider/path_provider/android/build.gradle
diff --git a/packages/path_provider/android/gradle.properties b/packages/path_provider/path_provider/android/gradle.properties
similarity index 100%
rename from packages/path_provider/android/gradle.properties
rename to packages/path_provider/path_provider/android/gradle.properties
diff --git a/packages/path_provider/android/settings.gradle b/packages/path_provider/path_provider/android/settings.gradle
similarity index 100%
rename from packages/path_provider/android/settings.gradle
rename to packages/path_provider/path_provider/android/settings.gradle
diff --git a/packages/path_provider/android/src/main/AndroidManifest.xml b/packages/path_provider/path_provider/android/src/main/AndroidManifest.xml
similarity index 100%
rename from packages/path_provider/android/src/main/AndroidManifest.xml
rename to packages/path_provider/path_provider/android/src/main/AndroidManifest.xml
diff --git a/packages/path_provider/android/src/main/java/io/flutter/plugins/pathprovider/PathProviderPlugin.java b/packages/path_provider/path_provider/android/src/main/java/io/flutter/plugins/pathprovider/PathProviderPlugin.java
similarity index 100%
rename from packages/path_provider/android/src/main/java/io/flutter/plugins/pathprovider/PathProviderPlugin.java
rename to packages/path_provider/path_provider/android/src/main/java/io/flutter/plugins/pathprovider/PathProviderPlugin.java
diff --git a/packages/path_provider/android/src/main/java/io/flutter/plugins/pathprovider/StorageDirectoryMapper.java b/packages/path_provider/path_provider/android/src/main/java/io/flutter/plugins/pathprovider/StorageDirectoryMapper.java
similarity index 100%
rename from packages/path_provider/android/src/main/java/io/flutter/plugins/pathprovider/StorageDirectoryMapper.java
rename to packages/path_provider/path_provider/android/src/main/java/io/flutter/plugins/pathprovider/StorageDirectoryMapper.java
diff --git a/packages/path_provider/android/src/test/java/io/flutter/plugins/pathprovider/StorageDirectoryMapperTest.java b/packages/path_provider/path_provider/android/src/test/java/io/flutter/plugins/pathprovider/StorageDirectoryMapperTest.java
similarity index 100%
rename from packages/path_provider/android/src/test/java/io/flutter/plugins/pathprovider/StorageDirectoryMapperTest.java
rename to packages/path_provider/path_provider/android/src/test/java/io/flutter/plugins/pathprovider/StorageDirectoryMapperTest.java
diff --git a/packages/path_provider/example/README.md b/packages/path_provider/path_provider/example/README.md
similarity index 100%
rename from packages/path_provider/example/README.md
rename to packages/path_provider/path_provider/example/README.md
diff --git a/packages/path_provider/example/android/app/build.gradle b/packages/path_provider/path_provider/example/android/app/build.gradle
similarity index 100%
rename from packages/path_provider/example/android/app/build.gradle
rename to packages/path_provider/path_provider/example/android/app/build.gradle
diff --git a/packages/path_provider/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/path_provider/path_provider/example/android/app/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from packages/path_provider/example/android/app/gradle/wrapper/gradle-wrapper.properties
rename to packages/path_provider/path_provider/example/android/app/gradle/wrapper/gradle-wrapper.properties
diff --git a/packages/path_provider/example/android/app/src/androidTest/java/EmbeddingV1ActivityTest.java b/packages/path_provider/path_provider/example/android/app/src/androidTest/java/EmbeddingV1ActivityTest.java
similarity index 100%
rename from packages/path_provider/example/android/app/src/androidTest/java/EmbeddingV1ActivityTest.java
rename to packages/path_provider/path_provider/example/android/app/src/androidTest/java/EmbeddingV1ActivityTest.java
diff --git a/packages/path_provider/example/android/app/src/androidTest/java/MainActivityTest.java b/packages/path_provider/path_provider/example/android/app/src/androidTest/java/MainActivityTest.java
similarity index 100%
rename from packages/path_provider/example/android/app/src/androidTest/java/MainActivityTest.java
rename to packages/path_provider/path_provider/example/android/app/src/androidTest/java/MainActivityTest.java
diff --git a/packages/path_provider/example/android/app/src/main/AndroidManifest.xml b/packages/path_provider/path_provider/example/android/app/src/main/AndroidManifest.xml
similarity index 100%
rename from packages/path_provider/example/android/app/src/main/AndroidManifest.xml
rename to packages/path_provider/path_provider/example/android/app/src/main/AndroidManifest.xml
diff --git a/packages/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/EmbeddingV1Activity.java b/packages/path_provider/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/EmbeddingV1Activity.java
similarity index 100%
rename from packages/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/EmbeddingV1Activity.java
rename to packages/path_provider/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/EmbeddingV1Activity.java
diff --git a/packages/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/MainActivity.java b/packages/path_provider/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/MainActivity.java
similarity index 100%
rename from packages/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/MainActivity.java
rename to packages/path_provider/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/MainActivity.java
diff --git a/packages/path_provider/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/packages/path_provider/path_provider/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from packages/path_provider/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to packages/path_provider/path_provider/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/packages/path_provider/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/packages/path_provider/path_provider/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from packages/path_provider/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to packages/path_provider/path_provider/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/packages/path_provider/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/packages/path_provider/path_provider/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from packages/path_provider/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to packages/path_provider/path_provider/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/packages/path_provider/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/packages/path_provider/path_provider/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from packages/path_provider/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to packages/path_provider/path_provider/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/packages/path_provider/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/packages/path_provider/path_provider/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from packages/path_provider/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to packages/path_provider/path_provider/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ
diff --git a/packages/path_provider/example/android/build.gradle b/packages/path_provider/path_provider/example/android/build.gradle
similarity index 100%
rename from packages/path_provider/example/android/build.gradle
rename to packages/path_provider/path_provider/example/android/build.gradle
diff --git a/packages/path_provider/example/android/gradle.properties b/packages/path_provider/path_provider/example/android/gradle.properties
similarity index 100%
rename from packages/path_provider/example/android/gradle.properties
rename to packages/path_provider/path_provider/example/android/gradle.properties
diff --git a/packages/path_provider/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/path_provider/path_provider/example/android/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from packages/path_provider/example/android/gradle/wrapper/gradle-wrapper.properties
rename to packages/path_provider/path_provider/example/android/gradle/wrapper/gradle-wrapper.properties
diff --git a/packages/path_provider/example/android/settings.gradle b/packages/path_provider/path_provider/example/android/settings.gradle
similarity index 100%
rename from packages/path_provider/example/android/settings.gradle
rename to packages/path_provider/path_provider/example/android/settings.gradle
diff --git a/packages/path_provider/example/ios/Flutter/AppFrameworkInfo.plist b/packages/path_provider/path_provider/example/ios/Flutter/AppFrameworkInfo.plist
similarity index 100%
rename from packages/path_provider/example/ios/Flutter/AppFrameworkInfo.plist
rename to packages/path_provider/path_provider/example/ios/Flutter/AppFrameworkInfo.plist
diff --git a/packages/path_provider/example/ios/Flutter/Debug.xcconfig b/packages/path_provider/path_provider/example/ios/Flutter/Debug.xcconfig
similarity index 100%
rename from packages/path_provider/example/ios/Flutter/Debug.xcconfig
rename to packages/path_provider/path_provider/example/ios/Flutter/Debug.xcconfig
diff --git a/packages/path_provider/example/ios/Flutter/Release.xcconfig b/packages/path_provider/path_provider/example/ios/Flutter/Release.xcconfig
similarity index 100%
rename from packages/path_provider/example/ios/Flutter/Release.xcconfig
rename to packages/path_provider/path_provider/example/ios/Flutter/Release.xcconfig
diff --git a/packages/path_provider/example/ios/Runner.xcodeproj/project.pbxproj b/packages/path_provider/path_provider/example/ios/Runner.xcodeproj/project.pbxproj
similarity index 100%
rename from packages/path_provider/example/ios/Runner.xcodeproj/project.pbxproj
rename to packages/path_provider/path_provider/example/ios/Runner.xcodeproj/project.pbxproj
diff --git a/packages/path_provider/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/packages/path_provider/path_provider/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from packages/path_provider/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
rename to packages/path_provider/path_provider/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/packages/path_provider/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/path_provider/path_provider/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
similarity index 100%
rename from packages/path_provider/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
rename to packages/path_provider/path_provider/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
diff --git a/packages/path_provider/example/ios/Runner.xcworkspace/contents.xcworkspacedata b/packages/path_provider/path_provider/example/ios/Runner.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from packages/path_provider/example/ios/Runner.xcworkspace/contents.xcworkspacedata
rename to packages/path_provider/path_provider/example/ios/Runner.xcworkspace/contents.xcworkspacedata
diff --git a/packages/path_provider/example/ios/Runner/AppDelegate.h b/packages/path_provider/path_provider/example/ios/Runner/AppDelegate.h
similarity index 100%
rename from packages/path_provider/example/ios/Runner/AppDelegate.h
rename to packages/path_provider/path_provider/example/ios/Runner/AppDelegate.h
diff --git a/packages/path_provider/example/ios/Runner/AppDelegate.m b/packages/path_provider/path_provider/example/ios/Runner/AppDelegate.m
similarity index 100%
rename from packages/path_provider/example/ios/Runner/AppDelegate.m
rename to packages/path_provider/path_provider/example/ios/Runner/AppDelegate.m
diff --git a/packages/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/packages/path_provider/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from packages/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to packages/path_provider/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/packages/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/packages/path_provider/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
similarity index 100%
rename from packages/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
rename to packages/path_provider/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
Binary files differ
diff --git a/packages/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/packages/path_provider/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
similarity index 100%
rename from packages/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
rename to packages/path_provider/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
Binary files differ
diff --git a/packages/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/packages/path_provider/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
similarity index 100%
rename from packages/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
rename to packages/path_provider/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
Binary files differ
diff --git a/packages/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/packages/path_provider/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
similarity index 100%
rename from packages/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
rename to packages/path_provider/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
Binary files differ
diff --git a/packages/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/packages/path_provider/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
similarity index 100%
rename from packages/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
rename to packages/path_provider/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
Binary files differ
diff --git a/packages/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/packages/path_provider/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
similarity index 100%
rename from packages/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
rename to packages/path_provider/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
Binary files differ
diff --git a/packages/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/packages/path_provider/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
similarity index 100%
rename from packages/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
rename to packages/path_provider/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
Binary files differ
diff --git a/packages/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/packages/path_provider/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
similarity index 100%
rename from packages/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
rename to packages/path_provider/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
Binary files differ
diff --git a/packages/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/packages/path_provider/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
similarity index 100%
rename from packages/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
rename to packages/path_provider/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
Binary files differ
diff --git a/packages/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/packages/path_provider/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
similarity index 100%
rename from packages/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
rename to packages/path_provider/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
Binary files differ
diff --git a/packages/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/packages/path_provider/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
similarity index 100%
rename from packages/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
rename to packages/path_provider/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
Binary files differ
diff --git a/packages/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/packages/path_provider/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
similarity index 100%
rename from packages/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
rename to packages/path_provider/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
Binary files differ
diff --git a/packages/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/packages/path_provider/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
similarity index 100%
rename from packages/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
rename to packages/path_provider/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
Binary files differ
diff --git a/packages/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/packages/path_provider/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
similarity index 100%
rename from packages/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
rename to packages/path_provider/path_provider/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
Binary files differ
diff --git a/packages/path_provider/example/ios/Runner/Base.lproj/LaunchScreen.storyboard b/packages/path_provider/path_provider/example/ios/Runner/Base.lproj/LaunchScreen.storyboard
similarity index 100%
rename from packages/path_provider/example/ios/Runner/Base.lproj/LaunchScreen.storyboard
rename to packages/path_provider/path_provider/example/ios/Runner/Base.lproj/LaunchScreen.storyboard
diff --git a/packages/path_provider/example/ios/Runner/Base.lproj/Main.storyboard b/packages/path_provider/path_provider/example/ios/Runner/Base.lproj/Main.storyboard
similarity index 100%
rename from packages/path_provider/example/ios/Runner/Base.lproj/Main.storyboard
rename to packages/path_provider/path_provider/example/ios/Runner/Base.lproj/Main.storyboard
diff --git a/packages/path_provider/example/ios/Runner/Info.plist b/packages/path_provider/path_provider/example/ios/Runner/Info.plist
similarity index 100%
rename from packages/path_provider/example/ios/Runner/Info.plist
rename to packages/path_provider/path_provider/example/ios/Runner/Info.plist
diff --git a/packages/path_provider/example/ios/Runner/main.m b/packages/path_provider/path_provider/example/ios/Runner/main.m
similarity index 100%
rename from packages/path_provider/example/ios/Runner/main.m
rename to packages/path_provider/path_provider/example/ios/Runner/main.m
diff --git a/packages/path_provider/example/lib/main.dart b/packages/path_provider/path_provider/example/lib/main.dart
similarity index 100%
rename from packages/path_provider/example/lib/main.dart
rename to packages/path_provider/path_provider/example/lib/main.dart
diff --git a/packages/path_provider/example/macos/Flutter/Flutter-Debug.xcconfig b/packages/path_provider/path_provider/example/macos/Flutter/Flutter-Debug.xcconfig
similarity index 100%
rename from packages/path_provider/example/macos/Flutter/Flutter-Debug.xcconfig
rename to packages/path_provider/path_provider/example/macos/Flutter/Flutter-Debug.xcconfig
diff --git a/packages/path_provider/example/macos/Flutter/Flutter-Release.xcconfig b/packages/path_provider/path_provider/example/macos/Flutter/Flutter-Release.xcconfig
similarity index 100%
rename from packages/path_provider/example/macos/Flutter/Flutter-Release.xcconfig
rename to packages/path_provider/path_provider/example/macos/Flutter/Flutter-Release.xcconfig
diff --git a/packages/path_provider/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/path_provider/path_provider/example/macos/Flutter/GeneratedPluginRegistrant.swift
similarity index 100%
rename from packages/path_provider/example/macos/Flutter/GeneratedPluginRegistrant.swift
rename to packages/path_provider/path_provider/example/macos/Flutter/GeneratedPluginRegistrant.swift
diff --git a/packages/path_provider/example/macos/Runner.xcodeproj/project.pbxproj b/packages/path_provider/path_provider/example/macos/Runner.xcodeproj/project.pbxproj
similarity index 100%
rename from packages/path_provider/example/macos/Runner.xcodeproj/project.pbxproj
rename to packages/path_provider/path_provider/example/macos/Runner.xcodeproj/project.pbxproj
diff --git a/packages/path_provider/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/path_provider/path_provider/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
similarity index 100%
rename from packages/path_provider/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
rename to packages/path_provider/path_provider/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
diff --git a/packages/path_provider/example/macos/Runner.xcworkspace/contents.xcworkspacedata b/packages/path_provider/path_provider/example/macos/Runner.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from packages/path_provider/example/macos/Runner.xcworkspace/contents.xcworkspacedata
rename to packages/path_provider/path_provider/example/macos/Runner.xcworkspace/contents.xcworkspacedata
diff --git a/packages/path_provider/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/path_provider/path_provider/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
similarity index 100%
rename from packages/path_provider/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
rename to packages/path_provider/path_provider/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/packages/path_provider/example/macos/Runner/AppDelegate.swift b/packages/path_provider/path_provider/example/macos/Runner/AppDelegate.swift
similarity index 100%
rename from packages/path_provider/example/macos/Runner/AppDelegate.swift
rename to packages/path_provider/path_provider/example/macos/Runner/AppDelegate.swift
diff --git a/packages/path_provider/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/packages/path_provider/path_provider/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from packages/path_provider/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to packages/path_provider/path_provider/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/packages/path_provider/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/packages/path_provider/path_provider/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png
similarity index 100%
rename from packages/path_provider/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png
rename to packages/path_provider/path_provider/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png
Binary files differ
diff --git a/packages/path_provider/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/packages/path_provider/path_provider/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png
similarity index 100%
rename from packages/path_provider/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png
rename to packages/path_provider/path_provider/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png
Binary files differ
diff --git a/packages/path_provider/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/packages/path_provider/path_provider/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png
similarity index 100%
rename from packages/path_provider/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png
rename to packages/path_provider/path_provider/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png
Binary files differ
diff --git a/packages/path_provider/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/packages/path_provider/path_provider/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png
similarity index 100%
rename from packages/path_provider/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png
rename to packages/path_provider/path_provider/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png
Binary files differ
diff --git a/packages/path_provider/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/packages/path_provider/path_provider/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png
similarity index 100%
rename from packages/path_provider/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png
rename to packages/path_provider/path_provider/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png
Binary files differ
diff --git a/packages/path_provider/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/packages/path_provider/path_provider/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png
similarity index 100%
rename from packages/path_provider/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png
rename to packages/path_provider/path_provider/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png
Binary files differ
diff --git a/packages/path_provider/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/packages/path_provider/path_provider/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png
similarity index 100%
rename from packages/path_provider/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png
rename to packages/path_provider/path_provider/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png
Binary files differ
diff --git a/packages/path_provider/example/macos/Runner/Base.lproj/MainMenu.xib b/packages/path_provider/path_provider/example/macos/Runner/Base.lproj/MainMenu.xib
similarity index 100%
rename from packages/path_provider/example/macos/Runner/Base.lproj/MainMenu.xib
rename to packages/path_provider/path_provider/example/macos/Runner/Base.lproj/MainMenu.xib
diff --git a/packages/path_provider/example/macos/Runner/Configs/AppInfo.xcconfig b/packages/path_provider/path_provider/example/macos/Runner/Configs/AppInfo.xcconfig
similarity index 100%
rename from packages/path_provider/example/macos/Runner/Configs/AppInfo.xcconfig
rename to packages/path_provider/path_provider/example/macos/Runner/Configs/AppInfo.xcconfig
diff --git a/packages/path_provider/example/macos/Runner/Configs/Debug.xcconfig b/packages/path_provider/path_provider/example/macos/Runner/Configs/Debug.xcconfig
similarity index 100%
rename from packages/path_provider/example/macos/Runner/Configs/Debug.xcconfig
rename to packages/path_provider/path_provider/example/macos/Runner/Configs/Debug.xcconfig
diff --git a/packages/path_provider/example/macos/Runner/Configs/Release.xcconfig b/packages/path_provider/path_provider/example/macos/Runner/Configs/Release.xcconfig
similarity index 100%
rename from packages/path_provider/example/macos/Runner/Configs/Release.xcconfig
rename to packages/path_provider/path_provider/example/macos/Runner/Configs/Release.xcconfig
diff --git a/packages/path_provider/example/macos/Runner/Configs/Warnings.xcconfig b/packages/path_provider/path_provider/example/macos/Runner/Configs/Warnings.xcconfig
similarity index 100%
rename from packages/path_provider/example/macos/Runner/Configs/Warnings.xcconfig
rename to packages/path_provider/path_provider/example/macos/Runner/Configs/Warnings.xcconfig
diff --git a/packages/path_provider/example/macos/Runner/DebugProfile.entitlements b/packages/path_provider/path_provider/example/macos/Runner/DebugProfile.entitlements
similarity index 100%
rename from packages/path_provider/example/macos/Runner/DebugProfile.entitlements
rename to packages/path_provider/path_provider/example/macos/Runner/DebugProfile.entitlements
diff --git a/packages/path_provider/example/macos/Runner/Info.plist b/packages/path_provider/path_provider/example/macos/Runner/Info.plist
similarity index 100%
rename from packages/path_provider/example/macos/Runner/Info.plist
rename to packages/path_provider/path_provider/example/macos/Runner/Info.plist
diff --git a/packages/path_provider/example/macos/Runner/MainFlutterWindow.swift b/packages/path_provider/path_provider/example/macos/Runner/MainFlutterWindow.swift
similarity index 100%
rename from packages/path_provider/example/macos/Runner/MainFlutterWindow.swift
rename to packages/path_provider/path_provider/example/macos/Runner/MainFlutterWindow.swift
diff --git a/packages/path_provider/example/macos/Runner/Release.entitlements b/packages/path_provider/path_provider/example/macos/Runner/Release.entitlements
similarity index 100%
rename from packages/path_provider/example/macos/Runner/Release.entitlements
rename to packages/path_provider/path_provider/example/macos/Runner/Release.entitlements
diff --git a/packages/path_provider/example/pubspec.yaml b/packages/path_provider/path_provider/example/pubspec.yaml
similarity index 89%
rename from packages/path_provider/example/pubspec.yaml
rename to packages/path_provider/path_provider/example/pubspec.yaml
index fd4c24e..a82bc6e 100644
--- a/packages/path_provider/example/pubspec.yaml
+++ b/packages/path_provider/path_provider/example/pubspec.yaml
@@ -7,7 +7,7 @@
   path_provider:
     path: ../
   path_provider_macos:
-    path: ../path_provider_macos
+    path: ../../path_provider_macos
 
 dev_dependencies:
   e2e: ^0.2.1
diff --git a/packages/path_provider/example/test_driver/path_provider_e2e.dart b/packages/path_provider/path_provider/example/test_driver/path_provider_e2e.dart
similarity index 100%
rename from packages/path_provider/example/test_driver/path_provider_e2e.dart
rename to packages/path_provider/path_provider/example/test_driver/path_provider_e2e.dart
diff --git a/packages/path_provider/example/test_driver/path_provider_e2e_test.dart b/packages/path_provider/path_provider/example/test_driver/path_provider_e2e_test.dart
similarity index 100%
rename from packages/path_provider/example/test_driver/path_provider_e2e_test.dart
rename to packages/path_provider/path_provider/example/test_driver/path_provider_e2e_test.dart
diff --git a/packages/path_provider/ios/Assets/.gitkeep b/packages/path_provider/path_provider/ios/Assets/.gitkeep
similarity index 100%
rename from packages/path_provider/ios/Assets/.gitkeep
rename to packages/path_provider/path_provider/ios/Assets/.gitkeep
diff --git a/packages/path_provider/ios/Classes/FLTPathProviderPlugin.h b/packages/path_provider/path_provider/ios/Classes/FLTPathProviderPlugin.h
similarity index 100%
rename from packages/path_provider/ios/Classes/FLTPathProviderPlugin.h
rename to packages/path_provider/path_provider/ios/Classes/FLTPathProviderPlugin.h
diff --git a/packages/path_provider/ios/Classes/FLTPathProviderPlugin.m b/packages/path_provider/path_provider/ios/Classes/FLTPathProviderPlugin.m
similarity index 100%
rename from packages/path_provider/ios/Classes/FLTPathProviderPlugin.m
rename to packages/path_provider/path_provider/ios/Classes/FLTPathProviderPlugin.m
diff --git a/packages/path_provider/ios/path_provider.podspec b/packages/path_provider/path_provider/ios/path_provider.podspec
similarity index 100%
rename from packages/path_provider/ios/path_provider.podspec
rename to packages/path_provider/path_provider/ios/path_provider.podspec
diff --git a/packages/path_provider/lib/path_provider.dart b/packages/path_provider/path_provider/lib/path_provider.dart
similarity index 100%
rename from packages/path_provider/lib/path_provider.dart
rename to packages/path_provider/path_provider/lib/path_provider.dart
diff --git a/packages/path_provider/pubspec.yaml b/packages/path_provider/path_provider/pubspec.yaml
similarity index 93%
rename from packages/path_provider/pubspec.yaml
rename to packages/path_provider/path_provider/pubspec.yaml
index 0b39451..df26c5e 100644
--- a/packages/path_provider/pubspec.yaml
+++ b/packages/path_provider/path_provider/pubspec.yaml
@@ -1,8 +1,8 @@
 name: path_provider
 description: Flutter plugin for getting commonly used locations on the Android &
   iOS file systems, such as the temp and app data directories.
-homepage: https://github.com/flutter/plugins/tree/master/packages/path_provider
-version: 1.6.1
+homepage: https://github.com/flutter/plugins/tree/master/packages/path_provider/path_provider
+version: 1.6.2
 
 flutter:
   plugin:
diff --git a/packages/path_provider/test/path_provider_e2e.dart b/packages/path_provider/path_provider/test/path_provider_e2e.dart
similarity index 100%
rename from packages/path_provider/test/path_provider_e2e.dart
rename to packages/path_provider/path_provider/test/path_provider_e2e.dart
diff --git a/packages/path_provider/test/path_provider_test.dart b/packages/path_provider/path_provider/test/path_provider_test.dart
similarity index 100%
rename from packages/path_provider/test/path_provider_test.dart
rename to packages/path_provider/path_provider/test/path_provider_test.dart
diff --git a/packages/path_provider/path_provider_macos/lib/path_provider_macos.dart b/packages/path_provider/path_provider_macos/lib/path_provider_macos.dart
new file mode 100644
index 0000000..cf440b2
--- /dev/null
+++ b/packages/path_provider/path_provider_macos/lib/path_provider_macos.dart
@@ -0,0 +1,3 @@
+// Analyze will fail if there is no main.dart file. This file should
+// be removed once an example app has been added to path_provider_macos.
+// https://github.com/flutter/flutter/issues/51007