diff --git a/product/AndroidProducts.mk b/products/AndroidProducts.mk
similarity index 100%
rename from product/AndroidProducts.mk
rename to products/AndroidProducts.mk
diff --git a/product/common.mk b/products/common.mk
similarity index 100%
rename from product/common.mk
rename to products/common.mk
diff --git a/product/cyanogen_incredible.mk b/products/cyanogen_incredible.mk
similarity index 89%
rename from product/cyanogen_incredible.mk
rename to products/cyanogen_incredible.mk
index 947f9b8f..55b12d84 100644
--- a/product/cyanogen_incredible.mk
+++ b/products/cyanogen_incredible.mk
@@ -1,7 +1,7 @@
 $(call inherit-product, device/htc/inc/inc.mk)
 
 # Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/product/common.mk)
+$(call inherit-product, vendor/cyanogen/products/common.mk)
 
 #
 # Setup device specific product configuration.
diff --git a/product/cyanogen_passion.mk b/products/cyanogen_passion.mk
similarity index 94%
rename from product/cyanogen_passion.mk
rename to products/cyanogen_passion.mk
index 240301c0..df247ae0 100644
--- a/product/cyanogen_passion.mk
+++ b/products/cyanogen_passion.mk
@@ -2,7 +2,7 @@
 $(call inherit-product, device/htc/passion/full_passion.mk)
 
 # Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/product/common.mk)
+$(call inherit-product, vendor/cyanogen/products/common.mk)
 
 #
 # Setup device specific product configuration.