diff --git a/BoardConfig.mk b/BoardConfig.mk
index 7d9d5c7..3c0df06 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -23,7 +23,7 @@ include device/motorola/sm7325-common/BoardConfigCommon.mk
 TARGET_BOOTLOADER_BOARD_NAME := berlin
 
 # HIDL
-DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest_berlin.xml
+DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest.xml
 
 # Kernel
 BOARD_KERNEL_CMDLINE += androidboot.hab.product=berlin
diff --git a/manifest_berlin.xml b/manifest.xml
similarity index 100%
rename from manifest_berlin.xml
rename to manifest.xml
diff --git a/resource-overlay/berlin/Frameworks/Android.bp b/resource-overlay/Frameworks/Android.bp
similarity index 100%
rename from resource-overlay/berlin/Frameworks/Android.bp
rename to resource-overlay/Frameworks/Android.bp
diff --git a/resource-overlay/berlin/Frameworks/AndroidManifest.xml b/resource-overlay/Frameworks/AndroidManifest.xml
similarity index 100%
rename from resource-overlay/berlin/Frameworks/AndroidManifest.xml
rename to resource-overlay/Frameworks/AndroidManifest.xml
diff --git a/resource-overlay/berlin/Frameworks/res/values-land/dimens.xml b/resource-overlay/Frameworks/res/values-land/dimens.xml
similarity index 100%
rename from resource-overlay/berlin/Frameworks/res/values-land/dimens.xml
rename to resource-overlay/Frameworks/res/values-land/dimens.xml
diff --git a/resource-overlay/berlin/Frameworks/res/values/config.xml b/resource-overlay/Frameworks/res/values/config.xml
similarity index 100%
rename from resource-overlay/berlin/Frameworks/res/values/config.xml
rename to resource-overlay/Frameworks/res/values/config.xml
diff --git a/resource-overlay/berlin/Frameworks/res/values/dimens.xml b/resource-overlay/Frameworks/res/values/dimens.xml
similarity index 100%
rename from resource-overlay/berlin/Frameworks/res/values/dimens.xml
rename to resource-overlay/Frameworks/res/values/dimens.xml
diff --git a/resource-overlay/berlin/Frameworks/res/xml/power_profile.xml b/resource-overlay/Frameworks/res/xml/power_profile.xml
similarity index 100%
rename from resource-overlay/berlin/Frameworks/res/xml/power_profile.xml
rename to resource-overlay/Frameworks/res/xml/power_profile.xml
diff --git a/resource-overlay/berlin/LineageSystemUI/Android.bp b/resource-overlay/LineageSystemUI/Android.bp
similarity index 100%
rename from resource-overlay/berlin/LineageSystemUI/Android.bp
rename to resource-overlay/LineageSystemUI/Android.bp
diff --git a/resource-overlay/berlin/LineageSystemUI/AndroidManifest.xml b/resource-overlay/LineageSystemUI/AndroidManifest.xml
similarity index 100%
rename from resource-overlay/berlin/LineageSystemUI/AndroidManifest.xml
rename to resource-overlay/LineageSystemUI/AndroidManifest.xml
diff --git a/resource-overlay/berlin/LineageSystemUI/res/values/config.xml b/resource-overlay/LineageSystemUI/res/values/config.xml
similarity index 100%
rename from resource-overlay/berlin/LineageSystemUI/res/values/config.xml
rename to resource-overlay/LineageSystemUI/res/values/config.xml
diff --git a/resource-overlay/berlin/SettingsProvider/Android.bp b/resource-overlay/SettingsProvider/Android.bp
similarity index 100%
rename from resource-overlay/berlin/SettingsProvider/Android.bp
rename to resource-overlay/SettingsProvider/Android.bp
diff --git a/resource-overlay/berlin/SettingsProvider/AndroidManifest.xml b/resource-overlay/SettingsProvider/AndroidManifest.xml
similarity index 100%
rename from resource-overlay/berlin/SettingsProvider/AndroidManifest.xml
rename to resource-overlay/SettingsProvider/AndroidManifest.xml
diff --git a/resource-overlay/berlin/SettingsProvider/res/values/config.xml b/resource-overlay/SettingsProvider/res/values/config.xml
similarity index 100%
rename from resource-overlay/berlin/SettingsProvider/res/values/config.xml
rename to resource-overlay/SettingsProvider/res/values/config.xml
diff --git a/resource-overlay/berlin/SystemUI/Android.bp b/resource-overlay/SystemUI/Android.bp
similarity index 100%
rename from resource-overlay/berlin/SystemUI/Android.bp
rename to resource-overlay/SystemUI/Android.bp
diff --git a/resource-overlay/berlin/SystemUI/AndroidManifest.xml b/resource-overlay/SystemUI/AndroidManifest.xml
similarity index 100%
rename from resource-overlay/berlin/SystemUI/AndroidManifest.xml
rename to resource-overlay/SystemUI/AndroidManifest.xml
diff --git a/resource-overlay/berlin/SystemUI/res/values-land/dimens.xml b/resource-overlay/SystemUI/res/values-land/dimens.xml
similarity index 100%
rename from resource-overlay/berlin/SystemUI/res/values-land/dimens.xml
rename to resource-overlay/SystemUI/res/values-land/dimens.xml
diff --git a/resource-overlay/berlin/SystemUI/res/values/dimens.xml b/resource-overlay/SystemUI/res/values/dimens.xml
similarity index 100%
rename from resource-overlay/berlin/SystemUI/res/values/dimens.xml
rename to resource-overlay/SystemUI/res/values/dimens.xml
diff --git a/resource-overlay/berlin/SystemUI/res/values/integers.xml b/resource-overlay/SystemUI/res/values/integers.xml
similarity index 100%
rename from resource-overlay/berlin/SystemUI/res/values/integers.xml
rename to resource-overlay/SystemUI/res/values/integers.xml