diff --git a/src/include/gpxe/abft.h b/src/arch/i386/include/gpxe/abft.h
similarity index 100%
rename from src/include/gpxe/abft.h
rename to src/arch/i386/include/gpxe/abft.h
diff --git a/src/include/gpxe/ibft.h b/src/arch/i386/include/gpxe/ibft.h
similarity index 100%
rename from src/include/gpxe/ibft.h
rename to src/arch/i386/include/gpxe/ibft.h
diff --git a/src/core/abft.c b/src/arch/i386/interface/pcbios/abft.c
similarity index 100%
rename from src/core/abft.c
rename to src/arch/i386/interface/pcbios/abft.c
diff --git a/src/usr/aoeboot.c b/src/arch/i386/interface/pcbios/aoeboot.c
similarity index 100%
rename from src/usr/aoeboot.c
rename to src/arch/i386/interface/pcbios/aoeboot.c
diff --git a/src/core/ibft.c b/src/arch/i386/interface/pcbios/ibft.c
similarity index 100%
rename from src/core/ibft.c
rename to src/arch/i386/interface/pcbios/ibft.c
diff --git a/src/usr/iscsiboot.c b/src/arch/i386/interface/pcbios/iscsiboot.c
similarity index 100%
rename from src/usr/iscsiboot.c
rename to src/arch/i386/interface/pcbios/iscsiboot.c