diff --git a/.travis.yml b/.travis.yml
index 83a9f06424..4b8e908894 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -282,7 +282,7 @@ matrix:
         - |
           rm -r cmsis/CMSIS_5/CMSIS/RTOS2 cmsis/device/rtos drivers/source/usb connectivity/cellular connectivity/drivers/cellular \
             connectivity/libraries/ppp connectivity/netsocket connectivity/nanostack connectivity/lwipstack features/frameworks/greentea-client \
-            features/frameworks/utest features/frameworks/unity components BUILD
+            features/frameworks/utest features/frameworks/unity BUILD
         - python tools/make.py -t GCC_ARM -m NUCLEO_F103RB --source=. --build=BUILD/NUCLEO_F103RB/GCC_ARM -j0
         # Run profiling tests
         - make -C ${EVENTS}/tests/unit prof | tee prof
diff --git a/components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/DynamicPinList.h b/features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/include/fpga_ci_test_shield/DynamicPinList.h
similarity index 100%
rename from components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/DynamicPinList.h
rename to features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/include/fpga_ci_test_shield/DynamicPinList.h
diff --git a/components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/I2CTester.h b/features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/include/fpga_ci_test_shield/I2CTester.h
similarity index 100%
rename from components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/I2CTester.h
rename to features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/include/fpga_ci_test_shield/I2CTester.h
diff --git a/components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/MbedTester.h b/features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/include/fpga_ci_test_shield/MbedTester.h
similarity index 100%
rename from components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/MbedTester.h
rename to features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/include/fpga_ci_test_shield/MbedTester.h
diff --git a/components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/SPIMasterTester.h b/features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/include/fpga_ci_test_shield/SPIMasterTester.h
similarity index 100%
rename from components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/SPIMasterTester.h
rename to features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/include/fpga_ci_test_shield/SPIMasterTester.h
diff --git a/components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/SPISlaveTester.h b/features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/include/fpga_ci_test_shield/SPISlaveTester.h
similarity index 100%
rename from components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/SPISlaveTester.h
rename to features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/include/fpga_ci_test_shield/SPISlaveTester.h
diff --git a/components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/SPITester.h b/features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/include/fpga_ci_test_shield/SPITester.h
similarity index 100%
rename from components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/SPITester.h
rename to features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/include/fpga_ci_test_shield/SPITester.h
diff --git a/components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/UARTTester.h b/features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/include/fpga_ci_test_shield/UARTTester.h
similarity index 100%
rename from components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/UARTTester.h
rename to features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/include/fpga_ci_test_shield/UARTTester.h
diff --git a/components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/fpga_config.h b/features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/include/fpga_ci_test_shield/fpga_config.h
similarity index 100%
rename from components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/fpga_config.h
rename to features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/include/fpga_ci_test_shield/fpga_config.h
diff --git a/components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/test_utils.h b/features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/include/fpga_ci_test_shield/test_utils.h
similarity index 100%
rename from components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/test_utils.h
rename to features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/include/fpga_ci_test_shield/test_utils.h
diff --git a/components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/DynamicPinList.cpp b/features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/source/DynamicPinList.cpp
similarity index 100%
rename from components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/DynamicPinList.cpp
rename to features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/source/DynamicPinList.cpp
diff --git a/components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/I2CTester.cpp b/features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/source/I2CTester.cpp
similarity index 100%
rename from components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/I2CTester.cpp
rename to features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/source/I2CTester.cpp
diff --git a/components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/MbedTester.cpp b/features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/source/MbedTester.cpp
similarity index 100%
rename from components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/MbedTester.cpp
rename to features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/source/MbedTester.cpp
diff --git a/components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/SPIMasterTester.cpp b/features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/source/SPIMasterTester.cpp
similarity index 100%
rename from components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/SPIMasterTester.cpp
rename to features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/source/SPIMasterTester.cpp
diff --git a/components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/SPISlaveTester.cpp b/features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/source/SPISlaveTester.cpp
similarity index 100%
rename from components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/SPISlaveTester.cpp
rename to features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/source/SPISlaveTester.cpp
diff --git a/components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/SPITester.cpp b/features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/source/SPITester.cpp
similarity index 100%
rename from components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/SPITester.cpp
rename to features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/source/SPITester.cpp
diff --git a/components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/UARTTester.cpp b/features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/source/UARTTester.cpp
similarity index 100%
rename from components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/UARTTester.cpp
rename to features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/source/UARTTester.cpp
diff --git a/hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/README.md b/hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/README.md
index c15471fbec..8165764e6a 100644
--- a/hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/README.md
+++ b/hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/README.md
@@ -5,7 +5,7 @@
 ![30% center](fpga_test_shield.jpg)
 
 ```
-mbed test -n tests*fpga* --app-config tests/configs/fpga.json
+mbed test -n hal-tests-tests*fpga* --app-config TESTS/configs/fpga.json
 ```
 
 FPGA_CI_TEST_SHIELD needed macro  
@@ -23,19 +23,19 @@ Tested from factor is defined by MBED_CONF_TARGET_DEFAULT_FORM_FACTOR
 When "default-form-factor" is not set, ARDUINO form factor is used.
 
 Default ff_arduino_pins is defined in:
-https://github.com/ARMmbed/mbed-os/blob/master/hal/mbed_pinmap_default.cpp#L28-L32
+https://github.com/ARMmbed/mbed-os/blob/master/hal/source/mbed_pinmap_default.cpp#L28-L32
 
 Default ff_arduino_names is defined in:
-https://github.com/ARMmbed/mbed-os/blob/master/hal/mbed_pinmap_default.cpp#L34-L38
+https://github.com/ARMmbed/mbed-os/blob/master/hal/source/mbed_pinmap_default.cpp#L34-L38
 
 Default empty_gpio_pinmap is defined in:
-https://github.com/ARMmbed/mbed-os/blob/master/hal/mbed_gpio.c#L89-L114
+https://github.com/ARMmbed/mbed-os/blob/master/hal/source/mbed_gpio.c#L89-L114
 
 Some pins are restricted:
-https://github.com/ARMmbed/mbed-os/blob/master/hal/mbed_pinmap_default.cpp#L69-L73
+https://github.com/ARMmbed/mbed-os/blob/master/hal/source/mbed_pinmap_default.cpp#L69-L73
 
 Some peripherals are restricted:
-https://github.com/ARMmbed/mbed-os/blob/master/hal/mbed_pinmap_default.cpp#L94-L100
+https://github.com/ARMmbed/mbed-os/blob/master/hal/source/mbed_pinmap_default.cpp#L94-L100
 
 
 ## Known issues