diff --git a/target/linux/lantiq/ase/config-default b/target/linux/lantiq/ase/config-4.9
similarity index 100%
rename from target/linux/lantiq/ase/config-default
rename to target/linux/lantiq/ase/config-4.9
diff --git a/target/linux/lantiq/falcon/config-default b/target/linux/lantiq/falcon/config-4.9
similarity index 100%
rename from target/linux/lantiq/falcon/config-default
rename to target/linux/lantiq/falcon/config-4.9
diff --git a/target/linux/lantiq/dts/ACMP252.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/ACMP252.dts
similarity index 100%
rename from target/linux/lantiq/dts/ACMP252.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/ACMP252.dts
diff --git a/target/linux/lantiq/dts/ALL0333CJ.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/ALL0333CJ.dts
similarity index 100%
rename from target/linux/lantiq/dts/ALL0333CJ.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/ALL0333CJ.dts
diff --git a/target/linux/lantiq/dts/ARV4510PW.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/ARV4510PW.dts
similarity index 100%
rename from target/linux/lantiq/dts/ARV4510PW.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/ARV4510PW.dts
diff --git a/target/linux/lantiq/dts/ARV4518PWR01.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/ARV4518PWR01.dts
similarity index 100%
rename from target/linux/lantiq/dts/ARV4518PWR01.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/ARV4518PWR01.dts
diff --git a/target/linux/lantiq/dts/ARV4518PWR01.dtsi b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/ARV4518PWR01.dtsi
similarity index 100%
rename from target/linux/lantiq/dts/ARV4518PWR01.dtsi
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/ARV4518PWR01.dtsi
diff --git a/target/linux/lantiq/dts/ARV4518PWR01A.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/ARV4518PWR01A.dts
similarity index 100%
rename from target/linux/lantiq/dts/ARV4518PWR01A.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/ARV4518PWR01A.dts
diff --git a/target/linux/lantiq/dts/ARV4519PW.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/ARV4519PW.dts
similarity index 100%
rename from target/linux/lantiq/dts/ARV4519PW.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/ARV4519PW.dts
diff --git a/target/linux/lantiq/dts/ARV4520PW.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/ARV4520PW.dts
similarity index 100%
rename from target/linux/lantiq/dts/ARV4520PW.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/ARV4520PW.dts
diff --git a/target/linux/lantiq/dts/ARV4525PW.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/ARV4525PW.dts
similarity index 100%
rename from target/linux/lantiq/dts/ARV4525PW.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/ARV4525PW.dts
diff --git a/target/linux/lantiq/dts/ARV452CQW.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/ARV452CQW.dts
similarity index 100%
rename from target/linux/lantiq/dts/ARV452CQW.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/ARV452CQW.dts
diff --git a/target/linux/lantiq/dts/ARV7506PW11.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/ARV7506PW11.dts
similarity index 100%
rename from target/linux/lantiq/dts/ARV7506PW11.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/ARV7506PW11.dts
diff --git a/target/linux/lantiq/dts/ARV7510PW22.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/ARV7510PW22.dts
similarity index 100%
rename from target/linux/lantiq/dts/ARV7510PW22.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/ARV7510PW22.dts
diff --git a/target/linux/lantiq/dts/ARV7518PW.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/ARV7518PW.dts
similarity index 100%
rename from target/linux/lantiq/dts/ARV7518PW.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/ARV7518PW.dts
diff --git a/target/linux/lantiq/dts/ARV7519PW.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/ARV7519PW.dts
similarity index 100%
rename from target/linux/lantiq/dts/ARV7519PW.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/ARV7519PW.dts
diff --git a/target/linux/lantiq/dts/ARV7519RW22.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/ARV7519RW22.dts
similarity index 100%
rename from target/linux/lantiq/dts/ARV7519RW22.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/ARV7519RW22.dts
diff --git a/target/linux/lantiq/dts/ARV7525PW.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/ARV7525PW.dts
similarity index 100%
rename from target/linux/lantiq/dts/ARV7525PW.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/ARV7525PW.dts
diff --git a/target/linux/lantiq/dts/ARV752DPW.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/ARV752DPW.dts
similarity index 100%
rename from target/linux/lantiq/dts/ARV752DPW.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/ARV752DPW.dts
diff --git a/target/linux/lantiq/dts/ARV752DPW22.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/ARV752DPW22.dts
similarity index 100%
rename from target/linux/lantiq/dts/ARV752DPW22.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/ARV752DPW22.dts
diff --git a/target/linux/lantiq/dts/ARV8539PW22.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/ARV8539PW22.dts
similarity index 100%
rename from target/linux/lantiq/dts/ARV8539PW22.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/ARV8539PW22.dts
diff --git a/target/linux/lantiq/dts/ASL56026.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/ASL56026.dts
similarity index 100%
rename from target/linux/lantiq/dts/ASL56026.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/ASL56026.dts
diff --git a/target/linux/lantiq/dts/BTHOMEHUBV2B.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/BTHOMEHUBV2B.dts
similarity index 100%
rename from target/linux/lantiq/dts/BTHOMEHUBV2B.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/BTHOMEHUBV2B.dts
diff --git a/target/linux/lantiq/dts/BTHOMEHUBV3A.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/BTHOMEHUBV3A.dts
similarity index 100%
rename from target/linux/lantiq/dts/BTHOMEHUBV3A.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/BTHOMEHUBV3A.dts
diff --git a/target/linux/lantiq/dts/BTHOMEHUBV5A.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/BTHOMEHUBV5A.dts
similarity index 100%
rename from target/linux/lantiq/dts/BTHOMEHUBV5A.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/BTHOMEHUBV5A.dts
diff --git a/target/linux/lantiq/dts/DGN1000B.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/DGN1000B.dts
similarity index 100%
rename from target/linux/lantiq/dts/DGN1000B.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/DGN1000B.dts
diff --git a/target/linux/lantiq/dts/DGN3500.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/DGN3500.dts
similarity index 100%
rename from target/linux/lantiq/dts/DGN3500.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/DGN3500.dts
diff --git a/target/linux/lantiq/dts/DGN3500.dtsi b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/DGN3500.dtsi
similarity index 100%
rename from target/linux/lantiq/dts/DGN3500.dtsi
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/DGN3500.dtsi
diff --git a/target/linux/lantiq/dts/DGN3500B.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/DGN3500B.dts
similarity index 100%
rename from target/linux/lantiq/dts/DGN3500B.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/DGN3500B.dts
diff --git a/target/linux/lantiq/dts/DM200.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/DM200.dts
similarity index 100%
rename from target/linux/lantiq/dts/DM200.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/DM200.dts
diff --git a/target/linux/lantiq/dts/EASY50712.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/EASY50712.dts
similarity index 100%
rename from target/linux/lantiq/dts/EASY50712.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/EASY50712.dts
diff --git a/target/linux/lantiq/dts/EASY50810.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/EASY50810.dts
similarity index 100%
rename from target/linux/lantiq/dts/EASY50810.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/EASY50810.dts
diff --git a/target/linux/lantiq/dts/EASY80920.dtsi b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/EASY80920.dtsi
similarity index 100%
rename from target/linux/lantiq/dts/EASY80920.dtsi
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/EASY80920.dtsi
diff --git a/target/linux/lantiq/dts/EASY80920NAND.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/EASY80920NAND.dts
similarity index 100%
rename from target/linux/lantiq/dts/EASY80920NAND.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/EASY80920NAND.dts
diff --git a/target/linux/lantiq/dts/EASY80920NOR.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/EASY80920NOR.dts
similarity index 100%
rename from target/linux/lantiq/dts/EASY80920NOR.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/EASY80920NOR.dts
diff --git a/target/linux/lantiq/dts/EASY88388.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/EASY88388.dts
similarity index 100%
rename from target/linux/lantiq/dts/EASY88388.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/EASY88388.dts
diff --git a/target/linux/lantiq/dts/EASY88444.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/EASY88444.dts
similarity index 100%
rename from target/linux/lantiq/dts/EASY88444.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/EASY88444.dts
diff --git a/target/linux/lantiq/dts/EASY98000-base.dtsi b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/EASY98000-base.dtsi
similarity index 100%
rename from target/linux/lantiq/dts/EASY98000-base.dtsi
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/EASY98000-base.dtsi
diff --git a/target/linux/lantiq/dts/EASY98000NAND.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/EASY98000NAND.dts
similarity index 100%
rename from target/linux/lantiq/dts/EASY98000NAND.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/EASY98000NAND.dts
diff --git a/target/linux/lantiq/dts/EASY98000NOR.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/EASY98000NOR.dts
similarity index 100%
rename from target/linux/lantiq/dts/EASY98000NOR.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/EASY98000NOR.dts
diff --git a/target/linux/lantiq/dts/EASY98000SFLASH.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/EASY98000SFLASH.dts
similarity index 100%
rename from target/linux/lantiq/dts/EASY98000SFLASH.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/EASY98000SFLASH.dts
diff --git a/target/linux/lantiq/dts/EASY98020.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/EASY98020.dts
similarity index 100%
rename from target/linux/lantiq/dts/EASY98020.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/EASY98020.dts
diff --git a/target/linux/lantiq/dts/EASY98020V18.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/EASY98020V18.dts
similarity index 100%
rename from target/linux/lantiq/dts/EASY98020V18.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/EASY98020V18.dts
diff --git a/target/linux/lantiq/dts/EASY98021.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/EASY98021.dts
similarity index 100%
rename from target/linux/lantiq/dts/EASY98021.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/EASY98021.dts
diff --git a/target/linux/lantiq/dts/EASY98035SYNCE.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/EASY98035SYNCE.dts
similarity index 100%
rename from target/linux/lantiq/dts/EASY98035SYNCE.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/EASY98035SYNCE.dts
diff --git a/target/linux/lantiq/dts/EASY98035SYNCE1588.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/EASY98035SYNCE1588.dts
similarity index 100%
rename from target/linux/lantiq/dts/EASY98035SYNCE1588.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/EASY98035SYNCE1588.dts
diff --git a/target/linux/lantiq/dts/FALCON-MDU.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/FALCON-MDU.dts
similarity index 100%
rename from target/linux/lantiq/dts/FALCON-MDU.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/FALCON-MDU.dts
diff --git a/target/linux/lantiq/dts/FALCON-SFP.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/FALCON-SFP.dts
similarity index 100%
rename from target/linux/lantiq/dts/FALCON-SFP.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/FALCON-SFP.dts
diff --git a/target/linux/lantiq/dts/FRITZ3370.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/FRITZ3370.dts
similarity index 100%
rename from target/linux/lantiq/dts/FRITZ3370.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/FRITZ3370.dts
diff --git a/target/linux/lantiq/dts/FRITZ7320.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/FRITZ7320.dts
similarity index 100%
rename from target/linux/lantiq/dts/FRITZ7320.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/FRITZ7320.dts
diff --git a/target/linux/lantiq/dts/FRITZ7360SL.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/FRITZ7360SL.dts
similarity index 100%
rename from target/linux/lantiq/dts/FRITZ7360SL.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/FRITZ7360SL.dts
diff --git a/target/linux/lantiq/dts/GIGASX76X.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/GIGASX76X.dts
similarity index 100%
rename from target/linux/lantiq/dts/GIGASX76X.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/GIGASX76X.dts
diff --git a/target/linux/lantiq/dts/H201L.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/H201L.dts
similarity index 100%
rename from target/linux/lantiq/dts/H201L.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/H201L.dts
diff --git a/target/linux/lantiq/dts/P2601HNFX.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/P2601HNFX.dts
similarity index 100%
rename from target/linux/lantiq/dts/P2601HNFX.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/P2601HNFX.dts
diff --git a/target/linux/lantiq/dts/P2812HNUF1.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/P2812HNUF1.dts
similarity index 100%
rename from target/linux/lantiq/dts/P2812HNUF1.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/P2812HNUF1.dts
diff --git a/target/linux/lantiq/dts/P2812HNUF3.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/P2812HNUF3.dts
similarity index 100%
rename from target/linux/lantiq/dts/P2812HNUF3.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/P2812HNUF3.dts
diff --git a/target/linux/lantiq/dts/P2812HNUFX.dtsi b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/P2812HNUFX.dtsi
similarity index 100%
rename from target/linux/lantiq/dts/P2812HNUFX.dtsi
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/P2812HNUFX.dtsi
diff --git a/target/linux/lantiq/dts/TDW8970.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/TDW8970.dts
similarity index 100%
rename from target/linux/lantiq/dts/TDW8970.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/TDW8970.dts
diff --git a/target/linux/lantiq/dts/TDW8980.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/TDW8980.dts
similarity index 100%
rename from target/linux/lantiq/dts/TDW8980.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/TDW8980.dts
diff --git a/target/linux/lantiq/dts/TDW89X0.dtsi b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/TDW89X0.dtsi
similarity index 100%
rename from target/linux/lantiq/dts/TDW89X0.dtsi
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/TDW89X0.dtsi
diff --git a/target/linux/lantiq/dts/VG3503J.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/VG3503J.dts
similarity index 100%
rename from target/linux/lantiq/dts/VG3503J.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/VG3503J.dts
diff --git a/target/linux/lantiq/dts/VGV7510KW22.dtsi b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/VGV7510KW22.dtsi
similarity index 100%
rename from target/linux/lantiq/dts/VGV7510KW22.dtsi
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/VGV7510KW22.dtsi
diff --git a/target/linux/lantiq/dts/VGV7510KW22BRN.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/VGV7510KW22BRN.dts
similarity index 100%
rename from target/linux/lantiq/dts/VGV7510KW22BRN.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/VGV7510KW22BRN.dts
diff --git a/target/linux/lantiq/dts/VGV7510KW22NOR.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/VGV7510KW22NOR.dts
similarity index 100%
rename from target/linux/lantiq/dts/VGV7510KW22NOR.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/VGV7510KW22NOR.dts
diff --git a/target/linux/lantiq/dts/VGV7519.dtsi b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/VGV7519.dtsi
similarity index 100%
rename from target/linux/lantiq/dts/VGV7519.dtsi
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/VGV7519.dtsi
diff --git a/target/linux/lantiq/dts/VGV7519BRN.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/VGV7519BRN.dts
similarity index 100%
rename from target/linux/lantiq/dts/VGV7519BRN.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/VGV7519BRN.dts
diff --git a/target/linux/lantiq/dts/VGV7519NOR.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/VGV7519NOR.dts
similarity index 100%
rename from target/linux/lantiq/dts/VGV7519NOR.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/VGV7519NOR.dts
diff --git a/target/linux/lantiq/dts/VR200v.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/VR200v.dts
similarity index 100%
rename from target/linux/lantiq/dts/VR200v.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/VR200v.dts
diff --git a/target/linux/lantiq/dts/WBMR.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/WBMR.dts
similarity index 100%
rename from target/linux/lantiq/dts/WBMR.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/WBMR.dts
diff --git a/target/linux/lantiq/dts/WBMR300.dts b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/WBMR300.dts
similarity index 100%
rename from target/linux/lantiq/dts/WBMR300.dts
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/WBMR300.dts
diff --git a/target/linux/lantiq/dts/amazonse.dtsi b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/amazonse.dtsi
similarity index 100%
rename from target/linux/lantiq/dts/amazonse.dtsi
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/amazonse.dtsi
diff --git a/target/linux/lantiq/dts/ar9.dtsi b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/ar9.dtsi
similarity index 100%
rename from target/linux/lantiq/dts/ar9.dtsi
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/ar9.dtsi
diff --git a/target/linux/lantiq/dts/danube.dtsi b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/danube.dtsi
similarity index 100%
rename from target/linux/lantiq/dts/danube.dtsi
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/danube.dtsi
diff --git a/target/linux/lantiq/dts/falcon-sflash-16M.dtsi b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/falcon-sflash-16M.dtsi
similarity index 100%
rename from target/linux/lantiq/dts/falcon-sflash-16M.dtsi
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/falcon-sflash-16M.dtsi
diff --git a/target/linux/lantiq/dts/falcon.dtsi b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/falcon.dtsi
similarity index 100%
rename from target/linux/lantiq/dts/falcon.dtsi
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/falcon.dtsi
diff --git a/target/linux/lantiq/dts/vr9.dtsi b/target/linux/lantiq/files-4.9/arch/mips/boot/dts/vr9.dtsi
similarity index 100%
rename from target/linux/lantiq/dts/vr9.dtsi
rename to target/linux/lantiq/files-4.9/arch/mips/boot/dts/vr9.dtsi
diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile
index 2e8eccf5ac6d0da49b2d96ea3505b552ae2f69a7..e52e43c6e59e4dc58c57a3b72617853e03c0d3f7 100644
--- a/target/linux/lantiq/image/Makefile
+++ b/target/linux/lantiq/image/Makefile
@@ -55,12 +55,11 @@ endef
 # Shared device definition: applies to every defined device
 define Device/Default
   PROFILES = Default
-  KERNEL_DEPENDS = $$(wildcard ../dts/$$(DEVICE_DTS).dts)
+  KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts)
   KERNEL_INITRAMFS_NAME = $$(KERNEL_NAME)-initramfs
   KERNEL := kernel-bin | append-dtb | lzma | uImage lzma
   KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | uImage lzma
   FILESYSTEMS := squashfs
-  DEVICE_DTS_DIR := ../dts
   IMAGE_SIZE :=
   SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
   IMAGES := sysupgrade.bin
diff --git a/target/linux/lantiq/xrx200/config-default b/target/linux/lantiq/xrx200/config-4.9
similarity index 100%
rename from target/linux/lantiq/xrx200/config-default
rename to target/linux/lantiq/xrx200/config-4.9
diff --git a/target/linux/lantiq/xway/config-default b/target/linux/lantiq/xway/config-4.9
similarity index 100%
rename from target/linux/lantiq/xway/config-default
rename to target/linux/lantiq/xway/config-4.9
diff --git a/target/linux/lantiq/xway_legacy/config-default b/target/linux/lantiq/xway_legacy/config-4.9
similarity index 100%
rename from target/linux/lantiq/xway_legacy/config-default
rename to target/linux/lantiq/xway_legacy/config-4.9