diff --git a/meta/packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch b/meta-extras/packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch
similarity index 100%
rename from meta/packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch
rename to meta-extras/packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch
diff --git a/meta/packages/linux/linux-nokia800-2.6.18-osso40/nokia770/defconfig b/meta-extras/packages/linux/linux-nokia800-2.6.18-osso40/nokia770/defconfig
similarity index 100%
rename from meta/packages/linux/linux-nokia800-2.6.18-osso40/nokia770/defconfig
rename to meta-extras/packages/linux/linux-nokia800-2.6.18-osso40/nokia770/defconfig
diff --git a/meta/packages/linux/linux-nokia800-2.6.18-osso40/nokia770_nand_fix.patch b/meta-extras/packages/linux/linux-nokia800-2.6.18-osso40/nokia770_nand_fix.patch
similarity index 100%
rename from meta/packages/linux/linux-nokia800-2.6.18-osso40/nokia770_nand_fix.patch
rename to meta-extras/packages/linux/linux-nokia800-2.6.18-osso40/nokia770_nand_fix.patch
diff --git a/meta/packages/linux/linux-nokia800-2.6.18-osso40/nokia800/defconfig b/meta-extras/packages/linux/linux-nokia800-2.6.18-osso40/nokia800/defconfig
similarity index 100%
rename from meta/packages/linux/linux-nokia800-2.6.18-osso40/nokia800/defconfig
rename to meta-extras/packages/linux/linux-nokia800-2.6.18-osso40/nokia800/defconfig
diff --git a/meta/packages/linux/linux-nokia800-2.6.21-200823maemo6/kernel-source_2.6.21-200823maemo6.diff.gz b/meta-extras/packages/linux/linux-nokia800-2.6.21-200823maemo6/kernel-source_2.6.21-200823maemo6.diff.gz
similarity index 100%
rename from meta/packages/linux/linux-nokia800-2.6.21-200823maemo6/kernel-source_2.6.21-200823maemo6.diff.gz
rename to meta-extras/packages/linux/linux-nokia800-2.6.21-200823maemo6/kernel-source_2.6.21-200823maemo6.diff.gz
diff --git a/meta/packages/linux/linux-nokia800-2.6.21-200823maemo6/nokia800/defconfig b/meta-extras/packages/linux/linux-nokia800-2.6.21-200823maemo6/nokia800/defconfig
similarity index 100%
rename from meta/packages/linux/linux-nokia800-2.6.21-200823maemo6/nokia800/defconfig
rename to meta-extras/packages/linux/linux-nokia800-2.6.21-200823maemo6/nokia800/defconfig
diff --git a/meta/packages/linux/linux-nokia800-2.6.21-200823maemo6/suspend-button.patch b/meta-extras/packages/linux/linux-nokia800-2.6.21-200823maemo6/suspend-button.patch
similarity index 100%
rename from meta/packages/linux/linux-nokia800-2.6.21-200823maemo6/suspend-button.patch
rename to meta-extras/packages/linux/linux-nokia800-2.6.21-200823maemo6/suspend-button.patch
diff --git a/meta/packages/linux/linux-nokia800-2.6.21-osso71/nokia800/defconfig b/meta-extras/packages/linux/linux-nokia800-2.6.21-osso71/nokia800/defconfig
similarity index 100%
rename from meta/packages/linux/linux-nokia800-2.6.21-osso71/nokia800/defconfig
rename to meta-extras/packages/linux/linux-nokia800-2.6.21-osso71/nokia800/defconfig
diff --git a/meta/packages/linux/linux-nokia800-2.6.21-osso71/suspend-button.patch b/meta-extras/packages/linux/linux-nokia800-2.6.21-osso71/suspend-button.patch
similarity index 100%
rename from meta/packages/linux/linux-nokia800-2.6.21-osso71/suspend-button.patch
rename to meta-extras/packages/linux/linux-nokia800-2.6.21-osso71/suspend-button.patch
diff --git a/meta/packages/linux/linux-nokia800.inc b/meta-extras/packages/linux/linux-nokia800.inc
similarity index 100%
rename from meta/packages/linux/linux-nokia800.inc
rename to meta-extras/packages/linux/linux-nokia800.inc
diff --git a/meta/packages/linux/linux-nokia800_2.6.18-osso40.bb b/meta-extras/packages/linux/linux-nokia800_2.6.18-osso40.bb
similarity index 100%
rename from meta/packages/linux/linux-nokia800_2.6.18-osso40.bb
rename to meta-extras/packages/linux/linux-nokia800_2.6.18-osso40.bb
diff --git a/meta/packages/linux/linux-nokia800_2.6.21-200823maemo6.bb b/meta-extras/packages/linux/linux-nokia800_2.6.21-200823maemo6.bb
similarity index 100%
rename from meta/packages/linux/linux-nokia800_2.6.21-200823maemo6.bb
rename to meta-extras/packages/linux/linux-nokia800_2.6.21-200823maemo6.bb
diff --git a/meta/packages/linux/linux-nokia800_2.6.21-osso71.bb b/meta-extras/packages/linux/linux-nokia800_2.6.21-osso71.bb
similarity index 100%
rename from meta/packages/linux/linux-nokia800_2.6.21-osso71.bb
rename to meta-extras/packages/linux/linux-nokia800_2.6.21-osso71.bb
diff --git a/meta/packages/linux/linux-openmoko.inc b/meta-extras/packages/linux/linux-openmoko.inc
similarity index 100%
rename from meta/packages/linux/linux-openmoko.inc
rename to meta-extras/packages/linux/linux-openmoko.inc
diff --git a/meta/packages/linux/linux-openmoko/timespec_add_ns_avoid_udivdi3.patch b/meta-extras/packages/linux/linux-openmoko/timespec_add_ns_avoid_udivdi3.patch
similarity index 100%
rename from meta/packages/linux/linux-openmoko/timespec_add_ns_avoid_udivdi3.patch
rename to meta-extras/packages/linux/linux-openmoko/timespec_add_ns_avoid_udivdi3.patch
diff --git a/meta/packages/linux/linux-openmoko_2.6.24+git.bb b/meta-extras/packages/linux/linux-openmoko_2.6.24+git.bb
similarity index 100%
rename from meta/packages/linux/linux-openmoko_2.6.24+git.bb
rename to meta-extras/packages/linux/linux-openmoko_2.6.24+git.bb