diff --git a/android/products/AndroidProducts.mk b/products/AndroidProducts.mk
similarity index 100%
rename from android/products/AndroidProducts.mk
rename to products/AndroidProducts.mk
diff --git a/android/products/anbox.mk b/products/anbox.mk
similarity index 100%
rename from android/products/anbox.mk
rename to products/anbox.mk
diff --git a/android/products/anbox.xml b/products/anbox.xml
similarity index 100%
rename from android/products/anbox.xml
rename to products/anbox.xml
diff --git a/android/products/anbox_arm64.mk b/products/anbox_arm64.mk
similarity index 100%
rename from android/products/anbox_arm64.mk
rename to products/anbox_arm64.mk
diff --git a/android/products/anbox_armv7a_neon.mk b/products/anbox_armv7a_neon.mk
similarity index 100%
rename from android/products/anbox_armv7a_neon.mk
rename to products/anbox_armv7a_neon.mk
diff --git a/android/products/anbox_x86_64.mk b/products/anbox_x86_64.mk
similarity index 100%
rename from android/products/anbox_x86_64.mk
rename to products/anbox_x86_64.mk
diff --git a/android/products/arm64/BoardConfig.mk b/products/arm64/BoardConfig.mk
similarity index 100%
rename from android/products/arm64/BoardConfig.mk
rename to products/arm64/BoardConfig.mk
diff --git a/android/products/arm64/device.mk b/products/arm64/device.mk
similarity index 100%
rename from android/products/arm64/device.mk
rename to products/arm64/device.mk
diff --git a/android/products/armv7-a-neon/BoardConfig.mk b/products/armv7-a-neon/BoardConfig.mk
similarity index 100%
rename from android/products/armv7-a-neon/BoardConfig.mk
rename to products/armv7-a-neon/BoardConfig.mk
diff --git a/android/products/armv7-a-neon/device.mk b/products/armv7-a-neon/device.mk
similarity index 100%
rename from android/products/armv7-a-neon/device.mk
rename to products/armv7-a-neon/device.mk
diff --git a/android/products/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/products/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
similarity index 100%
rename from android/products/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
rename to products/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
diff --git a/android/products/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/products/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
similarity index 100%
rename from android/products/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
rename to products/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
diff --git a/android/products/vendorsetup.sh b/products/vendorsetup.sh
similarity index 100%
rename from android/products/vendorsetup.sh
rename to products/vendorsetup.sh
diff --git a/android/products/x86_64/BoardConfig.mk b/products/x86_64/BoardConfig.mk
similarity index 100%
rename from android/products/x86_64/BoardConfig.mk
rename to products/x86_64/BoardConfig.mk
diff --git a/android/products/x86_64/device.mk b/products/x86_64/device.mk
similarity index 100%
rename from android/products/x86_64/device.mk
rename to products/x86_64/device.mk