diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/ext-wifi-fw/cy_ext_wifi_fw_reserved_region_bd.cpp b/targets/TARGET_Cypress/TARGET_PSOC6/ext-wifi-fw/cy_ext_wifi_fw_reserved_region_bd.cpp
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/common/ext-wifi-fw/cy_ext_wifi_fw_reserved_region_bd.cpp
rename to targets/TARGET_Cypress/TARGET_PSOC6/ext-wifi-fw/cy_ext_wifi_fw_reserved_region_bd.cpp
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/ext-wifi-fw/cy_ext_wifi_fw_reserved_region_bd.h b/targets/TARGET_Cypress/TARGET_PSOC6/ext-wifi-fw/cy_ext_wifi_fw_reserved_region_bd.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/common/ext-wifi-fw/cy_ext_wifi_fw_reserved_region_bd.h
rename to targets/TARGET_Cypress/TARGET_PSOC6/ext-wifi-fw/cy_ext_wifi_fw_reserved_region_bd.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/ext-wifi-fw/cy_ext_wifi_fw_resources.c b/targets/TARGET_Cypress/TARGET_PSOC6/ext-wifi-fw/cy_ext_wifi_fw_resources.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/common/ext-wifi-fw/cy_ext_wifi_fw_resources.c
rename to targets/TARGET_Cypress/TARGET_PSOC6/ext-wifi-fw/cy_ext_wifi_fw_resources.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/reserved-region-bd/CyReservedRegionBlockDevice.cpp b/targets/TARGET_Cypress/TARGET_PSOC6/reserved-region-bd/CyReservedRegionBlockDevice.cpp
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/common/reserved-region-bd/CyReservedRegionBlockDevice.cpp
rename to targets/TARGET_Cypress/TARGET_PSOC6/reserved-region-bd/CyReservedRegionBlockDevice.cpp
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/reserved-region-bd/CyReservedRegionBlockDevice.h b/targets/TARGET_Cypress/TARGET_PSOC6/reserved-region-bd/CyReservedRegionBlockDevice.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/common/reserved-region-bd/CyReservedRegionBlockDevice.h
rename to targets/TARGET_Cypress/TARGET_PSOC6/reserved-region-bd/CyReservedRegionBlockDevice.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/serial-flash/LICENSE b/targets/TARGET_Cypress/TARGET_PSOC6/serial-flash/LICENSE
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/common/serial-flash/LICENSE
rename to targets/TARGET_Cypress/TARGET_PSOC6/serial-flash/LICENSE
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/serial-flash/cy_serial_flash_prog.c b/targets/TARGET_Cypress/TARGET_PSOC6/serial-flash/cy_serial_flash_prog.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/common/serial-flash/cy_serial_flash_prog.c
rename to targets/TARGET_Cypress/TARGET_PSOC6/serial-flash/cy_serial_flash_prog.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/serial-flash/cy_serial_flash_qspi.c b/targets/TARGET_Cypress/TARGET_PSOC6/serial-flash/cy_serial_flash_qspi.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/common/serial-flash/cy_serial_flash_qspi.c
rename to targets/TARGET_Cypress/TARGET_PSOC6/serial-flash/cy_serial_flash_qspi.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/serial-flash/cy_serial_flash_qspi.h b/targets/TARGET_Cypress/TARGET_PSOC6/serial-flash/cy_serial_flash_qspi.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/common/serial-flash/cy_serial_flash_qspi.h
rename to targets/TARGET_Cypress/TARGET_PSOC6/serial-flash/cy_serial_flash_qspi.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/serial-flash/version.xml b/targets/TARGET_Cypress/TARGET_PSOC6/serial-flash/version.xml
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/common/serial-flash/version.xml
rename to targets/TARGET_Cypress/TARGET_PSOC6/serial-flash/version.xml
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/udb-sdio-whd/COMPONENT_UDB_SDIO_P12/SDIO_HOST_cfg.c b/targets/TARGET_Cypress/TARGET_PSOC6/udb-sdio-whd/COMPONENT_UDB_SDIO_P12/SDIO_HOST_cfg.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/common/udb-sdio-whd/COMPONENT_UDB_SDIO_P12/SDIO_HOST_cfg.c
rename to targets/TARGET_Cypress/TARGET_PSOC6/udb-sdio-whd/COMPONENT_UDB_SDIO_P12/SDIO_HOST_cfg.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/udb-sdio-whd/COMPONENT_UDB_SDIO_P12/SDIO_HOST_cfg.h b/targets/TARGET_Cypress/TARGET_PSOC6/udb-sdio-whd/COMPONENT_UDB_SDIO_P12/SDIO_HOST_cfg.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/common/udb-sdio-whd/COMPONENT_UDB_SDIO_P12/SDIO_HOST_cfg.h
rename to targets/TARGET_Cypress/TARGET_PSOC6/udb-sdio-whd/COMPONENT_UDB_SDIO_P12/SDIO_HOST_cfg.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/udb-sdio-whd/COMPONENT_UDB_SDIO_P2/SDIO_HOST_cfg.c b/targets/TARGET_Cypress/TARGET_PSOC6/udb-sdio-whd/COMPONENT_UDB_SDIO_P2/SDIO_HOST_cfg.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/common/udb-sdio-whd/COMPONENT_UDB_SDIO_P2/SDIO_HOST_cfg.c
rename to targets/TARGET_Cypress/TARGET_PSOC6/udb-sdio-whd/COMPONENT_UDB_SDIO_P2/SDIO_HOST_cfg.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/udb-sdio-whd/COMPONENT_UDB_SDIO_P2/SDIO_HOST_cfg.h b/targets/TARGET_Cypress/TARGET_PSOC6/udb-sdio-whd/COMPONENT_UDB_SDIO_P2/SDIO_HOST_cfg.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/common/udb-sdio-whd/COMPONENT_UDB_SDIO_P2/SDIO_HOST_cfg.h
rename to targets/TARGET_Cypress/TARGET_PSOC6/udb-sdio-whd/COMPONENT_UDB_SDIO_P2/SDIO_HOST_cfg.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/udb-sdio-whd/COMPONENT_UDB_SDIO_P9/SDIO_HOST_cfg.c b/targets/TARGET_Cypress/TARGET_PSOC6/udb-sdio-whd/COMPONENT_UDB_SDIO_P9/SDIO_HOST_cfg.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/common/udb-sdio-whd/COMPONENT_UDB_SDIO_P9/SDIO_HOST_cfg.c
rename to targets/TARGET_Cypress/TARGET_PSOC6/udb-sdio-whd/COMPONENT_UDB_SDIO_P9/SDIO_HOST_cfg.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/udb-sdio-whd/COMPONENT_UDB_SDIO_P9/SDIO_HOST_cfg.h b/targets/TARGET_Cypress/TARGET_PSOC6/udb-sdio-whd/COMPONENT_UDB_SDIO_P9/SDIO_HOST_cfg.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/common/udb-sdio-whd/COMPONENT_UDB_SDIO_P9/SDIO_HOST_cfg.h
rename to targets/TARGET_Cypress/TARGET_PSOC6/udb-sdio-whd/COMPONENT_UDB_SDIO_P9/SDIO_HOST_cfg.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/udb-sdio-whd/LICENSE b/targets/TARGET_Cypress/TARGET_PSOC6/udb-sdio-whd/LICENSE
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/common/udb-sdio-whd/LICENSE
rename to targets/TARGET_Cypress/TARGET_PSOC6/udb-sdio-whd/LICENSE
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/udb-sdio-whd/SDIO_HOST.c b/targets/TARGET_Cypress/TARGET_PSOC6/udb-sdio-whd/SDIO_HOST.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/common/udb-sdio-whd/SDIO_HOST.c
rename to targets/TARGET_Cypress/TARGET_PSOC6/udb-sdio-whd/SDIO_HOST.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/udb-sdio-whd/SDIO_HOST.h b/targets/TARGET_Cypress/TARGET_PSOC6/udb-sdio-whd/SDIO_HOST.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/common/udb-sdio-whd/SDIO_HOST.h
rename to targets/TARGET_Cypress/TARGET_PSOC6/udb-sdio-whd/SDIO_HOST.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/udb-sdio-whd/version.xml b/targets/TARGET_Cypress/TARGET_PSOC6/udb-sdio-whd/version.xml
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/common/udb-sdio-whd/version.xml
rename to targets/TARGET_Cypress/TARGET_PSOC6/udb-sdio-whd/version.xml