diff --git a/src/include/pxe.h b/src/arch/i386/include/pxe.h
similarity index 100%
rename from src/include/pxe.h
rename to src/arch/i386/include/pxe.h
diff --git a/src/include/pxe_api.h b/src/arch/i386/include/pxe_api.h
similarity index 100%
rename from src/include/pxe_api.h
rename to src/arch/i386/include/pxe_api.h
diff --git a/src/include/pxe_types.h b/src/arch/i386/include/pxe_types.h
similarity index 100%
rename from src/include/pxe_types.h
rename to src/arch/i386/include/pxe_types.h
diff --git a/src/interface/pxe/pxe_errors.c b/src/arch/i386/interface/pxe/pxe_errors.c
similarity index 100%
rename from src/interface/pxe/pxe_errors.c
rename to src/arch/i386/interface/pxe/pxe_errors.c
diff --git a/src/interface/pxe/pxe_file.c b/src/arch/i386/interface/pxe/pxe_file.c
similarity index 100%
rename from src/interface/pxe/pxe_file.c
rename to src/arch/i386/interface/pxe/pxe_file.c
diff --git a/src/interface/pxe/pxe_loader.c b/src/arch/i386/interface/pxe/pxe_loader.c
similarity index 100%
rename from src/interface/pxe/pxe_loader.c
rename to src/arch/i386/interface/pxe/pxe_loader.c
diff --git a/src/interface/pxe/pxe_preboot.c b/src/arch/i386/interface/pxe/pxe_preboot.c
similarity index 100%
rename from src/interface/pxe/pxe_preboot.c
rename to src/arch/i386/interface/pxe/pxe_preboot.c
diff --git a/src/interface/pxe/pxe_tftp.c b/src/arch/i386/interface/pxe/pxe_tftp.c
similarity index 100%
rename from src/interface/pxe/pxe_tftp.c
rename to src/arch/i386/interface/pxe/pxe_tftp.c
diff --git a/src/interface/pxe/pxe_udp.c b/src/arch/i386/interface/pxe/pxe_udp.c
similarity index 100%
rename from src/interface/pxe/pxe_udp.c
rename to src/arch/i386/interface/pxe/pxe_udp.c
diff --git a/src/interface/pxe/pxe_undi.c b/src/arch/i386/interface/pxe/pxe_undi.c
similarity index 100%
rename from src/interface/pxe/pxe_undi.c
rename to src/arch/i386/interface/pxe/pxe_undi.c