diff --git a/device/motorola/avatrn/rro_overlays/SettingsProvider/Android.bp b/device/avatrn/rro_overlays/SettingsProvider/Android.bp
similarity index 100%
rename from device/motorola/avatrn/rro_overlays/SettingsProvider/Android.bp
rename to device/avatrn/rro_overlays/SettingsProvider/Android.bp
diff --git a/device/motorola/avatrn/rro_overlays/SettingsProvider/AndroidManifest.xml b/device/avatrn/rro_overlays/SettingsProvider/AndroidManifest.xml
similarity index 100%
rename from device/motorola/avatrn/rro_overlays/SettingsProvider/AndroidManifest.xml
rename to device/avatrn/rro_overlays/SettingsProvider/AndroidManifest.xml
diff --git a/device/motorola/avatrn/rro_overlays/SettingsProvider/res/values/config.xml b/device/avatrn/rro_overlays/SettingsProvider/res/values/config.xml
similarity index 100%
rename from device/motorola/avatrn/rro_overlays/SettingsProvider/res/values/config.xml
rename to device/avatrn/rro_overlays/SettingsProvider/res/values/config.xml
diff --git a/device/motorola/fogo/rro_overlays/SettingsProvider/Android.bp b/device/fogo/rro_overlays/SettingsProvider/Android.bp
similarity index 100%
rename from device/motorola/fogo/rro_overlays/SettingsProvider/Android.bp
rename to device/fogo/rro_overlays/SettingsProvider/Android.bp
diff --git a/device/motorola/fogo/rro_overlays/SettingsProvider/AndroidManifest.xml b/device/fogo/rro_overlays/SettingsProvider/AndroidManifest.xml
similarity index 100%
rename from device/motorola/fogo/rro_overlays/SettingsProvider/AndroidManifest.xml
rename to device/fogo/rro_overlays/SettingsProvider/AndroidManifest.xml
diff --git a/device/motorola/fogo/rro_overlays/SettingsProvider/res/values/config.xml b/device/fogo/rro_overlays/SettingsProvider/res/values/config.xml
similarity index 100%
rename from device/motorola/fogo/rro_overlays/SettingsProvider/res/values/config.xml
rename to device/fogo/rro_overlays/SettingsProvider/res/values/config.xml
diff --git a/device/motorola/fogos/rro_overlays/SettingsProvider/Android.bp b/device/fogos/rro_overlays/SettingsProvider/Android.bp
similarity index 100%
rename from device/motorola/fogos/rro_overlays/SettingsProvider/Android.bp
rename to device/fogos/rro_overlays/SettingsProvider/Android.bp
diff --git a/device/motorola/fogos/rro_overlays/SettingsProvider/AndroidManifest.xml b/device/fogos/rro_overlays/SettingsProvider/AndroidManifest.xml
similarity index 100%
rename from device/motorola/fogos/rro_overlays/SettingsProvider/AndroidManifest.xml
rename to device/fogos/rro_overlays/SettingsProvider/AndroidManifest.xml
diff --git a/device/motorola/fogos/rro_overlays/SettingsProvider/res/values/config.xml b/device/fogos/rro_overlays/SettingsProvider/res/values/config.xml
similarity index 100%
rename from device/motorola/fogos/rro_overlays/SettingsProvider/res/values/config.xml
rename to device/fogos/rro_overlays/SettingsProvider/res/values/config.xml
diff --git a/device/motorola/genevn/rro_overlays/SettingsProvider/Android.bp b/device/genevn/rro_overlays/SettingsProvider/Android.bp
similarity index 100%
rename from device/motorola/genevn/rro_overlays/SettingsProvider/Android.bp
rename to device/genevn/rro_overlays/SettingsProvider/Android.bp
diff --git a/device/motorola/genevn/rro_overlays/SettingsProvider/AndroidManifest.xml b/device/genevn/rro_overlays/SettingsProvider/AndroidManifest.xml
similarity index 100%
rename from device/motorola/genevn/rro_overlays/SettingsProvider/AndroidManifest.xml
rename to device/genevn/rro_overlays/SettingsProvider/AndroidManifest.xml
diff --git a/device/motorola/genevn/rro_overlays/SettingsProvider/res/values/config.xml b/device/genevn/rro_overlays/SettingsProvider/res/values/config.xml
similarity index 100%
rename from device/motorola/genevn/rro_overlays/SettingsProvider/res/values/config.xml
rename to device/genevn/rro_overlays/SettingsProvider/res/values/config.xml
diff --git a/device/motorola/milanf/rro_overlays/SettingsProvider/Android.bp b/device/milanf/rro_overlays/SettingsProvider/Android.bp
similarity index 100%
rename from device/motorola/milanf/rro_overlays/SettingsProvider/Android.bp
rename to device/milanf/rro_overlays/SettingsProvider/Android.bp
diff --git a/device/motorola/milanf/rro_overlays/SettingsProvider/AndroidManifest.xml b/device/milanf/rro_overlays/SettingsProvider/AndroidManifest.xml
similarity index 100%
rename from device/motorola/milanf/rro_overlays/SettingsProvider/AndroidManifest.xml
rename to device/milanf/rro_overlays/SettingsProvider/AndroidManifest.xml
diff --git a/device/motorola/milanf/rro_overlays/SettingsProvider/res/values/config.xml b/device/milanf/rro_overlays/SettingsProvider/res/values/config.xml
similarity index 100%
rename from device/motorola/milanf/rro_overlays/SettingsProvider/res/values/config.xml
rename to device/milanf/rro_overlays/SettingsProvider/res/values/config.xml
diff --git a/device/motorola/rtwo/rro_overlays/SettingsProvider/Android.bp b/device/rtwo/rro_overlays/SettingsProvider/Android.bp
similarity index 100%
rename from device/motorola/rtwo/rro_overlays/SettingsProvider/Android.bp
rename to device/rtwo/rro_overlays/SettingsProvider/Android.bp
diff --git a/device/motorola/rtwo/rro_overlays/SettingsProvider/AndroidManifest.xml b/device/rtwo/rro_overlays/SettingsProvider/AndroidManifest.xml
similarity index 100%
rename from device/motorola/rtwo/rro_overlays/SettingsProvider/AndroidManifest.xml
rename to device/rtwo/rro_overlays/SettingsProvider/AndroidManifest.xml
diff --git a/device/motorola/rtwo/rro_overlays/SettingsProvider/res/values/config.xml b/device/rtwo/rro_overlays/SettingsProvider/res/values/config.xml
similarity index 100%
rename from device/motorola/rtwo/rro_overlays/SettingsProvider/res/values/config.xml
rename to device/rtwo/rro_overlays/SettingsProvider/res/values/config.xml