diff --git a/c/src/lib/libbsp/arm/atsam/spi/atsam_spi_bus.c b/bsps/arm/atsam/spi/atsam_spi_bus.c
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/spi/atsam_spi_bus.c
rename to bsps/arm/atsam/spi/atsam_spi_bus.c
diff --git a/c/src/lib/libbsp/arm/atsam/spi/atsam_spi_init.c b/bsps/arm/atsam/spi/atsam_spi_init.c
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/spi/atsam_spi_init.c
rename to bsps/arm/atsam/spi/atsam_spi_init.c
diff --git a/c/src/lib/libbsp/arm/atsam/spi/sc16is752.c b/bsps/arm/atsam/spi/sc16is752.c
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/spi/sc16is752.c
rename to bsps/arm/atsam/spi/sc16is752.c
diff --git a/c/src/lib/libbsp/arm/imx/spi/imx-ecspi.c b/bsps/arm/imx/spi/imx-ecspi.c
similarity index 100%
rename from c/src/lib/libbsp/arm/imx/spi/imx-ecspi.c
rename to bsps/arm/imx/spi/imx-ecspi.c
diff --git a/c/src/lib/libbsp/arm/raspberrypi/spi/spi.c b/bsps/arm/raspberrypi/spi/spi.c
similarity index 100%
rename from c/src/lib/libbsp/arm/raspberrypi/spi/spi.c
rename to bsps/arm/raspberrypi/spi/spi.c
diff --git a/c/src/lib/libbsp/m68k/gen68360/spi/m360_spi.c b/bsps/m68k/gen68360/spi/m360_spi.c
similarity index 100%
rename from c/src/lib/libbsp/m68k/gen68360/spi/m360_spi.c
rename to bsps/m68k/gen68360/spi/m360_spi.c
diff --git a/c/src/lib/libbsp/m68k/gen68360/spi/m360_spi.h b/bsps/m68k/gen68360/spi/m360_spi.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/gen68360/spi/m360_spi.h
rename to bsps/m68k/gen68360/spi/m360_spi.h
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/spi/spi_init.c b/bsps/powerpc/gen83xx/spi/spi_init.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen83xx/spi/spi_init.c
rename to bsps/powerpc/gen83xx/spi/spi_init.c
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/spi/spi.c b/bsps/powerpc/tqm8xx/spi/spi.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/tqm8xx/spi/spi.c
rename to bsps/powerpc/tqm8xx/spi/spi.c
diff --git a/c/src/lib/libbsp/arm/atsam/Makefile.am b/c/src/lib/libbsp/arm/atsam/Makefile.am
index 3c3a88e0ec..af0185a41e 100644
--- a/c/src/lib/libbsp/arm/atsam/Makefile.am
+++ b/c/src/lib/libbsp/arm/atsam/Makefile.am
@@ -135,9 +135,9 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/atsam/i2c/atsam_i2c_bus.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/atsam/i2c/atsam_i2c_init.c
 
 # SPI
-librtemsbsp_a_SOURCES += spi/atsam_spi_bus.c
-librtemsbsp_a_SOURCES += spi/atsam_spi_init.c
-librtemsbsp_a_SOURCES += spi/sc16is752.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/atsam/spi/atsam_spi_bus.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/atsam/spi/atsam_spi_init.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/atsam/spi/sc16is752.c
 
 # RTC
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c
diff --git a/c/src/lib/libbsp/arm/imx/Makefile.am b/c/src/lib/libbsp/arm/imx/Makefile.am
index 3426433800..5d151d693f 100644
--- a/c/src/lib/libbsp/arm/imx/Makefile.am
+++ b/c/src/lib/libbsp/arm/imx/Makefile.am
@@ -69,7 +69,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cache/cache-cp15.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/imx/i2c/imx-i2c.c
 
 # SPI
-librtemsbsp_a_SOURCES += spi/imx-ecspi.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/imx/spi/imx-ecspi.c
 
 # Start hooks
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/imx/start/bspstarthooks.c
diff --git a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
index b0b4058746..a2ca41b2c1 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
+++ b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
@@ -99,7 +99,7 @@ librtemsbsp_a_SOURCES += gpio/rpi-gpio.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/raspberrypi/i2c/i2c.c
 
 # SPI
-librtemsbsp_a_SOURCES += spi/spi.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/raspberrypi/spi/spi.c
 
 # Cache
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cache/cache-cp15.c
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
index 716a0061c2..eb2abcc4ca 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
@@ -58,7 +58,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen83xx/console/console-
 # bsp_i2c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen83xx/i2c/i2c_init.c
 # bsp_spi
-librtemsbsp_a_SOURCES += spi/spi_init.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen83xx/spi/spi_init.c
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/btimer/btimer-ppc-dec.c
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
index bc7e02426b..3775b32268 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
@@ -34,7 +34,7 @@ librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/tqm8xx/clock/p_clock.c
 # console
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/tqm8xx/console/console.c
 # spi
-librtemsbsp_a_SOURCES += spi/spi.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/tqm8xx/spi/spi.c
 # timer
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/tqm8xx/btimer/btimer.c
 # startup