diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/README b/bsps/powerpc/motorola_powerpc/bootloader/README
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/bootloader/README
rename to bsps/powerpc/motorola_powerpc/bootloader/README
diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/bootldr.h b/bsps/powerpc/motorola_powerpc/bootloader/bootldr.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/bootloader/bootldr.h
rename to bsps/powerpc/motorola_powerpc/bootloader/bootldr.h
diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/em86.c b/bsps/powerpc/motorola_powerpc/bootloader/em86.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/bootloader/em86.c
rename to bsps/powerpc/motorola_powerpc/bootloader/em86.c
diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/em86real.S b/bsps/powerpc/motorola_powerpc/bootloader/em86real.S
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/bootloader/em86real.S
rename to bsps/powerpc/motorola_powerpc/bootloader/em86real.S
diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/exception.S b/bsps/powerpc/motorola_powerpc/bootloader/exception.S
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/bootloader/exception.S
rename to bsps/powerpc/motorola_powerpc/bootloader/exception.S
diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/head.S b/bsps/powerpc/motorola_powerpc/bootloader/head.S
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/bootloader/head.S
rename to bsps/powerpc/motorola_powerpc/bootloader/head.S
diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/lib.c b/bsps/powerpc/motorola_powerpc/bootloader/lib.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/bootloader/lib.c
rename to bsps/powerpc/motorola_powerpc/bootloader/lib.c
diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/misc.c b/bsps/powerpc/motorola_powerpc/bootloader/misc.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/bootloader/misc.c
rename to bsps/powerpc/motorola_powerpc/bootloader/misc.c
diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/mm.c b/bsps/powerpc/motorola_powerpc/bootloader/mm.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/bootloader/mm.c
rename to bsps/powerpc/motorola_powerpc/bootloader/mm.c
diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/pci.c b/bsps/powerpc/motorola_powerpc/bootloader/pci.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/bootloader/pci.c
rename to bsps/powerpc/motorola_powerpc/bootloader/pci.c
diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/pci.h b/bsps/powerpc/motorola_powerpc/bootloader/pci.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/bootloader/pci.h
rename to bsps/powerpc/motorola_powerpc/bootloader/pci.h
diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/ppcboot.lds b/bsps/powerpc/motorola_powerpc/bootloader/ppcboot.lds
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/bootloader/ppcboot.lds
rename to bsps/powerpc/motorola_powerpc/bootloader/ppcboot.lds
diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/qemu_fakeres.c b/bsps/powerpc/motorola_powerpc/bootloader/qemu_fakeres.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/bootloader/qemu_fakeres.c
rename to bsps/powerpc/motorola_powerpc/bootloader/qemu_fakeres.c
diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/qemu_fakerom.S b/bsps/powerpc/motorola_powerpc/bootloader/qemu_fakerom.S
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/bootloader/qemu_fakerom.S
rename to bsps/powerpc/motorola_powerpc/bootloader/qemu_fakerom.S
diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/zlib.c b/bsps/powerpc/motorola_powerpc/bootloader/zlib.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/bootloader/zlib.c
rename to bsps/powerpc/motorola_powerpc/bootloader/zlib.c
diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/zlib.h b/bsps/powerpc/motorola_powerpc/bootloader/zlib.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/bootloader/zlib.h
rename to bsps/powerpc/motorola_powerpc/bootloader/zlib.h
diff --git a/bsps/powerpc/motorola_powerpc/dev/console.inl b/bsps/powerpc/motorola_powerpc/console/console.inl
similarity index 100%
rename from bsps/powerpc/motorola_powerpc/dev/console.inl
rename to bsps/powerpc/motorola_powerpc/console/console.inl
diff --git a/bsps/powerpc/motorola_powerpc/dev/keyboard.h b/bsps/powerpc/motorola_powerpc/console/keyboard.h
similarity index 100%
rename from bsps/powerpc/motorola_powerpc/dev/keyboard.h
rename to bsps/powerpc/motorola_powerpc/console/keyboard.h
diff --git a/bsps/powerpc/motorola_powerpc/dev/polled_io.c b/bsps/powerpc/motorola_powerpc/console/polled_io.c
similarity index 100%
rename from bsps/powerpc/motorola_powerpc/dev/polled_io.c
rename to bsps/powerpc/motorola_powerpc/console/polled_io.c
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
index fba8eefc01..5560b1f96f 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
@@ -54,7 +54,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/rtc/todcfg.c
 librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/p_clock.c
 
 # console
-librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/motorola_powerpc/dev/polled_io.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/motorola_powerpc/console/polled_io.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/console/uart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/console/console.c
 
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am
index 052b4f2ccc..f522135436 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am
@@ -5,16 +5,17 @@ AUTOMAKE_OPTIONS = no-exeext
 noinst_PROGRAMS = bootloader
 
 ## IMPORTANT: head.S must be first, T. Straumann 12/17/2001
