diff --git a/c/src/lib/libbsp/arm/beagle/clock.c b/bsps/arm/beagle/clock/clock.c
similarity index 100%
rename from c/src/lib/libbsp/arm/beagle/clock.c
rename to bsps/arm/beagle/clock/clock.c
diff --git a/c/src/lib/libbsp/arm/beagle/gpio/bbb-gpio.c b/bsps/arm/beagle/gpio/bbb-gpio.c
similarity index 100%
rename from c/src/lib/libbsp/arm/beagle/gpio/bbb-gpio.c
rename to bsps/arm/beagle/gpio/bbb-gpio.c
diff --git a/c/src/lib/libbsp/arm/beagle/pwm/pwm.c b/bsps/arm/beagle/pwm/pwm.c
similarity index 100%
rename from c/src/lib/libbsp/arm/beagle/pwm/pwm.c
rename to bsps/arm/beagle/pwm/pwm.c
diff --git a/c/src/lib/libbsp/arm/beagle/rtc.c b/bsps/arm/beagle/rtc/rtc.c
similarity index 100%
rename from c/src/lib/libbsp/arm/beagle/rtc.c
rename to bsps/arm/beagle/rtc/rtc.c
diff --git a/c/src/lib/libbsp/arm/beagle/Makefile.am b/c/src/lib/libbsp/arm/beagle/Makefile.am
index cbd30c7f5f..191d2cae2c 100644
--- a/c/src/lib/libbsp/arm/beagle/Makefile.am
+++ b/c/src/lib/libbsp/arm/beagle/Makefile.am
@@ -71,16 +71,16 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/beagle/console/console-confi
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/beagle/i2c/bbb-i2c.c
 
 # GPIO
-librtemsbsp_a_SOURCES += gpio/bbb-gpio.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/beagle/gpio/bbb-gpio.c
 
 #pwm
-librtemsbsp_a_SOURCES += pwm/pwm.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/beagle/pwm/pwm.c
 
 #RTC
-librtemsbsp_a_SOURCES += rtc.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/beagle/rtc/rtc.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c
 # Clock
-librtemsbsp_a_SOURCES += clock.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/beagle/clock/clock.c
 
 # Cache
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cache/cache-cp15.c