diff --git a/BoardConfig.mk b/BoardConfig.mk
index e87673b..eb93a25 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -17,8 +17,8 @@ TARGET_SURFACEFLINGER_UDFPS_LIB := //$(DEVICE_PATH):libudfps_extension.dubai
 SOONG_CONFIG_qtidisplay_udfps := true
 
 # HIDL
-DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += $(DEVICE_PATH)/device_framework_matrix_dubai.xml
-DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest_dubai.xml
+DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += $(DEVICE_PATH)/device_framework_matrix.xml
+DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest.xml
 
 # Kernel
 BOARD_KERNEL_CMDLINE += androidboot.hab.product=dubai
diff --git a/device_framework_matrix_dubai.xml b/device_framework_matrix.xml
similarity index 100%
rename from device_framework_matrix_dubai.xml
rename to device_framework_matrix.xml
diff --git a/manifest_dubai.xml b/manifest.xml
similarity index 100%
rename from manifest_dubai.xml
rename to manifest.xml
diff --git a/resource-overlay/dubai/Frameworks/Android.bp b/resource-overlay/device/Frameworks/Android.bp
similarity index 100%
rename from resource-overlay/dubai/Frameworks/Android.bp
rename to resource-overlay/device/Frameworks/Android.bp
diff --git a/resource-overlay/dubai/Frameworks/AndroidManifest.xml b/resource-overlay/device/Frameworks/AndroidManifest.xml
similarity index 100%
rename from resource-overlay/dubai/Frameworks/AndroidManifest.xml
rename to resource-overlay/device/Frameworks/AndroidManifest.xml
diff --git a/resource-overlay/dubai/Frameworks/res/values/config.xml b/resource-overlay/device/Frameworks/res/values/config.xml
similarity index 100%
rename from resource-overlay/dubai/Frameworks/res/values/config.xml
rename to resource-overlay/device/Frameworks/res/values/config.xml
diff --git a/resource-overlay/dubai/Frameworks/res/values/dimens.xml b/resource-overlay/device/Frameworks/res/values/dimens.xml
similarity index 100%
rename from resource-overlay/dubai/Frameworks/res/values/dimens.xml
rename to resource-overlay/device/Frameworks/res/values/dimens.xml
diff --git a/resource-overlay/dubai/Frameworks/res/xml/power_profile.xml b/resource-overlay/device/Frameworks/res/xml/power_profile.xml
similarity index 100%
rename from resource-overlay/dubai/Frameworks/res/xml/power_profile.xml
rename to resource-overlay/device/Frameworks/res/xml/power_profile.xml
diff --git a/resource-overlay/dubai/LineageSystemUI/Android.bp b/resource-overlay/device/LineageSystemUI/Android.bp
similarity index 100%
rename from resource-overlay/dubai/LineageSystemUI/Android.bp
rename to resource-overlay/device/LineageSystemUI/Android.bp
diff --git a/resource-overlay/dubai/LineageSystemUI/AndroidManifest.xml b/resource-overlay/device/LineageSystemUI/AndroidManifest.xml
similarity index 100%
rename from resource-overlay/dubai/LineageSystemUI/AndroidManifest.xml
rename to resource-overlay/device/LineageSystemUI/AndroidManifest.xml
diff --git a/resource-overlay/dubai/LineageSystemUI/res/values/config.xml b/resource-overlay/device/LineageSystemUI/res/values/config.xml
similarity index 100%
rename from resource-overlay/dubai/LineageSystemUI/res/values/config.xml
rename to resource-overlay/device/LineageSystemUI/res/values/config.xml
diff --git a/resource-overlay/dubai/Settings/Android.bp b/resource-overlay/device/Settings/Android.bp
similarity index 100%
rename from resource-overlay/dubai/Settings/Android.bp
rename to resource-overlay/device/Settings/Android.bp
diff --git a/resource-overlay/dubai/Settings/AndroidManifest.xml b/resource-overlay/device/Settings/AndroidManifest.xml
similarity index 100%
rename from resource-overlay/dubai/Settings/AndroidManifest.xml
rename to resource-overlay/device/Settings/AndroidManifest.xml
diff --git a/resource-overlay/dubai/Settings/res/drawable/regulatory_info.png b/resource-overlay/device/Settings/res/drawable/regulatory_info.png
similarity index 100%
rename from resource-overlay/dubai/Settings/res/drawable/regulatory_info.png
rename to resource-overlay/device/Settings/res/drawable/regulatory_info.png
diff --git a/resource-overlay/dubai/Settings/res/values/config.xml b/resource-overlay/device/Settings/res/values/config.xml
similarity index 100%
rename from resource-overlay/dubai/Settings/res/values/config.xml
rename to resource-overlay/device/Settings/res/values/config.xml
diff --git a/resource-overlay/dubai/SettingsProvider/Android.bp b/resource-overlay/device/SettingsProvider/Android.bp
similarity index 100%
rename from resource-overlay/dubai/SettingsProvider/Android.bp
rename to resource-overlay/device/SettingsProvider/Android.bp
diff --git a/resource-overlay/dubai/SettingsProvider/AndroidManifest.xml b/resource-overlay/device/SettingsProvider/AndroidManifest.xml
similarity index 100%
rename from resource-overlay/dubai/SettingsProvider/AndroidManifest.xml
rename to resource-overlay/device/SettingsProvider/AndroidManifest.xml
diff --git a/resource-overlay/dubai/SettingsProvider/res/values/config.xml b/resource-overlay/device/SettingsProvider/res/values/config.xml
similarity index 100%
rename from resource-overlay/dubai/SettingsProvider/res/values/config.xml
rename to resource-overlay/device/SettingsProvider/res/values/config.xml
diff --git a/resource-overlay/dubai/SystemUI/Android.bp b/resource-overlay/device/SystemUI/Android.bp
similarity index 100%
rename from resource-overlay/dubai/SystemUI/Android.bp
rename to resource-overlay/device/SystemUI/Android.bp
diff --git a/resource-overlay/dubai/SystemUI/AndroidManifest.xml b/resource-overlay/device/SystemUI/AndroidManifest.xml
similarity index 100%
rename from resource-overlay/dubai/SystemUI/AndroidManifest.xml
rename to resource-overlay/device/SystemUI/AndroidManifest.xml
diff --git a/resource-overlay/dubai/SystemUI/res/values/config.xml b/resource-overlay/device/SystemUI/res/values/config.xml
similarity index 100%
rename from resource-overlay/dubai/SystemUI/res/values/config.xml
rename to resource-overlay/device/SystemUI/res/values/config.xml
diff --git a/resource-overlay/dubai/SystemUI/res/values/dimens.xml b/resource-overlay/device/SystemUI/res/values/dimens.xml
similarity index 100%
rename from resource-overlay/dubai/SystemUI/res/values/dimens.xml
rename to resource-overlay/device/SystemUI/res/values/dimens.xml
diff --git a/resource-overlay/dubai/SystemUI/res/values/integers.xml b/resource-overlay/device/SystemUI/res/values/integers.xml
similarity index 100%
rename from resource-overlay/dubai/SystemUI/res/values/integers.xml
rename to resource-overlay/device/SystemUI/res/values/integers.xml
diff --git a/resource-overlay/dubai/Wifi/Android.bp b/resource-overlay/device/Wifi/Android.bp
similarity index 100%
rename from resource-overlay/dubai/Wifi/Android.bp
rename to resource-overlay/device/Wifi/Android.bp
diff --git a/resource-overlay/dubai/Wifi/AndroidManifest.xml b/resource-overlay/device/Wifi/AndroidManifest.xml
similarity index 100%
rename from resource-overlay/dubai/Wifi/AndroidManifest.xml
rename to resource-overlay/device/Wifi/AndroidManifest.xml
diff --git a/resource-overlay/dubai/Wifi/res/values/config.xml b/resource-overlay/device/Wifi/res/values/config.xml
similarity index 100%
rename from resource-overlay/dubai/Wifi/res/values/config.xml
rename to resource-overlay/device/Wifi/res/values/config.xml