diff --git a/resource-overlay/Frameworks/Android.bp b/resource-overlay/device/Frameworks/Android.bp
similarity index 100%
rename from resource-overlay/Frameworks/Android.bp
rename to resource-overlay/device/Frameworks/Android.bp
diff --git a/resource-overlay/Frameworks/AndroidManifest.xml b/resource-overlay/device/Frameworks/AndroidManifest.xml
similarity index 100%
rename from resource-overlay/Frameworks/AndroidManifest.xml
rename to resource-overlay/device/Frameworks/AndroidManifest.xml
diff --git a/resource-overlay/Frameworks/res/values-land/dimens.xml b/resource-overlay/device/Frameworks/res/values-land/dimens.xml
similarity index 100%
rename from resource-overlay/Frameworks/res/values-land/dimens.xml
rename to resource-overlay/device/Frameworks/res/values-land/dimens.xml
diff --git a/resource-overlay/Frameworks/res/values/config.xml b/resource-overlay/device/Frameworks/res/values/config.xml
similarity index 100%
rename from resource-overlay/Frameworks/res/values/config.xml
rename to resource-overlay/device/Frameworks/res/values/config.xml
diff --git a/resource-overlay/Frameworks/res/values/dimens.xml b/resource-overlay/device/Frameworks/res/values/dimens.xml
similarity index 100%
rename from resource-overlay/Frameworks/res/values/dimens.xml
rename to resource-overlay/device/Frameworks/res/values/dimens.xml
diff --git a/resource-overlay/Frameworks/res/xml/power_profile.xml b/resource-overlay/device/Frameworks/res/xml/power_profile.xml
similarity index 100%
rename from resource-overlay/Frameworks/res/xml/power_profile.xml
rename to resource-overlay/device/Frameworks/res/xml/power_profile.xml
diff --git a/resource-overlay/LineageSystemUI/Android.bp b/resource-overlay/device/LineageSystemUI/Android.bp
similarity index 100%
rename from resource-overlay/LineageSystemUI/Android.bp
rename to resource-overlay/device/LineageSystemUI/Android.bp
diff --git a/resource-overlay/LineageSystemUI/AndroidManifest.xml b/resource-overlay/device/LineageSystemUI/AndroidManifest.xml
similarity index 100%
rename from resource-overlay/LineageSystemUI/AndroidManifest.xml
rename to resource-overlay/device/LineageSystemUI/AndroidManifest.xml
diff --git a/resource-overlay/LineageSystemUI/res/values/config.xml b/resource-overlay/device/LineageSystemUI/res/values/config.xml
similarity index 100%
rename from resource-overlay/LineageSystemUI/res/values/config.xml
rename to resource-overlay/device/LineageSystemUI/res/values/config.xml
diff --git a/resource-overlay/SettingsProvider/Android.bp b/resource-overlay/device/SettingsProvider/Android.bp
similarity index 100%
rename from resource-overlay/SettingsProvider/Android.bp
rename to resource-overlay/device/SettingsProvider/Android.bp
diff --git a/resource-overlay/SettingsProvider/AndroidManifest.xml b/resource-overlay/device/SettingsProvider/AndroidManifest.xml
similarity index 100%
rename from resource-overlay/SettingsProvider/AndroidManifest.xml
rename to resource-overlay/device/SettingsProvider/AndroidManifest.xml
diff --git a/resource-overlay/SettingsProvider/res/values/config.xml b/resource-overlay/device/SettingsProvider/res/values/config.xml
similarity index 100%
rename from resource-overlay/SettingsProvider/res/values/config.xml
rename to resource-overlay/device/SettingsProvider/res/values/config.xml
diff --git a/resource-overlay/SystemUI/Android.bp b/resource-overlay/device/SystemUI/Android.bp
similarity index 100%
rename from resource-overlay/SystemUI/Android.bp
rename to resource-overlay/device/SystemUI/Android.bp
diff --git a/resource-overlay/SystemUI/AndroidManifest.xml b/resource-overlay/device/SystemUI/AndroidManifest.xml
similarity index 100%
rename from resource-overlay/SystemUI/AndroidManifest.xml
rename to resource-overlay/device/SystemUI/AndroidManifest.xml
diff --git a/resource-overlay/SystemUI/res/values-land/dimens.xml b/resource-overlay/device/SystemUI/res/values-land/dimens.xml
similarity index 100%
rename from resource-overlay/SystemUI/res/values-land/dimens.xml
rename to resource-overlay/device/SystemUI/res/values-land/dimens.xml
diff --git a/resource-overlay/SystemUI/res/values/dimens.xml b/resource-overlay/device/SystemUI/res/values/dimens.xml
similarity index 100%
rename from resource-overlay/SystemUI/res/values/dimens.xml
rename to resource-overlay/device/SystemUI/res/values/dimens.xml
diff --git a/resource-overlay/SystemUI/res/values/integers.xml b/resource-overlay/device/SystemUI/res/values/integers.xml
similarity index 100%
rename from resource-overlay/SystemUI/res/values/integers.xml
rename to resource-overlay/device/SystemUI/res/values/integers.xml