diff --git a/rro_overlays/CarrierConfigOverlay/Android.bp b/rro_overlay/CarrierConfigOverlay/Android.bp
similarity index 100%
rename from rro_overlays/CarrierConfigOverlay/Android.bp
rename to rro_overlay/CarrierConfigOverlay/Android.bp
diff --git a/rro_overlays/CarrierConfigOverlay/AndroidManifest.xml b/rro_overlay/CarrierConfigOverlay/AndroidManifest.xml
similarity index 100%
rename from rro_overlays/CarrierConfigOverlay/AndroidManifest.xml
rename to rro_overlay/CarrierConfigOverlay/AndroidManifest.xml
diff --git a/rro_overlays/CarrierConfigOverlay/res/xml/vendor.xml b/rro_overlay/CarrierConfigOverlay/res/xml/vendor.xml
similarity index 100%
rename from rro_overlays/CarrierConfigOverlay/res/xml/vendor.xml
rename to rro_overlay/CarrierConfigOverlay/res/xml/vendor.xml
diff --git a/rro_overlays/DialerOverlay/Android.bp b/rro_overlay/DialerOverlay/Android.bp
similarity index 100%
rename from rro_overlays/DialerOverlay/Android.bp
rename to rro_overlay/DialerOverlay/Android.bp
diff --git a/rro_overlays/DialerOverlay/AndroidManifest.xml b/rro_overlay/DialerOverlay/AndroidManifest.xml
similarity index 100%
rename from rro_overlays/DialerOverlay/AndroidManifest.xml
rename to rro_overlay/DialerOverlay/AndroidManifest.xml
diff --git a/rro_overlays/DialerOverlay/res/values/config.xml b/rro_overlay/DialerOverlay/res/values/config.xml
similarity index 100%
rename from rro_overlays/DialerOverlay/res/values/config.xml
rename to rro_overlay/DialerOverlay/res/values/config.xml
diff --git a/rro_overlays/FrameworksOverlay/Android.bp b/rro_overlay/FrameworksOverlay/Android.bp
similarity index 100%
rename from rro_overlays/FrameworksOverlay/Android.bp
rename to rro_overlay/FrameworksOverlay/Android.bp
diff --git a/rro_overlays/FrameworksOverlay/AndroidManifest.xml b/rro_overlay/FrameworksOverlay/AndroidManifest.xml
similarity index 100%
rename from rro_overlays/FrameworksOverlay/AndroidManifest.xml
rename to rro_overlay/FrameworksOverlay/AndroidManifest.xml
diff --git a/rro_overlays/FrameworksOverlay/res/values-mcc234-mnc15-en-rGB/config.xml b/rro_overlay/FrameworksOverlay/res/values-mcc234-mnc15-en-rGB/config.xml
similarity index 100%
rename from rro_overlays/FrameworksOverlay/res/values-mcc234-mnc15-en-rGB/config.xml
rename to rro_overlay/FrameworksOverlay/res/values-mcc234-mnc15-en-rGB/config.xml
diff --git a/rro_overlays/FrameworksOverlay/res/values-mcc234-mnc15-en-rIN/config.xml b/rro_overlay/FrameworksOverlay/res/values-mcc234-mnc15-en-rIN/config.xml
similarity index 100%
rename from rro_overlays/FrameworksOverlay/res/values-mcc234-mnc15-en-rIN/config.xml
rename to rro_overlay/FrameworksOverlay/res/values-mcc234-mnc15-en-rIN/config.xml
diff --git a/rro_overlays/FrameworksOverlay/res/values-mcc234-mnc15/config.xml b/rro_overlay/FrameworksOverlay/res/values-mcc234-mnc15/config.xml
similarity index 100%
rename from rro_overlays/FrameworksOverlay/res/values-mcc234-mnc15/config.xml
rename to rro_overlay/FrameworksOverlay/res/values-mcc234-mnc15/config.xml
diff --git a/rro_overlays/FrameworksOverlay/res/values-mcc262-mnc02-en-rGB/config.xml b/rro_overlay/FrameworksOverlay/res/values-mcc262-mnc02-en-rGB/config.xml
similarity index 100%
rename from rro_overlays/FrameworksOverlay/res/values-mcc262-mnc02-en-rGB/config.xml
rename to rro_overlay/FrameworksOverlay/res/values-mcc262-mnc02-en-rGB/config.xml
diff --git a/rro_overlays/FrameworksOverlay/res/values-mcc262-mnc02-en-rIN/config.xml b/rro_overlay/FrameworksOverlay/res/values-mcc262-mnc02-en-rIN/config.xml
similarity index 100%
rename from rro_overlays/FrameworksOverlay/res/values-mcc262-mnc02-en-rIN/config.xml
rename to rro_overlay/FrameworksOverlay/res/values-mcc262-mnc02-en-rIN/config.xml
diff --git a/rro_overlays/FrameworksOverlay/res/values-mcc262-mnc02/config.xml b/rro_overlay/FrameworksOverlay/res/values-mcc262-mnc02/config.xml
similarity index 100%
rename from rro_overlays/FrameworksOverlay/res/values-mcc262-mnc02/config.xml
rename to rro_overlay/FrameworksOverlay/res/values-mcc262-mnc02/config.xml
diff --git a/rro_overlays/FrameworksOverlay/res/values-mcc262-mnc04-en-rGB/config.xml b/rro_overlay/FrameworksOverlay/res/values-mcc262-mnc04-en-rGB/config.xml
similarity index 100%
rename from rro_overlays/FrameworksOverlay/res/values-mcc262-mnc04-en-rGB/config.xml
rename to rro_overlay/FrameworksOverlay/res/values-mcc262-mnc04-en-rGB/config.xml
diff --git a/rro_overlays/FrameworksOverlay/res/values-mcc262-mnc04-en-rIN/config.xml b/rro_overlay/FrameworksOverlay/res/values-mcc262-mnc04-en-rIN/config.xml
similarity index 100%
rename from rro_overlays/FrameworksOverlay/res/values-mcc262-mnc04-en-rIN/config.xml
rename to rro_overlay/FrameworksOverlay/res/values-mcc262-mnc04-en-rIN/config.xml
diff --git a/rro_overlays/FrameworksOverlay/res/values-mcc262-mnc04/config.xml b/rro_overlay/FrameworksOverlay/res/values-mcc262-mnc04/config.xml
similarity index 100%
rename from rro_overlays/FrameworksOverlay/res/values-mcc262-mnc04/config.xml
rename to rro_overlay/FrameworksOverlay/res/values-mcc262-mnc04/config.xml
diff --git a/rro_overlays/FrameworksOverlay/res/values-mcc262-mnc09-en-rGB/config.xml b/rro_overlay/FrameworksOverlay/res/values-mcc262-mnc09-en-rGB/config.xml
similarity index 100%
rename from rro_overlays/FrameworksOverlay/res/values-mcc262-mnc09-en-rGB/config.xml
rename to rro_overlay/FrameworksOverlay/res/values-mcc262-mnc09-en-rGB/config.xml
diff --git a/rro_overlays/FrameworksOverlay/res/values-mcc262-mnc09-en-rIN/config.xml b/rro_overlay/FrameworksOverlay/res/values-mcc262-mnc09-en-rIN/config.xml
similarity index 100%
rename from rro_overlays/FrameworksOverlay/res/values-mcc262-mnc09-en-rIN/config.xml
rename to rro_overlay/FrameworksOverlay/res/values-mcc262-mnc09-en-rIN/config.xml
diff --git a/rro_overlays/FrameworksOverlay/res/values-mcc262-mnc09/config.xml b/rro_overlay/FrameworksOverlay/res/values-mcc262-mnc09/config.xml
similarity index 100%
rename from rro_overlays/FrameworksOverlay/res/values-mcc262-mnc09/config.xml
rename to rro_overlay/FrameworksOverlay/res/values-mcc262-mnc09/config.xml
diff --git a/rro_overlays/FrameworksOverlay/res/values-mcc310-mnc004/config.xml b/rro_overlay/FrameworksOverlay/res/values-mcc310-mnc004/config.xml
similarity index 100%
rename from rro_overlays/FrameworksOverlay/res/values-mcc310-mnc004/config.xml
rename to rro_overlay/FrameworksOverlay/res/values-mcc310-mnc004/config.xml
diff --git a/rro_overlays/FrameworksOverlay/res/values-mcc310-mnc120/config.xml b/rro_overlay/FrameworksOverlay/res/values-mcc310-mnc120/config.xml
similarity index 100%
rename from rro_overlays/FrameworksOverlay/res/values-mcc310-mnc120/config.xml
rename to rro_overlay/FrameworksOverlay/res/values-mcc310-mnc120/config.xml
diff --git a/rro_overlays/FrameworksOverlay/res/values-mcc310-mnc260/config.xml b/rro_overlay/FrameworksOverlay/res/values-mcc310-mnc260/config.xml
similarity index 100%
rename from rro_overlays/FrameworksOverlay/res/values-mcc310-mnc260/config.xml
rename to rro_overlay/FrameworksOverlay/res/values-mcc310-mnc260/config.xml
diff --git a/rro_overlays/FrameworksOverlay/res/values-mcc310-mnc410/config.xml b/rro_overlay/FrameworksOverlay/res/values-mcc310-mnc410/config.xml
similarity index 100%
rename from rro_overlays/FrameworksOverlay/res/values-mcc310-mnc410/config.xml
rename to rro_overlay/FrameworksOverlay/res/values-mcc310-mnc410/config.xml
diff --git a/rro_overlays/FrameworksOverlay/res/values-mcc311-mnc480/config.xml b/rro_overlay/FrameworksOverlay/res/values-mcc311-mnc480/config.xml
similarity index 100%
rename from rro_overlays/FrameworksOverlay/res/values-mcc311-mnc480/config.xml
rename to rro_overlay/FrameworksOverlay/res/values-mcc311-mnc480/config.xml
diff --git a/rro_overlays/FrameworksOverlay/res/values-mcc312-mnc530/config.xml b/rro_overlay/FrameworksOverlay/res/values-mcc312-mnc530/config.xml
similarity index 100%
rename from rro_overlays/FrameworksOverlay/res/values-mcc312-mnc530/config.xml
rename to rro_overlay/FrameworksOverlay/res/values-mcc312-mnc530/config.xml
diff --git a/rro_overlays/FrameworksOverlay/res/values-mcc313-mnc100/config.xml b/rro_overlay/FrameworksOverlay/res/values-mcc313-mnc100/config.xml
similarity index 100%
rename from rro_overlays/FrameworksOverlay/res/values-mcc313-mnc100/config.xml
rename to rro_overlay/FrameworksOverlay/res/values-mcc313-mnc100/config.xml
diff --git a/rro_overlays/FrameworksOverlay/res/values-mcc460-mnc03/config.xml b/rro_overlay/FrameworksOverlay/res/values-mcc460-mnc03/config.xml
similarity index 100%
rename from rro_overlays/FrameworksOverlay/res/values-mcc460-mnc03/config.xml
rename to rro_overlay/FrameworksOverlay/res/values-mcc460-mnc03/config.xml
diff --git a/rro_overlays/FrameworksOverlay/res/values-mcc460-mnc11/config.xml b/rro_overlay/FrameworksOverlay/res/values-mcc460-mnc11/config.xml
similarity index 100%
rename from rro_overlays/FrameworksOverlay/res/values-mcc460-mnc11/config.xml
rename to rro_overlay/FrameworksOverlay/res/values-mcc460-mnc11/config.xml
diff --git a/rro_overlays/FrameworksOverlay/res/values/arrow_arrays.xml b/rro_overlay/FrameworksOverlay/res/values/arrow_arrays.xml
similarity index 100%
rename from rro_overlays/FrameworksOverlay/res/values/arrow_arrays.xml
rename to rro_overlay/FrameworksOverlay/res/values/arrow_arrays.xml
diff --git a/rro_overlays/FrameworksOverlay/res/values/arrow_config.xml b/rro_overlay/FrameworksOverlay/res/values/arrow_config.xml
similarity index 100%
rename from rro_overlays/FrameworksOverlay/res/values/arrow_config.xml
rename to rro_overlay/FrameworksOverlay/res/values/arrow_config.xml
diff --git a/rro_overlays/FrameworksOverlay/res/values/config.xml b/rro_overlay/FrameworksOverlay/res/values/config.xml
similarity index 100%
rename from rro_overlays/FrameworksOverlay/res/values/config.xml
rename to rro_overlay/FrameworksOverlay/res/values/config.xml
diff --git a/rro_overlays/FrameworksOverlay/res/values/config_telephony.xml b/rro_overlay/FrameworksOverlay/res/values/config_telephony.xml
similarity index 100%
rename from rro_overlays/FrameworksOverlay/res/values/config_telephony.xml
rename to rro_overlay/FrameworksOverlay/res/values/config_telephony.xml
diff --git a/rro_overlays/FrameworksOverlay/res/values/strings.xml b/rro_overlay/FrameworksOverlay/res/values/strings.xml
similarity index 100%
rename from rro_overlays/FrameworksOverlay/res/values/strings.xml
rename to rro_overlay/FrameworksOverlay/res/values/strings.xml
diff --git a/rro_overlays/SettingsOverlay/Android.bp b/rro_overlay/SettingsOverlay/Android.bp
similarity index 100%
rename from rro_overlays/SettingsOverlay/Android.bp
rename to rro_overlay/SettingsOverlay/Android.bp
diff --git a/rro_overlays/SettingsOverlay/AndroidManifest.xml b/rro_overlay/SettingsOverlay/AndroidManifest.xml
similarity index 100%
rename from rro_overlays/SettingsOverlay/AndroidManifest.xml
rename to rro_overlay/SettingsOverlay/AndroidManifest.xml
diff --git a/rro_overlays/SettingsOverlay/res/values/arrays.xml b/rro_overlay/SettingsOverlay/res/values/arrays.xml
similarity index 100%
rename from rro_overlays/SettingsOverlay/res/values/arrays.xml
rename to rro_overlay/SettingsOverlay/res/values/arrays.xml
diff --git a/rro_overlays/SettingsProviderOverlay/Android.bp b/rro_overlay/SettingsProviderOverlay/Android.bp
similarity index 100%
rename from rro_overlays/SettingsProviderOverlay/Android.bp
rename to rro_overlay/SettingsProviderOverlay/Android.bp
diff --git a/rro_overlays/SettingsProviderOverlay/AndroidManifest.xml b/rro_overlay/SettingsProviderOverlay/AndroidManifest.xml
similarity index 100%
rename from rro_overlays/SettingsProviderOverlay/AndroidManifest.xml
rename to rro_overlay/SettingsProviderOverlay/AndroidManifest.xml
diff --git a/rro_overlays/SettingsProviderOverlay/res/values/defaults.xml b/rro_overlay/SettingsProviderOverlay/res/values/defaults.xml
similarity index 100%
rename from rro_overlays/SettingsProviderOverlay/res/values/defaults.xml
rename to rro_overlay/SettingsProviderOverlay/res/values/defaults.xml
diff --git a/rro_overlays/SystemUIOverlay/Android.bp b/rro_overlay/SystemUIOverlay/Android.bp
similarity index 100%
rename from rro_overlays/SystemUIOverlay/Android.bp
rename to rro_overlay/SystemUIOverlay/Android.bp
diff --git a/rro_overlays/SystemUIOverlay/AndroidManifest.xml b/rro_overlay/SystemUIOverlay/AndroidManifest.xml
similarity index 100%
rename from rro_overlays/SystemUIOverlay/AndroidManifest.xml
rename to rro_overlay/SystemUIOverlay/AndroidManifest.xml
diff --git a/rro_overlays/SystemUIOverlay/res/values-sw600dp/dimens.xml b/rro_overlay/SystemUIOverlay/res/values-sw600dp/dimens.xml
similarity index 100%
rename from rro_overlays/SystemUIOverlay/res/values-sw600dp/dimens.xml
rename to rro_overlay/SystemUIOverlay/res/values-sw600dp/dimens.xml
diff --git a/rro_overlays/SystemUIOverlay/res/values/config.xml b/rro_overlay/SystemUIOverlay/res/values/config.xml
similarity index 100%
rename from rro_overlays/SystemUIOverlay/res/values/config.xml
rename to rro_overlay/SystemUIOverlay/res/values/config.xml
diff --git a/rro_overlays/SystemUIOverlay/res/values/dimens.xml b/rro_overlay/SystemUIOverlay/res/values/dimens.xml
similarity index 100%
rename from rro_overlays/SystemUIOverlay/res/values/dimens.xml
rename to rro_overlay/SystemUIOverlay/res/values/dimens.xml
diff --git a/rro_overlays/TelephonyOverlay/Android.bp b/rro_overlay/TelephonyOverlay/Android.bp
similarity index 100%
rename from rro_overlays/TelephonyOverlay/Android.bp
rename to rro_overlay/TelephonyOverlay/Android.bp
diff --git a/rro_overlays/TelephonyOverlay/AndroidManifest.xml b/rro_overlay/TelephonyOverlay/AndroidManifest.xml
similarity index 100%
rename from rro_overlays/TelephonyOverlay/AndroidManifest.xml
rename to rro_overlay/TelephonyOverlay/AndroidManifest.xml
diff --git a/rro_overlays/TelephonyOverlay/res/values/config.xml b/rro_overlay/TelephonyOverlay/res/values/config.xml
similarity index 100%
rename from rro_overlays/TelephonyOverlay/res/values/config.xml
rename to rro_overlay/TelephonyOverlay/res/values/config.xml
diff --git a/rro_overlays/TelephonyOverlay/res/values/strings.xml b/rro_overlay/TelephonyOverlay/res/values/strings.xml
similarity index 100%
rename from rro_overlays/TelephonyOverlay/res/values/strings.xml
rename to rro_overlay/TelephonyOverlay/res/values/strings.xml
diff --git a/rro_overlays/WifiOverlay/Android.bp b/rro_overlay/WifiOverlay/Android.bp
similarity index 100%
rename from rro_overlays/WifiOverlay/Android.bp
rename to rro_overlay/WifiOverlay/Android.bp
diff --git a/rro_overlays/WifiOverlay/AndroidManifest.xml b/rro_overlay/WifiOverlay/AndroidManifest.xml
similarity index 100%
rename from rro_overlays/WifiOverlay/AndroidManifest.xml
rename to rro_overlay/WifiOverlay/AndroidManifest.xml
diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlay/WifiOverlay/res/values/config.xml
similarity index 100%
rename from rro_overlays/WifiOverlay/res/values/config.xml
rename to rro_overlay/WifiOverlay/res/values/config.xml