diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_ac97/ac97.c b/bsps/lm32/shared/milkymist_ac97/ac97.c
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/milkymist_ac97/ac97.c
rename to bsps/lm32/shared/milkymist_ac97/ac97.c
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_buttons/buttons.c b/bsps/lm32/shared/milkymist_buttons/buttons.c
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/milkymist_buttons/buttons.c
rename to bsps/lm32/shared/milkymist_buttons/buttons.c
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_clock/ckinit.c b/bsps/lm32/shared/milkymist_clock/ckinit.c
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/milkymist_clock/ckinit.c
rename to bsps/lm32/shared/milkymist_clock/ckinit.c
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_clock/clock.h b/bsps/lm32/shared/milkymist_clock/clock.h
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/milkymist_clock/clock.h
rename to bsps/lm32/shared/milkymist_clock/clock.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_console/console.c b/bsps/lm32/shared/milkymist_console/console.c
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/milkymist_console/console.c
rename to bsps/lm32/shared/milkymist_console/console.c
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_console/uart.c b/bsps/lm32/shared/milkymist_console/uart.c
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/milkymist_console/uart.c
rename to bsps/lm32/shared/milkymist_console/uart.c
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_console/uart.h b/bsps/lm32/shared/milkymist_console/uart.h
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/milkymist_console/uart.h
rename to bsps/lm32/shared/milkymist_console/uart.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_dmx/dmx.c b/bsps/lm32/shared/milkymist_dmx/dmx.c
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/milkymist_dmx/dmx.c
rename to bsps/lm32/shared/milkymist_dmx/dmx.c
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_flash/flash.c b/bsps/lm32/shared/milkymist_flash/flash.c
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/milkymist_flash/flash.c
rename to bsps/lm32/shared/milkymist_flash/flash.c
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_framebuffer/framebuffer.c b/bsps/lm32/shared/milkymist_framebuffer/framebuffer.c
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/milkymist_framebuffer/framebuffer.c
rename to bsps/lm32/shared/milkymist_framebuffer/framebuffer.c
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_gpio/gpio.c b/bsps/lm32/shared/milkymist_gpio/gpio.c
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/milkymist_gpio/gpio.c
rename to bsps/lm32/shared/milkymist_gpio/gpio.c
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_ir/ir.c b/bsps/lm32/shared/milkymist_ir/ir.c
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/milkymist_ir/ir.c
rename to bsps/lm32/shared/milkymist_ir/ir.c
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_memcard/memcard.c b/bsps/lm32/shared/milkymist_memcard/memcard.c
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/milkymist_memcard/memcard.c
rename to bsps/lm32/shared/milkymist_memcard/memcard.c
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_midi/midi.c b/bsps/lm32/shared/milkymist_midi/midi.c
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/milkymist_midi/midi.c
rename to bsps/lm32/shared/milkymist_midi/midi.c
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_pfpu/pfpu.c b/bsps/lm32/shared/milkymist_pfpu/pfpu.c
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/milkymist_pfpu/pfpu.c
rename to bsps/lm32/shared/milkymist_pfpu/pfpu.c
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_timer/timer.c b/bsps/lm32/shared/milkymist_timer/timer.c
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/milkymist_timer/timer.c
rename to bsps/lm32/shared/milkymist_timer/timer.c
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_tmu/tmu.c b/bsps/lm32/shared/milkymist_tmu/tmu.c
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/milkymist_tmu/tmu.c
rename to bsps/lm32/shared/milkymist_tmu/tmu.c
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_usbinput/comloc.h b/bsps/lm32/shared/milkymist_usbinput/comloc.h
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/milkymist_usbinput/comloc.h
rename to bsps/lm32/shared/milkymist_usbinput/comloc.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_usbinput/usbinput.c b/bsps/lm32/shared/milkymist_usbinput/usbinput.c
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/milkymist_usbinput/usbinput.c
rename to bsps/lm32/shared/milkymist_usbinput/usbinput.c
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_versions/versions.c b/bsps/lm32/shared/milkymist_versions/versions.c
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/milkymist_versions/versions.c
rename to bsps/lm32/shared/milkymist_versions/versions.c
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_video/video.c b/bsps/lm32/shared/milkymist_video/video.c
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/milkymist_video/video.c
rename to bsps/lm32/shared/milkymist_video/video.c
diff --git a/c/src/lib/libbsp/lm32/milkymist/Makefile.am b/c/src/lib/libbsp/lm32/milkymist/Makefile.am
index b779f973f6..3c3b16ec3b 100644
--- a/c/src/lib/libbsp/lm32/milkymist/Makefile.am
+++ b/c/src/lib/libbsp/lm32/milkymist/Makefile.am
@@ -31,56 +31,56 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/lm32/shared/irq/irq.c
 
 # clock
-librtemsbsp_a_SOURCES += ../shared/milkymist_clock/ckinit.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/lm32/shared/milkymist_clock/ckinit.c
 
 # console
-librtemsbsp_a_SOURCES += ../shared/milkymist_console/console.c
-librtemsbsp_a_SOURCES += ../shared/milkymist_console/uart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/lm32/shared/milkymist_console/console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/lm32/shared/milkymist_console/uart.c
 
 # timer
-librtemsbsp_a_SOURCES += ../shared/milkymist_timer/timer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/lm32/shared/milkymist_timer/timer.c
 
 # framebuffer
-librtemsbsp_a_SOURCES += ../shared/milkymist_framebuffer/framebuffer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/lm32/shared/milkymist_framebuffer/framebuffer.c
 
 # GPIO
-librtemsbsp_a_SOURCES += ../shared/milkymist_gpio/gpio.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/lm32/shared/milkymist_gpio/gpio.c
 
 # buttons
-librtemsbsp_a_SOURCES += ../shared/milkymist_buttons/buttons.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/lm32/shared/milkymist_buttons/buttons.c
 
 # ac97
-librtemsbsp_a_SOURCES += ../shared/milkymist_ac97/ac97.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/lm32/shared/milkymist_ac97/ac97.c
 
 # usbinput
-librtemsbsp_a_SOURCES += ../shared/milkymist_usbinput/usbinput.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/lm32/shared/milkymist_usbinput/usbinput.c
 
 # PFPU
-librtemsbsp_a_SOURCES += ../shared/milkymist_pfpu/pfpu.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/lm32/shared/milkymist_pfpu/pfpu.c
 
 # TMU
-librtemsbsp_a_SOURCES += ../shared/milkymist_tmu/tmu.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/lm32/shared/milkymist_tmu/tmu.c
 
 # memory card
-librtemsbsp_a_SOURCES += ../shared/milkymist_memcard/memcard.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/lm32/shared/milkymist_memcard/memcard.c
 
 # flash
-librtemsbsp_a_SOURCES += ../shared/milkymist_flash/flash.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/lm32/shared/milkymist_flash/flash.c
 
 # DMX
-librtemsbsp_a_SOURCES += ../shared/milkymist_dmx/dmx.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/lm32/shared/milkymist_dmx/dmx.c
 
 # MIDI
-librtemsbsp_a_SOURCES += ../shared/milkymist_midi/midi.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/lm32/shared/milkymist_midi/midi.c
 
 # IR
-librtemsbsp_a_SOURCES += ../shared/milkymist_ir/ir.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/lm32/shared/milkymist_ir/ir.c
 
 # video input
-librtemsbsp_a_SOURCES += ../shared/milkymist_video/video.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/lm32/shared/milkymist_video/video.c
 
 # versions
-librtemsbsp_a_SOURCES += ../shared/milkymist_versions/versions.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/lm32/shared/milkymist_versions/versions.c
 
 # Cache
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c