-bootloader_SOURCES = ../../../powerpc/shared/bootloader/head.S \
-    ../../../powerpc/shared/bootloader/exception.S \
-    ../../../powerpc/shared/bootloader/em86real.S \
-    ../../../powerpc/shared/bootloader/misc.c \
-    ../../../powerpc/shared/bootloader/pci.c \
-    ../../../powerpc/shared/bootloader/zlib.c \
-    ../../../powerpc/shared/bootloader/mm.c \
-    ../../../powerpc/shared/bootloader/em86.c \
-    ../../../../../../../bsps/powerpc/motorola_powerpc/dev/polled_io.c \
-    ../../../powerpc/shared/bootloader/lib.c
+bootloader_SOURCES =
+bootloader_SOURCES += ../../../../../../../bsps/powerpc/motorola_powerpc/bootloader/head.S
+bootloader_SOURCES += ../../../../../../../bsps/powerpc/motorola_powerpc/bootloader/exception.S
+bootloader_SOURCES += ../../../../../../../bsps/powerpc/motorola_powerpc/bootloader/em86real.S
+bootloader_SOURCES += ../../../../../../../bsps/powerpc/motorola_powerpc/bootloader/misc.c
+bootloader_SOURCES += ../../../../../../../bsps/powerpc/motorola_powerpc/bootloader/pci.c
+bootloader_SOURCES += ../../../../../../../bsps/powerpc/motorola_powerpc/bootloader/zlib.c
+bootloader_SOURCES += ../../../../../../../bsps/powerpc/motorola_powerpc/bootloader/mm.c
+bootloader_SOURCES += ../../../../../../../bsps/powerpc/motorola_powerpc/bootloader/em86.c
+bootloader_SOURCES += ../../../../../../../bsps/powerpc/motorola_powerpc/console/polled_io.c
+bootloader_SOURCES += ../../../../../../../bsps/powerpc/motorola_powerpc/bootloader/lib.c
 
 # ----
 # Remove references to EABI when compiling bootloader
@@ -43,7 +44,7 @@ bootloader.$(OBJEXT): bootloader$(EXEEXT)
 	cp $< $@
 
 project_lib_DATA = bootloader.$(OBJEXT)
-project_lib_DATA += ../../shared/bootloader/ppcboot.lds
+project_lib_DATA += ../../../../../../../bsps/powerpc/motorola_powerpc/bootloader/ppcboot.lds
 
 all-local: $(TMPINSTALL_FILES)
 
@@ -58,7 +59,7 @@ $(PROJECT_LIB)/bootloader.$(OBJEXT): bootloader.$(OBJEXT) $(PROJECT_LIB)/$(dirst
 	$(INSTALL_DATA) $< $(PROJECT_LIB)/bootloader.$(OBJEXT)
 TMPINSTALL_FILES += $(PROJECT_LIB)/bootloader.$(OBJEXT)
 
-$(PROJECT_LIB)/ppcboot.lds: ../../shared/bootloader/ppcboot.lds $(PROJECT_LIB)/$(dirstamp)
+$(PROJECT_LIB)/ppcboot.lds: ../../../../../../../bsps/powerpc/motorola_powerpc/bootloader/ppcboot.lds $(PROJECT_LIB)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_LIB)/ppcboot.lds
 TMPINSTALL_FILES += $(PROJECT_LIB)/ppcboot.lds
 
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/qemu_fakerom/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/qemu_fakerom/Makefile.am
index 7a5730a9d6..591cb899d3 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/qemu_fakerom/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/qemu_fakerom/Makefile.am
@@ -12,10 +12,10 @@ project_lib_DATA += qemu_fakerom.bin
 
 
 ## IMPORTANT: head.S must be first, T. Straumann 12/17/2001
-qemu_fakerom.$(OBJEXT): ../../../powerpc/shared/bootloader/qemu_fakerom.S
+qemu_fakerom.$(OBJEXT): ../../../../../../../bsps/powerpc/motorola_powerpc/bootloader/qemu_fakerom.S
 	$(CPPASCOMPILE) -c -o $@ $^
 
-qemu_fakeres.$(OBJEXT): ../../../powerpc/shared/bootloader/qemu_fakeres.c
+qemu_fakeres.$(OBJEXT): ../../../../../../../bsps/powerpc/motorola_powerpc/bootloader/qemu_fakeres.c
 	$(CC) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o $@ $^
 
 qemu_fakerom.elf: qemu_fakerom.$(OBJEXT) qemu_fakeres.$(OBJEXT)