diff --git a/rro_overlays/CloverFrameworksOverlay/Android.bp b/rro_overlay/CloverFrameworksOverlay/Android.bp
similarity index 100%
rename from rro_overlays/CloverFrameworksOverlay/Android.bp
rename to rro_overlay/CloverFrameworksOverlay/Android.bp
diff --git a/rro_overlays/CloverFrameworksOverlay/AndroidManifest.xml b/rro_overlay/CloverFrameworksOverlay/AndroidManifest.xml
similarity index 100%
rename from rro_overlays/CloverFrameworksOverlay/AndroidManifest.xml
rename to rro_overlay/CloverFrameworksOverlay/AndroidManifest.xml
diff --git a/rro_overlays/CloverFrameworksOverlay/res/values/config.xml b/rro_overlay/CloverFrameworksOverlay/res/values/config.xml
similarity index 100%
rename from rro_overlays/CloverFrameworksOverlay/res/values/config.xml
rename to rro_overlay/CloverFrameworksOverlay/res/values/config.xml
diff --git a/rro_overlays/CloverFrameworksOverlay/res/values/dimens.xml b/rro_overlay/CloverFrameworksOverlay/res/values/dimens.xml
similarity index 100%
rename from rro_overlays/CloverFrameworksOverlay/res/values/dimens.xml
rename to rro_overlay/CloverFrameworksOverlay/res/values/dimens.xml
diff --git a/rro_overlays/CloverFrameworksOverlay/res/xml/power_profile.xml b/rro_overlay/CloverFrameworksOverlay/res/xml/power_profile.xml
similarity index 100%
rename from rro_overlays/CloverFrameworksOverlay/res/xml/power_profile.xml
rename to rro_overlay/CloverFrameworksOverlay/res/xml/power_profile.xml
diff --git a/rro_overlays/CloverSystemUIOverlay/Android.bp b/rro_overlay/CloverSystemUIOverlay/Android.bp
similarity index 100%
rename from rro_overlays/CloverSystemUIOverlay/Android.bp
rename to rro_overlay/CloverSystemUIOverlay/Android.bp
diff --git a/rro_overlays/CloverSystemUIOverlay/AndroidManifest.xml b/rro_overlay/CloverSystemUIOverlay/AndroidManifest.xml
similarity index 100%
rename from rro_overlays/CloverSystemUIOverlay/AndroidManifest.xml
rename to rro_overlay/CloverSystemUIOverlay/AndroidManifest.xml
diff --git a/rro_overlays/CloverSystemUIOverlay/res/drawable/rounded.xml b/rro_overlay/CloverSystemUIOverlay/res/drawable/rounded.xml
similarity index 100%
rename from rro_overlays/CloverSystemUIOverlay/res/drawable/rounded.xml
rename to rro_overlay/CloverSystemUIOverlay/res/drawable/rounded.xml
diff --git a/rro_overlays/CloverSystemUIOverlay/res/drawable/rounded_corner_bottom.xml b/rro_overlay/CloverSystemUIOverlay/res/drawable/rounded_corner_bottom.xml
similarity index 100%
rename from rro_overlays/CloverSystemUIOverlay/res/drawable/rounded_corner_bottom.xml
rename to rro_overlay/CloverSystemUIOverlay/res/drawable/rounded_corner_bottom.xml
diff --git a/rro_overlays/CloverSystemUIOverlay/res/drawable/rounded_corner_top.xml b/rro_overlay/CloverSystemUIOverlay/res/drawable/rounded_corner_top.xml
similarity index 100%
rename from rro_overlays/CloverSystemUIOverlay/res/drawable/rounded_corner_top.xml
rename to rro_overlay/CloverSystemUIOverlay/res/drawable/rounded_corner_top.xml
diff --git a/rro_overlays/CloverWifiOverlay/Android.bp b/rro_overlay/CloverWifiOverlay/Android.bp
similarity index 100%
rename from rro_overlays/CloverWifiOverlay/Android.bp
rename to rro_overlay/CloverWifiOverlay/Android.bp
diff --git a/rro_overlays/CloverWifiOverlay/AndroidManifest.xml b/rro_overlay/CloverWifiOverlay/AndroidManifest.xml
similarity index 100%
rename from rro_overlays/CloverWifiOverlay/AndroidManifest.xml
rename to rro_overlay/CloverWifiOverlay/AndroidManifest.xml
diff --git a/rro_overlays/CloverWifiOverlay/res/values/config.xml b/rro_overlay/CloverWifiOverlay/res/values/config.xml
similarity index 100%
rename from rro_overlays/CloverWifiOverlay/res/values/config.xml
rename to rro_overlay/CloverWifiOverlay/res/values/config.xml