diff --git a/c/src/lib/libbsp/i386/shared/pci/pci_io.c b/bsps/i386/shared/pci/pci_io.c
similarity index 100%
rename from c/src/lib/libbsp/i386/shared/pci/pci_io.c
rename to bsps/i386/shared/pci/pci_io.c
diff --git a/c/src/lib/libbsp/i386/shared/pci/pcibios.c b/bsps/i386/shared/pci/pcibios.c
similarity index 100%
rename from c/src/lib/libbsp/i386/shared/pci/pcibios.c
rename to bsps/i386/shared/pci/pcibios.c
diff --git a/c/src/lib/libbsp/mips/malta/pci/pci.c b/bsps/mips/malta/pci/pci.c
similarity index 100%
rename from c/src/lib/libbsp/mips/malta/pci/pci.c
rename to bsps/mips/malta/pci/pci.c
diff --git a/c/src/lib/libbsp/powerpc/beatnik/pci/gt_pci_init.c b/bsps/powerpc/beatnik/pci/gt_pci_init.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/beatnik/pci/gt_pci_init.c
rename to bsps/powerpc/beatnik/pci/gt_pci_init.c
diff --git a/c/src/lib/libbsp/powerpc/beatnik/pci/motload_fixup.c b/bsps/powerpc/beatnik/pci/motload_fixup.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/beatnik/pci/motload_fixup.c
rename to bsps/powerpc/beatnik/pci/motload_fixup.c
diff --git a/c/src/lib/libbsp/powerpc/beatnik/pci/pci_io_remap.c b/bsps/powerpc/beatnik/pci/pci_io_remap.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/beatnik/pci/pci_io_remap.c
rename to bsps/powerpc/beatnik/pci/pci_io_remap.c
diff --git a/c/src/lib/libbsp/powerpc/beatnik/pci/pci_io_remap.h b/bsps/powerpc/beatnik/pci/pci_io_remap.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/beatnik/pci/pci_io_remap.h
rename to bsps/powerpc/beatnik/pci/pci_io_remap.h
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/pci/detect_host_bridge.c b/bsps/powerpc/mvme3100/pci/detect_host_bridge.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mvme3100/pci/detect_host_bridge.c
rename to bsps/powerpc/mvme3100/pci/detect_host_bridge.c
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/pci/detect_host_bridge.c b/bsps/powerpc/mvme5500/pci/detect_host_bridge.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mvme5500/pci/detect_host_bridge.c
rename to bsps/powerpc/mvme5500/pci/detect_host_bridge.c
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/pci/pci.c b/bsps/powerpc/mvme5500/pci/pci.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mvme5500/pci/pci.c
rename to bsps/powerpc/mvme5500/pci/pci.c
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/pci/pci_interface.c b/bsps/powerpc/mvme5500/pci/pci_interface.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mvme5500/pci/pci_interface.c
rename to bsps/powerpc/mvme5500/pci/pci_interface.c
diff --git a/c/src/lib/libbsp/powerpc/shared/pci/detect_raven_bridge.c b/bsps/powerpc/shared/pci/detect_raven_bridge.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/pci/detect_raven_bridge.c
rename to bsps/powerpc/shared/pci/detect_raven_bridge.c
diff --git a/c/src/lib/libbsp/powerpc/shared/pci/generic_clear_hberrs.c b/bsps/powerpc/shared/pci/generic_clear_hberrs.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/pci/generic_clear_hberrs.c
rename to bsps/powerpc/shared/pci/generic_clear_hberrs.c
diff --git a/c/src/lib/libbsp/powerpc/shared/pci/pci.c b/bsps/powerpc/shared/pci/pci.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/pci/pci.c
rename to bsps/powerpc/shared/pci/pci.c
diff --git a/c/src/lib/libbsp/powerpc/shared/pci/pcifinddevice.c b/bsps/powerpc/shared/pci/pcifinddevice.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/pci/pcifinddevice.c
rename to bsps/powerpc/shared/pci/pcifinddevice.c
diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am
index 70028f5e65..ed354460bd 100644
--- a/c/src/lib/libbsp/i386/pc386/Makefile.am
+++ b/c/src/lib/libbsp/i386/pc386/Makefile.am
@@ -98,8 +98,8 @@ librtemsbsp_a_SOURCES += ../shared/comm/gdb_glue.c
 # gnat
 
 # pci
