diff --git a/BoardConfig.mk b/BoardConfig.mk
index 2498a75..380c229 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -5,9 +5,9 @@
 #
 
 # Inherit from the proprietary version
-include vendor/xiaomi/miuicamera-lisa/BoardConfigVendor.mk
+include vendor/xiaomi/miuicamera-lisa/vendor/BoardConfigVendor.mk
 
-MIUICAMERA_PATH := device/xiaomi/miuicamera-lisa
+MIUICAMERA_PATH := vendor/xiaomi/miuicamera-lisa
 
 # Properties
 TARGET_SYSTEM_PROP += $(MIUICAMERA_PATH)/system.prop
diff --git a/device.mk b/device.mk
index 3202b66..ddf672c 100644
--- a/device.mk
+++ b/device.mk
@@ -5,7 +5,7 @@
 #
 
 # Inherit from the proprietary version
-$(call inherit-product, vendor/xiaomi/miuicamera-lisa/miuicamera-lisa-vendor.mk)
+$(call inherit-product, vendor/xiaomi/miuicamera-lisa/vendor/vendor-vendor.mk)
 
 # Public libraries
 PRODUCT_COPY_FILES += \
diff --git a/extract-files.sh b/extract-files.sh
index 2d487c6..c7dc1c3 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -8,8 +8,8 @@
 
 set -e
 
-DEVICE=miuicamera-lisa
-VENDOR=xiaomi
+DEVICE=vendor
+VENDOR=xiaomi/miuicamera-lisa
 
 # Load extract_utils and do some sanity checks
 MY_DIR="${BASH_SOURCE%/*}"
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index aa71614..a8ea680 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -8,8 +8,8 @@
 
 set -e
 
-DEVICE=miuicamera-lisa
-VENDOR=xiaomi
+DEVICE=vendor
+VENDOR=xiaomi/miuicamera-lisa
 
 # Load extract_utils and do some sanity checks
 MY_DIR="${BASH_SOURCE%/*}"