diff --git a/target/linux/kirkwood/files/arch/arm/mach-kirkwood/goflexhome-setup.c b/target/linux/kirkwood/files-3.3/arch/arm/mach-kirkwood/goflexhome-setup.c
similarity index 100%
rename from target/linux/kirkwood/files/arch/arm/mach-kirkwood/goflexhome-setup.c
rename to target/linux/kirkwood/files-3.3/arch/arm/mach-kirkwood/goflexhome-setup.c
diff --git a/target/linux/kirkwood/files/arch/arm/mach-kirkwood/goflexnet-setup.c b/target/linux/kirkwood/files-3.3/arch/arm/mach-kirkwood/goflexnet-setup.c
similarity index 100%
rename from target/linux/kirkwood/files/arch/arm/mach-kirkwood/goflexnet-setup.c
rename to target/linux/kirkwood/files-3.3/arch/arm/mach-kirkwood/goflexnet-setup.c
diff --git a/target/linux/kirkwood/files/arch/arm/mach-kirkwood/iconnect-setup.c b/target/linux/kirkwood/files-3.3/arch/arm/mach-kirkwood/iconnect-setup.c
similarity index 100%
rename from target/linux/kirkwood/files/arch/arm/mach-kirkwood/iconnect-setup.c
rename to target/linux/kirkwood/files-3.3/arch/arm/mach-kirkwood/iconnect-setup.c
diff --git a/target/linux/kirkwood/files/arch/arm/mach-kirkwood/nas6210-setup.c b/target/linux/kirkwood/files-3.3/arch/arm/mach-kirkwood/nas6210-setup.c
similarity index 100%
rename from target/linux/kirkwood/files/arch/arm/mach-kirkwood/nas6210-setup.c
rename to target/linux/kirkwood/files-3.3/arch/arm/mach-kirkwood/nas6210-setup.c
diff --git a/target/linux/kirkwood/files/arch/arm/mach-kirkwood/nsa-310-setup.c b/target/linux/kirkwood/files-3.3/arch/arm/mach-kirkwood/nsa-310-setup.c
similarity index 100%
rename from target/linux/kirkwood/files/arch/arm/mach-kirkwood/nsa-310-setup.c
rename to target/linux/kirkwood/files-3.3/arch/arm/mach-kirkwood/nsa-310-setup.c
diff --git a/target/linux/kirkwood/patches/000-boards.patch b/target/linux/kirkwood/patches-3.3/000-boards.patch
similarity index 100%
rename from target/linux/kirkwood/patches/000-boards.patch
rename to target/linux/kirkwood/patches-3.3/000-boards.patch
diff --git a/target/linux/kirkwood/patches/001-partition_map.patch b/target/linux/kirkwood/patches-3.3/001-partition_map.patch
similarity index 100%
rename from target/linux/kirkwood/patches/001-partition_map.patch
rename to target/linux/kirkwood/patches-3.3/001-partition_map.patch
diff --git a/target/linux/kirkwood/patches/002-mvsdio_delay.patch b/target/linux/kirkwood/patches-3.3/002-mvsdio_delay.patch
similarity index 100%
rename from target/linux/kirkwood/patches/002-mvsdio_delay.patch
rename to target/linux/kirkwood/patches-3.3/002-mvsdio_delay.patch