-librtemsbsp_a_SOURCES += ../shared/pci/pcibios.c
-librtemsbsp_a_SOURCES += ../shared/pci/pci_io.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/shared/pci/pcibios.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/shared/pci/pci_io.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/pci/pci_bus_count.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/pci/pci_find_device.c
 
diff --git a/c/src/lib/libbsp/mips/malta/Makefile.am b/c/src/lib/libbsp/mips/malta/Makefile.am
index 3240ea9ea2..68567e3959 100644
--- a/c/src/lib/libbsp/mips/malta/Makefile.am
+++ b/c/src/lib/libbsp/mips/malta/Makefile.am
@@ -51,7 +51,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/installisrentrie
 librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/isr_entries.S
 
 # pci
-librtemsbsp_a_SOURCES += pci/pci.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/malta/pci/pci.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/pci/pci_find_device.c
 
 #isr
diff --git a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
index e49d9915a0..3b5689968b 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
@@ -76,11 +76,11 @@ librtemsbsp_a_SOURCES += ../shared/flash/intelFlash.c
 librtemsbsp_a_SOURCES += flash/flashcfg.c
 
 #pci
-librtemsbsp_a_SOURCES += ../shared/pci/pci.c
-librtemsbsp_a_SOURCES += pci/gt_pci_init.c
-librtemsbsp_a_SOURCES += pci/pci_io_remap.c
-librtemsbsp_a_SOURCES += pci/motload_fixup.c
-librtemsbsp_a_SOURCES += ../shared/pci/pcifinddevice.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/pci/pci.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/beatnik/pci/gt_pci_init.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/beatnik/pci/pci_io_remap.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/beatnik/pci/motload_fixup.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/pci/pcifinddevice.c
 
 #network
 if HAS_NETWORKING
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
index 0ebc88d088..fba8eefc01 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
@@ -70,10 +70,10 @@ librtemsbsp_a_SOURCES += ../shared/motorola/motorola.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/openpic.c
 
 # pci
-librtemsbsp_a_SOURCES += ../shared/pci/pci.c
-librtemsbsp_a_SOURCES += ../shared/pci/detect_raven_bridge.c
-librtemsbsp_a_SOURCES += ../shared/pci/generic_clear_hberrs.c
-librtemsbsp_a_SOURCES += ../shared/pci/pcifinddevice.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/pci/pci.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/pci/detect_raven_bridge.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/pci/generic_clear_hberrs.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/pci/pcifinddevice.c
 
 # residual
 librtemsbsp_a_SOURCES += ../shared/residual/residual.c
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
index 1c3a18e51a..04673f89b3 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
@@ -63,10 +63,10 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/openpic_i8259
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/openpic.c
 
 # pci
-librtemsbsp_a_SOURCES += ../shared/pci/pci.c
-librtemsbsp_a_SOURCES += pci/detect_host_bridge.c
-librtemsbsp_a_SOURCES += ../shared/pci/generic_clear_hberrs.c
-librtemsbsp_a_SOURCES += ../shared/pci/pcifinddevice.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/pci/pci.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mvme3100/pci/detect_host_bridge.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/pci/generic_clear_hberrs.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/pci/pcifinddevice.c
 
 # flash
 librtemsbsp_a_SOURCES += ../shared/flash/flash.c
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
index a3cfcfb7b5..e2e57d8345 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
@@ -33,9 +33,9 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/console/uart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/console/console.c
 
 # pci
-librtemsbsp_a_SOURCES += pci/pci.c
-librtemsbsp_a_SOURCES += pci/pci_interface.c
-librtemsbsp_a_SOURCES += pci/detect_host_bridge.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mvme5500/pci/pci.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mvme5500/pci/pci_interface.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mvme5500/pci/detect_host_bridge.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/pci/pci_find_device.c
 
 # irq