diff --git a/packages/battery/CHANGELOG.md b/packages/battery/battery/CHANGELOG.md
similarity index 98%
rename from packages/battery/CHANGELOG.md
rename to packages/battery/battery/CHANGELOG.md
index b45d82ebeaa5..2cf470d17e00 100644
--- a/packages/battery/CHANGELOG.md
+++ b/packages/battery/battery/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.4+1
+
+* Moved everything from battery to battery/battery
+
 ## 1.0.4
 
 * Updated README.md.
diff --git a/packages/battery/LICENSE b/packages/battery/battery/LICENSE
similarity index 100%
rename from packages/battery/LICENSE
rename to packages/battery/battery/LICENSE
diff --git a/packages/battery/README.md b/packages/battery/battery/README.md
similarity index 100%
rename from packages/battery/README.md
rename to packages/battery/battery/README.md
diff --git a/packages/battery/android/build.gradle b/packages/battery/battery/android/build.gradle
similarity index 100%
rename from packages/battery/android/build.gradle
rename to packages/battery/battery/android/build.gradle
diff --git a/packages/battery/android/gradle.properties b/packages/battery/battery/android/gradle.properties
similarity index 100%
rename from packages/battery/android/gradle.properties
rename to packages/battery/battery/android/gradle.properties
diff --git a/packages/battery/android/gradle/wrapper/gradle-wrapper.properties b/packages/battery/battery/android/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from packages/battery/android/gradle/wrapper/gradle-wrapper.properties
rename to packages/battery/battery/android/gradle/wrapper/gradle-wrapper.properties
diff --git a/packages/battery/android/settings.gradle b/packages/battery/battery/android/settings.gradle
similarity index 100%
rename from packages/battery/android/settings.gradle
rename to packages/battery/battery/android/settings.gradle
diff --git a/packages/battery/android/src/main/AndroidManifest.xml b/packages/battery/battery/android/src/main/AndroidManifest.xml
similarity index 100%
rename from packages/battery/android/src/main/AndroidManifest.xml
rename to packages/battery/battery/android/src/main/AndroidManifest.xml
diff --git a/packages/battery/android/src/main/java/io/flutter/plugins/battery/BatteryPlugin.java b/packages/battery/battery/android/src/main/java/io/flutter/plugins/battery/BatteryPlugin.java
similarity index 100%
rename from packages/battery/android/src/main/java/io/flutter/plugins/battery/BatteryPlugin.java
rename to packages/battery/battery/android/src/main/java/io/flutter/plugins/battery/BatteryPlugin.java
diff --git a/packages/battery/example/README.md b/packages/battery/battery/example/README.md
similarity index 100%
rename from packages/battery/example/README.md
rename to packages/battery/battery/example/README.md
diff --git a/packages/battery/example/android/app/build.gradle b/packages/battery/battery/example/android/app/build.gradle
similarity index 100%
rename from packages/battery/example/android/app/build.gradle
rename to packages/battery/battery/example/android/app/build.gradle
diff --git a/packages/battery/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/battery/battery/example/android/app/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from packages/battery/example/android/app/gradle/wrapper/gradle-wrapper.properties
rename to packages/battery/battery/example/android/app/gradle/wrapper/gradle-wrapper.properties
diff --git a/packages/battery/example/android/app/src/androidTest/java/io/flutter/plugins/battery/EmbedderV1ActivityTest.java b/packages/battery/battery/example/android/app/src/androidTest/java/io/flutter/plugins/battery/EmbedderV1ActivityTest.java
similarity index 100%
rename from packages/battery/example/android/app/src/androidTest/java/io/flutter/plugins/battery/EmbedderV1ActivityTest.java
rename to packages/battery/battery/example/android/app/src/androidTest/java/io/flutter/plugins/battery/EmbedderV1ActivityTest.java
diff --git a/packages/battery/example/android/app/src/androidTest/java/io/flutter/plugins/battery/FlutterActivityTest.java b/packages/battery/battery/example/android/app/src/androidTest/java/io/flutter/plugins/battery/FlutterActivityTest.java
similarity index 100%
rename from packages/battery/example/android/app/src/androidTest/java/io/flutter/plugins/battery/FlutterActivityTest.java
rename to packages/battery/battery/example/android/app/src/androidTest/java/io/flutter/plugins/battery/FlutterActivityTest.java
diff --git a/packages/battery/example/android/app/src/main/AndroidManifest.xml b/packages/battery/battery/example/android/app/src/main/AndroidManifest.xml
similarity index 100%
rename from packages/battery/example/android/app/src/main/AndroidManifest.xml
rename to packages/battery/battery/example/android/app/src/main/AndroidManifest.xml
diff --git a/packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java b/packages/battery/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java
similarity index 100%
rename from packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java
rename to packages/battery/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java
diff --git a/packages/battery/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/packages/battery/battery/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from packages/battery/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to packages/battery/battery/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/packages/battery/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/packages/battery/battery/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from packages/battery/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to packages/battery/battery/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/packages/battery/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/packages/battery/battery/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from packages/battery/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to packages/battery/battery/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/packages/battery/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/packages/battery/battery/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from packages/battery/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to packages/battery/battery/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/packages/battery/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/packages/battery/battery/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from packages/battery/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to packages/battery/battery/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/packages/battery/example/android/build.gradle b/packages/battery/battery/example/android/build.gradle
similarity index 100%
rename from packages/battery/example/android/build.gradle
rename to packages/battery/battery/example/android/build.gradle
diff --git a/packages/battery/example/android/gradle.properties b/packages/battery/battery/example/android/gradle.properties
similarity index 100%
rename from packages/battery/example/android/gradle.properties
rename to packages/battery/battery/example/android/gradle.properties
diff --git a/packages/battery/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/battery/battery/example/android/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from packages/battery/example/android/gradle/wrapper/gradle-wrapper.properties
rename to packages/battery/battery/example/android/gradle/wrapper/gradle-wrapper.properties
diff --git a/packages/battery/example/android/settings.gradle b/packages/battery/battery/example/android/settings.gradle
similarity index 100%
rename from packages/battery/example/android/settings.gradle
rename to packages/battery/battery/example/android/settings.gradle
diff --git a/packages/battery/example/ios/Flutter/AppFrameworkInfo.plist b/packages/battery/battery/example/ios/Flutter/AppFrameworkInfo.plist
similarity index 100%
rename from packages/battery/example/ios/Flutter/AppFrameworkInfo.plist
rename to packages/battery/battery/example/ios/Flutter/AppFrameworkInfo.plist
diff --git a/packages/battery/example/ios/Flutter/Debug.xcconfig b/packages/battery/battery/example/ios/Flutter/Debug.xcconfig
similarity index 100%
rename from packages/battery/example/ios/Flutter/Debug.xcconfig
rename to packages/battery/battery/example/ios/Flutter/Debug.xcconfig
diff --git a/packages/battery/example/ios/Flutter/Release.xcconfig b/packages/battery/battery/example/ios/Flutter/Release.xcconfig
similarity index 100%
rename from packages/battery/example/ios/Flutter/Release.xcconfig
rename to packages/battery/battery/example/ios/Flutter/Release.xcconfig
diff --git a/packages/battery/example/ios/Runner.xcodeproj/project.pbxproj b/packages/battery/battery/example/ios/Runner.xcodeproj/project.pbxproj
similarity index 100%
rename from packages/battery/example/ios/Runner.xcodeproj/project.pbxproj
rename to packages/battery/battery/example/ios/Runner.xcodeproj/project.pbxproj
diff --git a/packages/battery/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/packages/battery/battery/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from packages/battery/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
rename to packages/battery/battery/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/packages/battery/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/battery/battery/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
similarity index 100%
rename from packages/battery/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
rename to packages/battery/battery/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
diff --git a/packages/battery/example/ios/Runner.xcworkspace/contents.xcworkspacedata b/packages/battery/battery/example/ios/Runner.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from packages/battery/example/ios/Runner.xcworkspace/contents.xcworkspacedata
rename to packages/battery/battery/example/ios/Runner.xcworkspace/contents.xcworkspacedata
diff --git a/packages/battery/example/ios/Runner/AppDelegate.h b/packages/battery/battery/example/ios/Runner/AppDelegate.h
similarity index 100%
rename from packages/battery/example/ios/Runner/AppDelegate.h
rename to packages/battery/battery/example/ios/Runner/AppDelegate.h
diff --git a/packages/battery/example/ios/Runner/AppDelegate.m b/packages/battery/battery/example/ios/Runner/AppDelegate.m
similarity index 100%
rename from packages/battery/example/ios/Runner/AppDelegate.m
rename to packages/battery/battery/example/ios/Runner/AppDelegate.m
diff --git a/packages/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/packages/battery/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from packages/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to packages/battery/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/packages/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/packages/battery/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
similarity index 100%
rename from packages/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
rename to packages/battery/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
diff --git a/packages/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/packages/battery/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
similarity index 100%
rename from packages/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
rename to packages/battery/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
diff --git a/packages/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/packages/battery/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
similarity index 100%
rename from packages/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
rename to packages/battery/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
diff --git a/packages/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/packages/battery/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
similarity index 100%
rename from packages/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
rename to packages/battery/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
diff --git a/packages/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/packages/battery/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
similarity index 100%
rename from packages/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
rename to packages/battery/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
diff --git a/packages/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/packages/battery/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
similarity index 100%
rename from packages/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
rename to packages/battery/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
diff --git a/packages/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/packages/battery/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
similarity index 100%
rename from packages/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
rename to packages/battery/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
diff --git a/packages/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/packages/battery/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
similarity index 100%
rename from packages/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
rename to packages/battery/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
diff --git a/packages/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/packages/battery/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
similarity index 100%
rename from packages/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
rename to packages/battery/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
diff --git a/packages/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/packages/battery/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
similarity index 100%
rename from packages/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
rename to packages/battery/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
diff --git a/packages/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/packages/battery/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
similarity index 100%
rename from packages/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
rename to packages/battery/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
diff --git a/packages/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/packages/battery/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
similarity index 100%
rename from packages/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
rename to packages/battery/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
diff --git a/packages/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/packages/battery/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
similarity index 100%
rename from packages/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
rename to packages/battery/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
diff --git a/packages/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/packages/battery/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
similarity index 100%
rename from packages/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
rename to packages/battery/battery/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
diff --git a/packages/battery/example/ios/Runner/Base.lproj/LaunchScreen.storyboard b/packages/battery/battery/example/ios/Runner/Base.lproj/LaunchScreen.storyboard
similarity index 100%
rename from packages/battery/example/ios/Runner/Base.lproj/LaunchScreen.storyboard
rename to packages/battery/battery/example/ios/Runner/Base.lproj/LaunchScreen.storyboard
diff --git a/packages/battery/example/ios/Runner/Base.lproj/Main.storyboard b/packages/battery/battery/example/ios/Runner/Base.lproj/Main.storyboard
similarity index 100%
rename from packages/battery/example/ios/Runner/Base.lproj/Main.storyboard
rename to packages/battery/battery/example/ios/Runner/Base.lproj/Main.storyboard
diff --git a/packages/battery/example/ios/Runner/Info.plist b/packages/battery/battery/example/ios/Runner/Info.plist
similarity index 100%
rename from packages/battery/example/ios/Runner/Info.plist
rename to packages/battery/battery/example/ios/Runner/Info.plist
diff --git a/packages/battery/example/ios/Runner/main.m b/packages/battery/battery/example/ios/Runner/main.m
similarity index 100%
rename from packages/battery/example/ios/Runner/main.m
rename to packages/battery/battery/example/ios/Runner/main.m
diff --git a/packages/battery/example/lib/main.dart b/packages/battery/battery/example/lib/main.dart
similarity index 100%
rename from packages/battery/example/lib/main.dart
rename to packages/battery/battery/example/lib/main.dart
diff --git a/packages/battery/example/pubspec.yaml b/packages/battery/battery/example/pubspec.yaml
similarity index 88%
rename from packages/battery/example/pubspec.yaml
rename to packages/battery/battery/example/pubspec.yaml
index 5ec38f6ce5c2..e7a9b1c8b74d 100644
--- a/packages/battery/example/pubspec.yaml
+++ b/packages/battery/battery/example/pubspec.yaml
@@ -11,7 +11,7 @@ dev_dependencies:
   flutter_driver:
     sdk: flutter
   integration_test:
