diff --git a/libraries/USBHost/USBHost/USBHALHost_M451.cpp b/features/unsupported/USBHost/USBHost/USBHALHost_M451.cpp
similarity index 100%
rename from libraries/USBHost/USBHost/USBHALHost_M451.cpp
rename to features/unsupported/USBHost/USBHost/USBHALHost_M451.cpp
diff --git a/libraries/USBHost/USBHost/USBHALHost_NUC472.cpp b/features/unsupported/USBHost/USBHost/USBHALHost_NUC472.cpp
similarity index 100%
rename from libraries/USBHost/USBHost/USBHALHost_NUC472.cpp
rename to features/unsupported/USBHost/USBHost/USBHALHost_NUC472.cpp
diff --git a/hal/targets/hal/TARGET_NUVOTON/TARGET_M451/mbed_lib.json b/targets/TARGET_NUVOTON/TARGET_M451/mbed_lib.json
similarity index 100%
rename from hal/targets/hal/TARGET_NUVOTON/TARGET_M451/mbed_lib.json
rename to targets/TARGET_NUVOTON/TARGET_M451/mbed_lib.json
diff --git a/hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/aes/aes_alt.c b/targets/TARGET_NUVOTON/TARGET_NUC472/crypto/aes/aes_alt.c
similarity index 100%
rename from hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/aes/aes_alt.c
rename to targets/TARGET_NUVOTON/TARGET_NUC472/crypto/aes/aes_alt.c
diff --git a/hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/aes/aes_alt.h b/targets/TARGET_NUVOTON/TARGET_NUC472/crypto/aes/aes_alt.h
similarity index 100%
rename from hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/aes/aes_alt.h
rename to targets/TARGET_NUVOTON/TARGET_NUC472/crypto/aes/aes_alt.h
diff --git a/hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/crypto-misc.c b/targets/TARGET_NUVOTON/TARGET_NUC472/crypto/crypto-misc.c
similarity index 100%
rename from hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/crypto-misc.c
rename to targets/TARGET_NUVOTON/TARGET_NUC472/crypto/crypto-misc.c
diff --git a/hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/crypto-misc.h b/targets/TARGET_NUVOTON/TARGET_NUC472/crypto/crypto-misc.h
similarity index 100%
rename from hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/crypto-misc.h
rename to targets/TARGET_NUVOTON/TARGET_NUC472/crypto/crypto-misc.h
diff --git a/hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/des/des_alt.c b/targets/TARGET_NUVOTON/TARGET_NUC472/crypto/des/des_alt.c
similarity index 100%
rename from hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/des/des_alt.c
rename to targets/TARGET_NUVOTON/TARGET_NUC472/crypto/des/des_alt.c
diff --git a/hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/des/des_alt.h b/targets/TARGET_NUVOTON/TARGET_NUC472/crypto/des/des_alt.h
similarity index 100%
rename from hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/des/des_alt.h
rename to targets/TARGET_NUVOTON/TARGET_NUC472/crypto/des/des_alt.h
diff --git a/hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/des/des_alt_sw.c b/targets/TARGET_NUVOTON/TARGET_NUC472/crypto/des/des_alt_sw.c
similarity index 100%
rename from hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/des/des_alt_sw.c
rename to targets/TARGET_NUVOTON/TARGET_NUC472/crypto/des/des_alt_sw.c
diff --git a/hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/des/des_alt_sw.h b/targets/TARGET_NUVOTON/TARGET_NUC472/crypto/des/des_alt_sw.h
similarity index 100%
rename from hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/des/des_alt_sw.h
rename to targets/TARGET_NUVOTON/TARGET_NUC472/crypto/des/des_alt_sw.h
diff --git a/hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha1_alt.c b/targets/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha1_alt.c
similarity index 100%
rename from hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha1_alt.c
rename to targets/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha1_alt.c
diff --git a/hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha1_alt.h b/targets/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha1_alt.h
similarity index 100%
rename from hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha1_alt.h
rename to targets/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha1_alt.h
diff --git a/hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha1_alt_sw.c b/targets/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha1_alt_sw.c
similarity index 100%
rename from hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha1_alt_sw.c
rename to targets/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha1_alt_sw.c
diff --git a/hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha1_alt_sw.h b/targets/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha1_alt_sw.h
similarity index 100%
rename from hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha1_alt_sw.h
rename to targets/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha1_alt_sw.h
diff --git a/hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha256_alt.c b/targets/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha256_alt.c
similarity index 100%
rename from hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha256_alt.c
rename to targets/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha256_alt.c
diff --git a/hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha256_alt.h b/targets/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha256_alt.h
similarity index 100%
rename from hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha256_alt.h
rename to targets/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha256_alt.h
diff --git a/hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha256_alt_sw.c b/targets/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha256_alt_sw.c
similarity index 100%
rename from hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha256_alt_sw.c
rename to targets/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha256_alt_sw.c
diff --git a/hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha256_alt_sw.h b/targets/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha256_alt_sw.h
similarity index 100%
rename from hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha256_alt_sw.h
rename to targets/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha256_alt_sw.h
diff --git a/hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha_alt_hw.c b/targets/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha_alt_hw.c
similarity index 100%
rename from hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha_alt_hw.c
rename to targets/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha_alt_hw.c
diff --git a/hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha_alt_hw.h b/targets/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha_alt_hw.h
similarity index 100%
rename from hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha_alt_hw.h
rename to targets/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha_alt_hw.h
diff --git a/hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/mbed_lib.json b/targets/TARGET_NUVOTON/TARGET_NUC472/mbed_lib.json
similarity index 100%
rename from hal/targets/hal/TARGET_NUVOTON/TARGET_NUC472/mbed_lib.json
rename to targets/TARGET_NUVOTON/TARGET_NUC472/mbed_lib.json