diff --git a/cpu/nios2/Makefile b/arch/nios2/cpu/Makefile
similarity index 100%
rename from cpu/nios2/Makefile
rename to arch/nios2/cpu/Makefile
diff --git a/cpu/nios2/config.mk b/arch/nios2/cpu/config.mk
similarity index 100%
rename from cpu/nios2/config.mk
rename to arch/nios2/cpu/config.mk
diff --git a/cpu/nios2/cpu.c b/arch/nios2/cpu/cpu.c
similarity index 100%
rename from cpu/nios2/cpu.c
rename to arch/nios2/cpu/cpu.c
diff --git a/cpu/nios2/epcs.c b/arch/nios2/cpu/epcs.c
similarity index 100%
rename from cpu/nios2/epcs.c
rename to arch/nios2/cpu/epcs.c
diff --git a/cpu/nios2/exceptions.S b/arch/nios2/cpu/exceptions.S
similarity index 100%
rename from cpu/nios2/exceptions.S
rename to arch/nios2/cpu/exceptions.S
diff --git a/cpu/nios2/interrupts.c b/arch/nios2/cpu/interrupts.c
similarity index 100%
rename from cpu/nios2/interrupts.c
rename to arch/nios2/cpu/interrupts.c
diff --git a/cpu/nios2/start.S b/arch/nios2/cpu/start.S
similarity index 100%
rename from cpu/nios2/start.S
rename to arch/nios2/cpu/start.S
diff --git a/cpu/nios2/sysid.c b/arch/nios2/cpu/sysid.c
similarity index 100%
rename from cpu/nios2/sysid.c
rename to arch/nios2/cpu/sysid.c
diff --git a/cpu/nios2/traps.c b/arch/nios2/cpu/traps.c
similarity index 100%
rename from cpu/nios2/traps.c
rename to arch/nios2/cpu/traps.c