diff --git a/cns21xx/cobalt/Makefile b/cobalt/Makefile
similarity index 100%
rename from cns21xx/cobalt/Makefile
rename to cobalt/Makefile
diff --git a/cns21xx/cobalt/base-files/etc/diag.sh b/cobalt/base-files/etc/diag.sh
similarity index 100%
rename from cns21xx/cobalt/base-files/etc/diag.sh
rename to cobalt/base-files/etc/diag.sh
diff --git a/cns21xx/cobalt/config-default b/cobalt/config-default
similarity index 100%
rename from cns21xx/cobalt/config-default
rename to cobalt/config-default
diff --git a/cns21xx/cobalt/image/Makefile b/cobalt/image/Makefile
similarity index 100%
rename from cns21xx/cobalt/image/Makefile
rename to cobalt/image/Makefile
diff --git a/cns21xx/cobalt/modules.mk b/cobalt/modules.mk
similarity index 100%
rename from cns21xx/cobalt/modules.mk
rename to cobalt/modules.mk
diff --git a/cns21xx/sibyte/Makefile b/sibyte/Makefile
similarity index 100%
rename from cns21xx/sibyte/Makefile
rename to sibyte/Makefile
diff --git a/cns21xx/sibyte/base-files/etc/inittab b/sibyte/base-files/etc/inittab
similarity index 100%
rename from cns21xx/sibyte/base-files/etc/inittab
rename to sibyte/base-files/etc/inittab
diff --git a/cns21xx/sibyte/config-3.3 b/sibyte/config-3.3
similarity index 100%
rename from cns21xx/sibyte/config-3.3
rename to sibyte/config-3.3
diff --git a/cns21xx/sibyte/image/Makefile b/sibyte/image/Makefile
similarity index 100%
rename from cns21xx/sibyte/image/Makefile
rename to sibyte/image/Makefile
diff --git a/cns21xx/sibyte/patches-3.3/101-rhone_physmap.patch b/sibyte/patches-3.3/101-rhone_physmap.patch
similarity index 100%
rename from cns21xx/sibyte/patches-3.3/101-rhone_physmap.patch
rename to sibyte/patches-3.3/101-rhone_physmap.patch
diff --git a/cns21xx/sibyte/patches-3.3/103-m41t80_smbus.patch b/sibyte/patches-3.3/103-m41t80_smbus.patch
similarity index 100%
rename from cns21xx/sibyte/patches-3.3/103-m41t80_smbus.patch
rename to sibyte/patches-3.3/103-m41t80_smbus.patch
diff --git a/cns21xx/sibyte/patches-3.3/104-sibyte_rtc_cleanup.patch b/sibyte/patches-3.3/104-sibyte_rtc_cleanup.patch
similarity index 100%
rename from cns21xx/sibyte/patches-3.3/104-sibyte_rtc_cleanup.patch
rename to sibyte/patches-3.3/104-sibyte_rtc_cleanup.patch
diff --git a/cns21xx/sibyte/patches-3.3/105-sibyte_hwmon.patch b/sibyte/patches-3.3/105-sibyte_hwmon.patch
similarity index 100%
rename from cns21xx/sibyte/patches-3.3/105-sibyte_hwmon.patch
rename to sibyte/patches-3.3/105-sibyte_hwmon.patch
diff --git a/cns21xx/sibyte/patches-3.3/106-no_module_reloc.patch b/sibyte/patches-3.3/106-no_module_reloc.patch
similarity index 100%
rename from cns21xx/sibyte/patches-3.3/106-no_module_reloc.patch
rename to sibyte/patches-3.3/106-no_module_reloc.patch
diff --git a/cns21xx/sparc/Makefile b/sparc/Makefile
similarity index 100%
rename from cns21xx/sparc/Makefile
rename to sparc/Makefile
diff --git a/cns21xx/sparc/config-default b/sparc/config-default
similarity index 100%
rename from cns21xx/sparc/config-default
rename to sparc/config-default
diff --git a/cns21xx/sparc/image/Makefile b/sparc/image/Makefile
similarity index 100%
rename from cns21xx/sparc/image/Makefile
rename to sparc/image/Makefile