diff --git a/cpu/microblaze/Makefile b/arch/microblaze/cpu/Makefile
similarity index 100%
rename from cpu/microblaze/Makefile
rename to arch/microblaze/cpu/Makefile
diff --git a/cpu/microblaze/cache.c b/arch/microblaze/cpu/cache.c
similarity index 100%
rename from cpu/microblaze/cache.c
rename to arch/microblaze/cpu/cache.c
diff --git a/cpu/microblaze/cpu.c b/arch/microblaze/cpu/cpu.c
similarity index 100%
rename from cpu/microblaze/cpu.c
rename to arch/microblaze/cpu/cpu.c
diff --git a/cpu/microblaze/exception.c b/arch/microblaze/cpu/exception.c
similarity index 100%
rename from cpu/microblaze/exception.c
rename to arch/microblaze/cpu/exception.c
diff --git a/cpu/microblaze/interrupts.c b/arch/microblaze/cpu/interrupts.c
similarity index 100%
rename from cpu/microblaze/interrupts.c
rename to arch/microblaze/cpu/interrupts.c
diff --git a/cpu/microblaze/irq.S b/arch/microblaze/cpu/irq.S
similarity index 100%
rename from cpu/microblaze/irq.S
rename to arch/microblaze/cpu/irq.S
diff --git a/cpu/microblaze/start.S b/arch/microblaze/cpu/start.S
similarity index 100%
rename from cpu/microblaze/start.S
rename to arch/microblaze/cpu/start.S
diff --git a/cpu/microblaze/timer.c b/arch/microblaze/cpu/timer.c
similarity index 100%
rename from cpu/microblaze/timer.c
rename to arch/microblaze/cpu/timer.c
diff --git a/board/xilinx/microblaze-generic/u-boot.lds b/board/xilinx/microblaze-generic/u-boot.lds
index c20c6dd..ee41145 100644
--- a/board/xilinx/microblaze-generic/u-boot.lds
+++ b/board/xilinx/microblaze-generic/u-boot.lds
@@ -30,7 +30,7 @@
 	.text ALIGN(0x4):
 	{
 		__text_start = .;
-		cpu/microblaze/start.o (.text)
+		arch/microblaze/cpu/start.o (.text)
 		*(.text)
 		__text_end = .;
 	}