diff --git a/projects/Cuboxi/bootloader/uEnv.txt b/projects/imx6/bootloader/uEnv.txt
similarity index 100%
rename from projects/Cuboxi/bootloader/uEnv.txt
rename to projects/imx6/bootloader/uEnv.txt
diff --git a/projects/Cuboxi/filesystem/usr/share/alsa/cards/imx-hdmi-soc.conf b/projects/imx6/filesystem/usr/share/alsa/cards/imx-hdmi-soc.conf
similarity index 100%
rename from projects/Cuboxi/filesystem/usr/share/alsa/cards/imx-hdmi-soc.conf
rename to projects/imx6/filesystem/usr/share/alsa/cards/imx-hdmi-soc.conf
diff --git a/projects/Cuboxi/filesystem/usr/share/alsa/cards/imx-spdif.conf b/projects/imx6/filesystem/usr/share/alsa/cards/imx-spdif.conf
similarity index 100%
rename from projects/Cuboxi/filesystem/usr/share/alsa/cards/imx-spdif.conf
rename to projects/imx6/filesystem/usr/share/alsa/cards/imx-spdif.conf
diff --git a/projects/Cuboxi/kodi/advancedsettings.xml b/projects/imx6/kodi/advancedsettings.xml
similarity index 100%
rename from projects/Cuboxi/kodi/advancedsettings.xml
rename to projects/imx6/kodi/advancedsettings.xml
diff --git a/projects/Cuboxi/linux/linux.arm.conf b/projects/imx6/linux/linux.arm.conf
similarity index 100%
rename from projects/Cuboxi/linux/linux.arm.conf
rename to projects/imx6/linux/linux.arm.conf
diff --git a/projects/Cuboxi/options b/projects/imx6/options
similarity index 100%
rename from projects/Cuboxi/options
rename to projects/imx6/options
diff --git a/projects/Cuboxi/patches/kodi/kodi-999.99-AESinkALSA_Set_correct_value_for_AES3_when_using_HBR_mode.patch b/projects/imx6/patches/kodi/kodi-999.99-AESinkALSA_Set_correct_value_for_AES3_when_using_HBR_mode.patch
similarity index 100%
rename from projects/Cuboxi/patches/kodi/kodi-999.99-AESinkALSA_Set_correct_value_for_AES3_when_using_HBR_mode.patch
rename to projects/imx6/patches/kodi/kodi-999.99-AESinkALSA_Set_correct_value_for_AES3_when_using_HBR_mode.patch
diff --git a/projects/Cuboxi/patches/kodi/kodi-999.99-relax_sink_buffersize_check.patch b/projects/imx6/patches/kodi/kodi-999.99-relax_sink_buffersize_check.patch
similarity index 100%
rename from projects/Cuboxi/patches/kodi/kodi-999.99-relax_sink_buffersize_check.patch
rename to projects/imx6/patches/kodi/kodi-999.99-relax_sink_buffersize_check.patch
diff --git a/projects/Cuboxi/patches/linux/linux-000-patch-3.14.14-15.patch b/projects/imx6/patches/linux/linux-000-patch-3.14.14-15.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-000-patch-3.14.14-15.patch
rename to projects/imx6/patches/linux/linux-000-patch-3.14.14-15.patch
diff --git a/projects/Cuboxi/patches/linux/linux-000-patch-3.14.15-16.patch b/projects/imx6/patches/linux/linux-000-patch-3.14.15-16.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-000-patch-3.14.15-16.patch
rename to projects/imx6/patches/linux/linux-000-patch-3.14.15-16.patch
diff --git a/projects/Cuboxi/patches/linux/linux-000-patch-3.14.16-17.patch b/projects/imx6/patches/linux/linux-000-patch-3.14.16-17.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-000-patch-3.14.16-17.patch
rename to projects/imx6/patches/linux/linux-000-patch-3.14.16-17.patch
diff --git a/projects/Cuboxi/patches/linux/linux-000-patch-3.14.17-18.patch b/projects/imx6/patches/linux/linux-000-patch-3.14.17-18.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-000-patch-3.14.17-18.patch
rename to projects/imx6/patches/linux/linux-000-patch-3.14.17-18.patch
diff --git a/projects/Cuboxi/patches/linux/linux-000-patch-3.14.18-19.patch b/projects/imx6/patches/linux/linux-000-patch-3.14.18-19.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-000-patch-3.14.18-19.patch
rename to projects/imx6/patches/linux/linux-000-patch-3.14.18-19.patch
diff --git a/projects/Cuboxi/patches/linux/linux-000-patch-3.14.19-20.patch b/projects/imx6/patches/linux/linux-000-patch-3.14.19-20.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-000-patch-3.14.19-20.patch
rename to projects/imx6/patches/linux/linux-000-patch-3.14.19-20.patch
diff --git a/projects/Cuboxi/patches/linux/linux-003-no_dev_console.patch b/projects/imx6/patches/linux/linux-003-no_dev_console.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-003-no_dev_console.patch
rename to projects/imx6/patches/linux/linux-003-no_dev_console.patch
diff --git a/projects/Cuboxi/patches/linux/linux-051-ouya_controller_support.patch b/projects/imx6/patches/linux/linux-051-ouya_controller_support.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-051-ouya_controller_support.patch
rename to projects/imx6/patches/linux/linux-051-ouya_controller_support.patch
diff --git a/projects/Cuboxi/patches/linux/linux-052-XBOX_remote_support.patch b/projects/imx6/patches/linux/linux-052-XBOX_remote_support.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-052-XBOX_remote_support.patch
rename to projects/imx6/patches/linux/linux-052-XBOX_remote_support.patch
diff --git a/projects/Cuboxi/patches/linux/linux-053-spinelplus-remote-0.2.patch b/projects/imx6/patches/linux/linux-053-spinelplus-remote-0.2.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-053-spinelplus-remote-0.2.patch
rename to projects/imx6/patches/linux/linux-053-spinelplus-remote-0.2.patch
diff --git a/projects/Cuboxi/patches/linux/linux-055-add_Formosa_eHome_Infrared_Receiver.patch b/projects/imx6/patches/linux/linux-055-add_Formosa_eHome_Infrared_Receiver.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-055-add_Formosa_eHome_Infrared_Receiver.patch
rename to projects/imx6/patches/linux/linux-055-add_Formosa_eHome_Infrared_Receiver.patch
diff --git a/projects/Cuboxi/patches/linux/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch b/projects/imx6/patches/linux/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch
rename to projects/imx6/patches/linux/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch
diff --git a/projects/Cuboxi/patches/linux/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch b/projects/imx6/patches/linux/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch
rename to projects/imx6/patches/linux/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch
diff --git a/projects/Cuboxi/patches/linux/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch b/projects/imx6/patches/linux/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch
rename to projects/imx6/patches/linux/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch
diff --git a/projects/Cuboxi/patches/linux/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch b/projects/imx6/patches/linux/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch
rename to projects/imx6/patches/linux/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch
diff --git a/projects/Cuboxi/patches/linux/linux-058.06-hid_sony-add_SMK_link.patch b/projects/imx6/patches/linux/linux-058.06-hid_sony-add_SMK_link.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-058.06-hid_sony-add_SMK_link.patch
rename to projects/imx6/patches/linux/linux-058.06-hid_sony-add_SMK_link.patch
diff --git a/projects/Cuboxi/patches/linux/linux-059-remove_some_xpad_pids-0.2.patch b/projects/imx6/patches/linux/linux-059-remove_some_xpad_pids-0.2.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-059-remove_some_xpad_pids-0.2.patch
rename to projects/imx6/patches/linux/linux-059-remove_some_xpad_pids-0.2.patch
diff --git a/projects/Cuboxi/patches/linux/linux-060-add_AUGUST_DVB-T205.patch b/projects/imx6/patches/linux/linux-060-add_AUGUST_DVB-T205.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-060-add_AUGUST_DVB-T205.patch
rename to projects/imx6/patches/linux/linux-060-add_AUGUST_DVB-T205.patch
diff --git a/projects/Cuboxi/patches/linux/linux-061-valve-xpad-rework.patch b/projects/imx6/patches/linux/linux-061-valve-xpad-rework.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-061-valve-xpad-rework.patch
rename to projects/imx6/patches/linux/linux-061-valve-xpad-rework.patch
diff --git a/projects/Cuboxi/patches/linux/linux-062-imon_pad_ignore_diagonal.patch b/projects/imx6/patches/linux/linux-062-imon_pad_ignore_diagonal.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-062-imon_pad_ignore_diagonal.patch
rename to projects/imx6/patches/linux/linux-062-imon_pad_ignore_diagonal.patch
diff --git a/projects/Cuboxi/patches/linux/linux-203-stb0899_enable_low_symbol_rate.patch b/projects/imx6/patches/linux/linux-203-stb0899_enable_low_symbol_rate.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-203-stb0899_enable_low_symbol_rate.patch
rename to projects/imx6/patches/linux/linux-203-stb0899_enable_low_symbol_rate.patch
diff --git a/projects/Cuboxi/patches/linux/linux-210-dvbsky.patch b/projects/imx6/patches/linux/linux-210-dvbsky.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-210-dvbsky.patch
rename to projects/imx6/patches/linux/linux-210-dvbsky.patch
diff --git a/projects/Cuboxi/patches/linux/linux-212-mantis_stb0899_faster_lock.patch b/projects/imx6/patches/linux/linux-212-mantis_stb0899_faster_lock.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-212-mantis_stb0899_faster_lock.patch
rename to projects/imx6/patches/linux/linux-212-mantis_stb0899_faster_lock.patch
diff --git a/projects/Cuboxi/patches/linux/linux-221-ngene-octopus.patch b/projects/imx6/patches/linux/linux-221-ngene-octopus.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-221-ngene-octopus.patch
rename to projects/imx6/patches/linux/linux-221-ngene-octopus.patch
diff --git a/projects/Cuboxi/patches/linux/linux-222-stb0899_signal_quality.patch b/projects/imx6/patches/linux/linux-222-stb0899_signal_quality.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-222-stb0899_signal_quality.patch
rename to projects/imx6/patches/linux/linux-222-stb0899_signal_quality.patch
diff --git a/projects/Cuboxi/patches/linux/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch b/projects/imx6/patches/linux/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch
rename to projects/imx6/patches/linux/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch
diff --git a/projects/Cuboxi/patches/linux/linux-224-geniatech-t220-dvb-t2-fix.patch b/projects/imx6/patches/linux/linux-224-geniatech-t220-dvb-t2-fix.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-224-geniatech-t220-dvb-t2-fix.patch
rename to projects/imx6/patches/linux/linux-224-geniatech-t220-dvb-t2-fix.patch
diff --git a/projects/Cuboxi/patches/linux/linux-300-tbs_matrix_device_tree.patch b/projects/imx6/patches/linux/linux-300-tbs_matrix_device_tree.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-300-tbs_matrix_device_tree.patch
rename to projects/imx6/patches/linux/linux-300-tbs_matrix_device_tree.patch
diff --git a/projects/Cuboxi/patches/linux/linux-701-linksys_aes2500_brcmfmac.patch b/projects/imx6/patches/linux/linux-701-linksys_aes2500_brcmfmac.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-701-linksys_aes2500_brcmfmac.patch
rename to projects/imx6/patches/linux/linux-701-linksys_aes2500_brcmfmac.patch
diff --git a/projects/Cuboxi/patches/linux/linux-704-Support-for-Ubiquiti-WifiStation.patch b/projects/imx6/patches/linux/linux-704-Support-for-Ubiquiti-WifiStation.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-704-Support-for-Ubiquiti-WifiStation.patch
rename to projects/imx6/patches/linux/linux-704-Support-for-Ubiquiti-WifiStation.patch
diff --git a/projects/Cuboxi/patches/linux/linux-705-Support-for-Buffalo-WLI-UC-G300HP-V1.patch b/projects/imx6/patches/linux/linux-705-Support-for-Buffalo-WLI-UC-G300HP-V1.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-705-Support-for-Buffalo-WLI-UC-G300HP-V1.patch
rename to projects/imx6/patches/linux/linux-705-Support-for-Buffalo-WLI-UC-G300HP-V1.patch
diff --git a/projects/Cuboxi/patches/linux/linux-706-Sitecom-N300.patch b/projects/imx6/patches/linux/linux-706-Sitecom-N300.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-706-Sitecom-N300.patch
rename to projects/imx6/patches/linux/linux-706-Sitecom-N300.patch
diff --git a/projects/Cuboxi/patches/linux/linux-900-hide_tsc_error.patch b/projects/imx6/patches/linux/linux-900-hide_tsc_error.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-900-hide_tsc_error.patch
rename to projects/imx6/patches/linux/linux-900-hide_tsc_error.patch
diff --git a/projects/Cuboxi/patches/linux/linux-991.01-ptrace_fix.patch b/projects/imx6/patches/linux/linux-991.01-ptrace_fix.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-991.01-ptrace_fix.patch
rename to projects/imx6/patches/linux/linux-991.01-ptrace_fix.patch
diff --git a/projects/Cuboxi/patches/linux/linux-995-CX24120-13Z_frontend.patch b/projects/imx6/patches/linux/linux-995-CX24120-13Z_frontend.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-995-CX24120-13Z_frontend.patch
rename to projects/imx6/patches/linux/linux-995-CX24120-13Z_frontend.patch
diff --git a/projects/Cuboxi/patches/linux/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch b/projects/imx6/patches/linux/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch
rename to projects/imx6/patches/linux/linux-999.02-0001-pm-disable-async-suspend-resume-by-default.patch
diff --git a/projects/Cuboxi/patches/linux/linux-999.03-0001-fix-mceusb.patch b/projects/imx6/patches/linux/linux-999.03-0001-fix-mceusb.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-999.03-0001-fix-mceusb.patch
rename to projects/imx6/patches/linux/linux-999.03-0001-fix-mceusb.patch
diff --git a/projects/Cuboxi/patches/linux/linux-999.91-cec-imx6.patch b/projects/imx6/patches/linux/linux-999.91-cec-imx6.patch
similarity index 100%
rename from projects/Cuboxi/patches/linux/linux-999.91-cec-imx6.patch
rename to projects/imx6/patches/linux/linux-999.91-cec-imx6.patch
diff --git a/projects/Cuboxi/patches/u-boot/010-cuboxi-u-boot-zImage.patch b/projects/imx6/patches/u-boot/010-cuboxi-u-boot-zImage.patch
similarity index 100%
rename from projects/Cuboxi/patches/u-boot/010-cuboxi-u-boot-zImage.patch
rename to projects/imx6/patches/u-boot/010-cuboxi-u-boot-zImage.patch
diff --git a/projects/Cuboxi/patches/u-boot/020-mx6qsabre_common-uEnv.txt-bootz-n-fixes.patch b/projects/imx6/patches/u-boot/020-mx6qsabre_common-uEnv.txt-bootz-n-fixes.patch
similarity index 100%
rename from projects/Cuboxi/patches/u-boot/020-mx6qsabre_common-uEnv.txt-bootz-n-fixes.patch
rename to projects/imx6/patches/u-boot/020-mx6qsabre_common-uEnv.txt-bootz-n-fixes.patch
diff --git a/projects/Cuboxi/patches/u-boot/030-tbs_matrix_system.patch b/projects/imx6/patches/u-boot/030-tbs_matrix_system.patch
similarity index 100%
rename from projects/Cuboxi/patches/u-boot/030-tbs_matrix_system.patch
rename to projects/imx6/patches/u-boot/030-tbs_matrix_system.patch
diff --git a/projects/Cuboxi/patches/u-boot/040-tbs_matrix_zImage.patch b/projects/imx6/patches/u-boot/040-tbs_matrix_zImage.patch
similarity index 100%
rename from projects/Cuboxi/patches/u-boot/040-tbs_matrix_zImage.patch
rename to projects/imx6/patches/u-boot/040-tbs_matrix_zImage.patch
diff --git a/projects/Cuboxi/patches/u-boot/050-tbs_matrix_multiboot.patch b/projects/imx6/patches/u-boot/050-tbs_matrix_multiboot.patch
similarity index 100%
rename from projects/Cuboxi/patches/u-boot/050-tbs_matrix_multiboot.patch
rename to projects/imx6/patches/u-boot/050-tbs_matrix_multiboot.patch
diff --git a/projects/Cuboxi/patches/u-boot/060-tbs_matrix_usb.patch b/projects/imx6/patches/u-boot/060-tbs_matrix_usb.patch
similarity index 100%
rename from projects/Cuboxi/patches/u-boot/060-tbs_matrix_usb.patch
rename to projects/imx6/patches/u-boot/060-tbs_matrix_usb.patch