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