-    path: ../../integration_test
+    path: ../../../integration_test
   pedantic: ^1.8.0
 
 flutter:
diff --git a/packages/battery/ios/Assets/.gitkeep b/packages/battery/battery/ios/Assets/.gitkeep
similarity index 100%
rename from packages/battery/ios/Assets/.gitkeep
rename to packages/battery/battery/ios/Assets/.gitkeep
diff --git a/packages/battery/ios/Classes/FLTBatteryPlugin.h b/packages/battery/battery/ios/Classes/FLTBatteryPlugin.h
similarity index 100%
rename from packages/battery/ios/Classes/FLTBatteryPlugin.h
rename to packages/battery/battery/ios/Classes/FLTBatteryPlugin.h
diff --git a/packages/battery/ios/Classes/FLTBatteryPlugin.m b/packages/battery/battery/ios/Classes/FLTBatteryPlugin.m
similarity index 100%
rename from packages/battery/ios/Classes/FLTBatteryPlugin.m
rename to packages/battery/battery/ios/Classes/FLTBatteryPlugin.m
diff --git a/packages/battery/ios/battery.podspec b/packages/battery/battery/ios/battery.podspec
similarity index 100%
rename from packages/battery/ios/battery.podspec
rename to packages/battery/battery/ios/battery.podspec
diff --git a/packages/battery/lib/battery.dart b/packages/battery/battery/lib/battery.dart
similarity index 100%
rename from packages/battery/lib/battery.dart
rename to packages/battery/battery/lib/battery.dart
diff --git a/packages/battery/pubspec.yaml b/packages/battery/battery/pubspec.yaml
similarity index 90%
rename from packages/battery/pubspec.yaml
rename to packages/battery/battery/pubspec.yaml
index 8363d7a09ee2..5e0549a07f97 100644
--- a/packages/battery/pubspec.yaml
+++ b/packages/battery/battery/pubspec.yaml
@@ -1,8 +1,8 @@
 name: battery
 description: Flutter plugin for accessing information about the battery state
   (full, charging, discharging) on Android and iOS.
-homepage: https://github.com/flutter/plugins/tree/master/packages/battery
-version: 1.0.4
+homepage: https://github.com/flutter/plugins/tree/master/packages/battery/battery
+version: 1.0.4+1
 
 flutter:
   plugin:
@@ -25,7 +25,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   integration_test:
-    path: ../integration_test
+    path: ../../integration_test
   pedantic: ^1.8.0
 
 environment:
diff --git a/packages/battery/test/battery_e2e.dart b/packages/battery/battery/test/battery_e2e.dart
similarity index 100%
rename from packages/battery/test/battery_e2e.dart
rename to packages/battery/battery/test/battery_e2e.dart
diff --git a/packages/battery/test/battery_test.dart b/packages/battery/battery/test/battery_test.dart
similarity index 100%
rename from packages/battery/test/battery_test.dart
rename to packages/battery/battery/test/battery_test.dart
diff --git a/packages/battery/example/android.iml b/packages/battery/example/android.iml
deleted file mode 100644
index 462b903e05b6..000000000000
--- a/packages/battery/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/battery/example/battery_example.iml b/packages/battery/example/battery_example.iml
deleted file mode 100644
index 9d5dae19540c..000000000000
--- a/packages/battery/example/battery_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