diff --git a/target/linux/amazon/Makefile b/target/linux/amazon/Makefile
index 826937a5fe..aae39a00e9 100644
--- a/target/linux/amazon/Makefile
+++ b/target/linux/amazon/Makefile
@@ -18,12 +18,4 @@ define Target/Description
 	Build firmware images for Infineon Amazon boards
 endef
 
-ifeq ($(KERNEL_PATCHVER),2.6.30)
-  define Kernel/Prepare
-	$(call Kernel/Prepare/Default)
-	mv $(LINUX_DIR)/include/asm-mips/mach-amazon $(LINUX_DIR)/arch/mips/include/asm/mach-amazon
-	mv $(LINUX_DIR)/drivers/char/watchdog/amazon_wdt.c $(LINUX_DIR)/drivers/watchdog/amazon_wdt.c
-  endef
-endif
-
 $(eval $(call BuildTarget))
diff --git a/target/linux/amazon/files/include/asm-mips/mach-amazon/irq.h b/target/linux/amazon/files/arch/mips/include/asm/mach-amazon/irq.h
similarity index 100%
rename from target/linux/amazon/files/include/asm-mips/mach-amazon/irq.h
rename to target/linux/amazon/files/arch/mips/include/asm/mach-amazon/irq.h
diff --git a/target/linux/amazon/files/include/asm-mips/mach-amazon/mangle-port.h b/target/linux/amazon/files/arch/mips/include/asm/mach-amazon/mangle-port.h
similarity index 100%
rename from target/linux/amazon/files/include/asm-mips/mach-amazon/mangle-port.h
rename to target/linux/amazon/files/arch/mips/include/asm/mach-amazon/mangle-port.h
diff --git a/target/linux/amazon/files/include/asm-mips/mach-amazon/war.h b/target/linux/amazon/files/arch/mips/include/asm/mach-amazon/war.h
similarity index 100%
rename from target/linux/amazon/files/include/asm-mips/mach-amazon/war.h
rename to target/linux/amazon/files/arch/mips/include/asm/mach-amazon/war.h
diff --git a/target/linux/amazon/files/drivers/char/watchdog/amazon_wdt.c b/target/linux/amazon/files/drivers/watchdog/amazon_wdt.c
similarity index 100%
rename from target/linux/amazon/files/drivers/char/watchdog/amazon_wdt.c
rename to target/linux/amazon/files/drivers/watchdog/amazon_wdt.c