diff --git a/powerstats/aidl/Android.bp b/power/stats/aidl/Android.bp
similarity index 100%
rename from powerstats/aidl/Android.bp
rename to power/stats/aidl/Android.bp
diff --git a/powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/ChannelInfo.aidl b/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/ChannelInfo.aidl
similarity index 100%
rename from powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/ChannelInfo.aidl
rename to power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/ChannelInfo.aidl
diff --git a/powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyConsumerId.aidl b/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyConsumerId.aidl
similarity index 100%
rename from powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyConsumerId.aidl
rename to power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyConsumerId.aidl
diff --git a/powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyConsumerResult.aidl b/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyConsumerResult.aidl
similarity index 100%
rename from powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyConsumerResult.aidl
rename to power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyConsumerResult.aidl
diff --git a/powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyMeasurement.aidl b/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyMeasurement.aidl
similarity index 100%
rename from powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyMeasurement.aidl
rename to power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyMeasurement.aidl
diff --git a/powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/IPowerStats.aidl b/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/IPowerStats.aidl
similarity index 100%
rename from powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/IPowerStats.aidl
rename to power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/IPowerStats.aidl
diff --git a/powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/PowerEntityInfo.aidl b/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/PowerEntityInfo.aidl
similarity index 100%
rename from powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/PowerEntityInfo.aidl
rename to power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/PowerEntityInfo.aidl
diff --git a/powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateInfo.aidl b/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateInfo.aidl
similarity index 100%
rename from powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateInfo.aidl
rename to power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateInfo.aidl
diff --git a/powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateResidency.aidl b/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateResidency.aidl
similarity index 100%
rename from powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateResidency.aidl
rename to power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateResidency.aidl
diff --git a/powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateResidencyResult.aidl b/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateResidencyResult.aidl
similarity index 100%
rename from powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateResidencyResult.aidl
rename to power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateResidencyResult.aidl
diff --git a/powerstats/aidl/android/hardware/powerstats/ChannelInfo.aidl b/power/stats/aidl/android/hardware/powerstats/ChannelInfo.aidl
similarity index 100%
rename from powerstats/aidl/android/hardware/powerstats/ChannelInfo.aidl
rename to power/stats/aidl/android/hardware/powerstats/ChannelInfo.aidl
diff --git a/powerstats/aidl/android/hardware/powerstats/EnergyConsumerId.aidl b/power/stats/aidl/android/hardware/powerstats/EnergyConsumerId.aidl
similarity index 100%
rename from powerstats/aidl/android/hardware/powerstats/EnergyConsumerId.aidl
rename to power/stats/aidl/android/hardware/powerstats/EnergyConsumerId.aidl
diff --git a/powerstats/aidl/android/hardware/powerstats/EnergyConsumerResult.aidl b/power/stats/aidl/android/hardware/powerstats/EnergyConsumerResult.aidl
similarity index 100%
rename from powerstats/aidl/android/hardware/powerstats/EnergyConsumerResult.aidl
rename to power/stats/aidl/android/hardware/powerstats/EnergyConsumerResult.aidl
diff --git a/powerstats/aidl/android/hardware/powerstats/EnergyMeasurement.aidl b/power/stats/aidl/android/hardware/powerstats/EnergyMeasurement.aidl
similarity index 100%
rename from powerstats/aidl/android/hardware/powerstats/EnergyMeasurement.aidl
rename to power/stats/aidl/android/hardware/powerstats/EnergyMeasurement.aidl
diff --git a/powerstats/aidl/android/hardware/powerstats/IPowerStats.aidl b/power/stats/aidl/android/hardware/powerstats/IPowerStats.aidl
similarity index 100%
rename from powerstats/aidl/android/hardware/powerstats/IPowerStats.aidl
rename to power/stats/aidl/android/hardware/powerstats/IPowerStats.aidl
diff --git a/powerstats/aidl/android/hardware/powerstats/PowerEntityInfo.aidl b/power/stats/aidl/android/hardware/powerstats/PowerEntityInfo.aidl
similarity index 100%
rename from powerstats/aidl/android/hardware/powerstats/PowerEntityInfo.aidl
rename to power/stats/aidl/android/hardware/powerstats/PowerEntityInfo.aidl
diff --git a/powerstats/aidl/android/hardware/powerstats/StateInfo.aidl b/power/stats/aidl/android/hardware/powerstats/StateInfo.aidl
similarity index 100%
rename from powerstats/aidl/android/hardware/powerstats/StateInfo.aidl
rename to power/stats/aidl/android/hardware/powerstats/StateInfo.aidl
diff --git a/powerstats/aidl/android/hardware/powerstats/StateResidency.aidl b/power/stats/aidl/android/hardware/powerstats/StateResidency.aidl
similarity index 100%
rename from powerstats/aidl/android/hardware/powerstats/StateResidency.aidl
rename to power/stats/aidl/android/hardware/powerstats/StateResidency.aidl
diff --git a/powerstats/aidl/android/hardware/powerstats/StateResidencyResult.aidl b/power/stats/aidl/android/hardware/powerstats/StateResidencyResult.aidl
similarity index 100%
rename from powerstats/aidl/android/hardware/powerstats/StateResidencyResult.aidl
rename to power/stats/aidl/android/hardware/powerstats/StateResidencyResult.aidl
diff --git a/powerstats/aidl/default/Android.bp b/power/stats/aidl/default/Android.bp
similarity index 100%
rename from powerstats/aidl/default/Android.bp
rename to power/stats/aidl/default/Android.bp
diff --git a/powerstats/aidl/default/PowerStats.cpp b/power/stats/aidl/default/PowerStats.cpp
similarity index 100%
rename from powerstats/aidl/default/PowerStats.cpp
rename to power/stats/aidl/default/PowerStats.cpp
diff --git a/powerstats/aidl/default/PowerStats.h b/power/stats/aidl/default/PowerStats.h
similarity index 100%
rename from powerstats/aidl/default/PowerStats.h
rename to power/stats/aidl/default/PowerStats.h
diff --git a/powerstats/aidl/default/main.cpp b/power/stats/aidl/default/main.cpp
similarity index 100%
rename from powerstats/aidl/default/main.cpp
rename to power/stats/aidl/default/main.cpp
diff --git a/powerstats/aidl/default/powerstats-default.rc b/power/stats/aidl/default/powerstats-default.rc
similarity index 100%
rename from powerstats/aidl/default/powerstats-default.rc
rename to power/stats/aidl/default/powerstats-default.rc
diff --git a/powerstats/aidl/default/powerstats-default.xml b/power/stats/aidl/default/powerstats-default.xml
similarity index 100%
rename from powerstats/aidl/default/powerstats-default.xml
rename to power/stats/aidl/default/powerstats-default.xml
diff --git a/powerstats/aidl/vts/Android.bp b/power/stats/aidl/vts/Android.bp
similarity index 100%
rename from powerstats/aidl/vts/Android.bp
rename to power/stats/aidl/vts/Android.bp
diff --git a/powerstats/aidl/vts/VtsHalPowerStatsTargetTest.cpp b/power/stats/aidl/vts/VtsHalPowerStatsTargetTest.cpp
similarity index 100%
rename from powerstats/aidl/vts/VtsHalPowerStatsTargetTest.cpp
rename to power/stats/aidl/vts/VtsHalPowerStatsTargetTest.cpp