diff --git a/qubes-logos-1/COPYING b/qubes-logos/COPYING
similarity index 100%
rename from qubes-logos-1/COPYING
rename to qubes-logos/COPYING
diff --git a/qubes-logos-1/COPYING-kde-logo b/qubes-logos/COPYING-kde-logo
similarity index 100%
rename from qubes-logos-1/COPYING-kde-logo
rename to qubes-logos/COPYING-kde-logo
diff --git a/qubes-logos-1/Makefile b/qubes-logos/Makefile
similarity index 100%
rename from qubes-logos-1/Makefile
rename to qubes-logos/Makefile
diff --git a/qubes-logos-1/anaconda/Makefile b/qubes-logos/anaconda/Makefile
similarity index 100%
rename from qubes-logos-1/anaconda/Makefile
rename to qubes-logos/anaconda/Makefile
diff --git a/qubes-logos-1/anaconda/README b/qubes-logos/anaconda/README
similarity index 100%
rename from qubes-logos-1/anaconda/README
rename to qubes-logos/anaconda/README
diff --git a/qubes-logos-1/anaconda/anaconda_header.png b/qubes-logos/anaconda/anaconda_header.png
similarity index 100%
rename from qubes-logos-1/anaconda/anaconda_header.png
rename to qubes-logos/anaconda/anaconda_header.png
diff --git a/qubes-logos-1/anaconda/splash.png b/qubes-logos/anaconda/splash.png
similarity index 100%
rename from qubes-logos-1/anaconda/splash.png
rename to qubes-logos/anaconda/splash.png
diff --git a/qubes-logos-1/anaconda/syslinux-vesa-splash.jpg b/qubes-logos/anaconda/syslinux-vesa-splash.jpg
similarity index 100%
rename from qubes-logos-1/anaconda/syslinux-vesa-splash.jpg
rename to qubes-logos/anaconda/syslinux-vesa-splash.jpg
diff --git a/qubes-logos-1/bootloader/README b/qubes-logos/bootloader/README
similarity index 100%
rename from qubes-logos-1/bootloader/README
rename to qubes-logos/bootloader/README
diff --git a/qubes-logos-1/bootloader/splash.xpm.gz b/qubes-logos/bootloader/splash.xpm.gz
similarity index 100%
rename from qubes-logos-1/bootloader/splash.xpm.gz
rename to qubes-logos/bootloader/splash.xpm.gz
diff --git a/qubes-logos-1/firstboot/firstboot-left.png b/qubes-logos/firstboot/firstboot-left.png
similarity index 100%
rename from qubes-logos-1/firstboot/firstboot-left.png
rename to qubes-logos/firstboot/firstboot-left.png
diff --git a/qubes-logos-1/firstboot/splash-small.png b/qubes-logos/firstboot/splash-small.png
similarity index 100%
rename from qubes-logos-1/firstboot/splash-small.png
rename to qubes-logos/firstboot/splash-small.png
diff --git a/qubes-logos-1/firstboot/workstation.png b/qubes-logos/firstboot/workstation.png
similarity index 100%
rename from qubes-logos-1/firstboot/workstation.png
rename to qubes-logos/firstboot/workstation.png
diff --git a/qubes-logos-1/gnome-splash/gnome-splash.png b/qubes-logos/gnome-splash/gnome-splash.png
similarity index 100%
rename from qubes-logos-1/gnome-splash/gnome-splash.png
rename to qubes-logos/gnome-splash/gnome-splash.png
diff --git a/qubes-logos-1/icons/Qubes/48x48/apps/anaconda.png b/qubes-logos/icons/Qubes/48x48/apps/anaconda.png
similarity index 100%
rename from qubes-logos-1/icons/Qubes/48x48/apps/anaconda.png
rename to qubes-logos/icons/Qubes/48x48/apps/anaconda.png
diff --git a/qubes-logos-1/icons/Qubes/scalable/apps/anaconda.svg b/qubes-logos/icons/Qubes/scalable/apps/anaconda.svg
similarity index 100%
rename from qubes-logos-1/icons/Qubes/scalable/apps/anaconda.svg
rename to qubes-logos/icons/Qubes/scalable/apps/anaconda.svg
diff --git a/qubes-logos-1/ksplash/SolarComet-kde.png b/qubes-logos/ksplash/SolarComet-kde.png
similarity index 100%
rename from qubes-logos-1/ksplash/SolarComet-kde.png
rename to qubes-logos/ksplash/SolarComet-kde.png
diff --git a/qubes-logos-1/pixmaps/poweredby.png b/qubes-logos/pixmaps/poweredby.png
similarity index 100%
rename from qubes-logos-1/pixmaps/poweredby.png
rename to qubes-logos/pixmaps/poweredby.png
diff --git a/qubes-logos-1/pixmaps/system-logo-white.png b/qubes-logos/pixmaps/system-logo-white.png
similarity index 100%
rename from qubes-logos-1/pixmaps/system-logo-white.png
rename to qubes-logos/pixmaps/system-logo-white.png
diff --git a/qubes-logos-1/plymouth/charge/progress-00.png b/qubes-logos/plymouth/charge/progress-00.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/progress-00.png
rename to qubes-logos/plymouth/charge/progress-00.png
diff --git a/qubes-logos-1/plymouth/charge/progress-01.png b/qubes-logos/plymouth/charge/progress-01.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/progress-01.png
rename to qubes-logos/plymouth/charge/progress-01.png
diff --git a/qubes-logos-1/plymouth/charge/progress-02.png b/qubes-logos/plymouth/charge/progress-02.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/progress-02.png
rename to qubes-logos/plymouth/charge/progress-02.png
diff --git a/qubes-logos-1/plymouth/charge/progress-03.png b/qubes-logos/plymouth/charge/progress-03.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/progress-03.png
rename to qubes-logos/plymouth/charge/progress-03.png
diff --git a/qubes-logos-1/plymouth/charge/progress-04.png b/qubes-logos/plymouth/charge/progress-04.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/progress-04.png
rename to qubes-logos/plymouth/charge/progress-04.png
diff --git a/qubes-logos-1/plymouth/charge/progress-05.png b/qubes-logos/plymouth/charge/progress-05.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/progress-05.png
rename to qubes-logos/plymouth/charge/progress-05.png
diff --git a/qubes-logos-1/plymouth/charge/progress-06.png b/qubes-logos/plymouth/charge/progress-06.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/progress-06.png
rename to qubes-logos/plymouth/charge/progress-06.png
diff --git a/qubes-logos-1/plymouth/charge/progress-07.png b/qubes-logos/plymouth/charge/progress-07.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/progress-07.png
rename to qubes-logos/plymouth/charge/progress-07.png
diff --git a/qubes-logos-1/plymouth/charge/progress-08.png b/qubes-logos/plymouth/charge/progress-08.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/progress-08.png
rename to qubes-logos/plymouth/charge/progress-08.png
diff --git a/qubes-logos-1/plymouth/charge/progress-09.png b/qubes-logos/plymouth/charge/progress-09.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/progress-09.png
rename to qubes-logos/plymouth/charge/progress-09.png
diff --git a/qubes-logos-1/plymouth/charge/progress-10.png b/qubes-logos/plymouth/charge/progress-10.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/progress-10.png
rename to qubes-logos/plymouth/charge/progress-10.png
diff --git a/qubes-logos-1/plymouth/charge/progress-11.png b/qubes-logos/plymouth/charge/progress-11.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/progress-11.png
rename to qubes-logos/plymouth/charge/progress-11.png
diff --git a/qubes-logos-1/plymouth/charge/progress-12.png b/qubes-logos/plymouth/charge/progress-12.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/progress-12.png
rename to qubes-logos/plymouth/charge/progress-12.png
diff --git a/qubes-logos-1/plymouth/charge/progress-13.png b/qubes-logos/plymouth/charge/progress-13.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/progress-13.png
rename to qubes-logos/plymouth/charge/progress-13.png
diff --git a/qubes-logos-1/plymouth/charge/progress-14.png b/qubes-logos/plymouth/charge/progress-14.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/progress-14.png
rename to qubes-logos/plymouth/charge/progress-14.png
diff --git a/qubes-logos-1/plymouth/charge/progress-15.png b/qubes-logos/plymouth/charge/progress-15.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/progress-15.png
rename to qubes-logos/plymouth/charge/progress-15.png
diff --git a/qubes-logos-1/plymouth/charge/progress-16.png b/qubes-logos/plymouth/charge/progress-16.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/progress-16.png
rename to qubes-logos/plymouth/charge/progress-16.png
diff --git a/qubes-logos-1/plymouth/charge/progress-17.png b/qubes-logos/plymouth/charge/progress-17.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/progress-17.png
rename to qubes-logos/plymouth/charge/progress-17.png
diff --git a/qubes-logos-1/plymouth/charge/progress-18.png b/qubes-logos/plymouth/charge/progress-18.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/progress-18.png
rename to qubes-logos/plymouth/charge/progress-18.png
diff --git a/qubes-logos-1/plymouth/charge/progress-19.png b/qubes-logos/plymouth/charge/progress-19.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/progress-19.png
rename to qubes-logos/plymouth/charge/progress-19.png
diff --git a/qubes-logos-1/plymouth/charge/progress-20.png b/qubes-logos/plymouth/charge/progress-20.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/progress-20.png
rename to qubes-logos/plymouth/charge/progress-20.png
diff --git a/qubes-logos-1/plymouth/charge/progress-21.png b/qubes-logos/plymouth/charge/progress-21.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/progress-21.png
rename to qubes-logos/plymouth/charge/progress-21.png
diff --git a/qubes-logos-1/plymouth/charge/progress-22.png b/qubes-logos/plymouth/charge/progress-22.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/progress-22.png
rename to qubes-logos/plymouth/charge/progress-22.png
diff --git a/qubes-logos-1/plymouth/charge/progress-23.png b/qubes-logos/plymouth/charge/progress-23.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/progress-23.png
rename to qubes-logos/plymouth/charge/progress-23.png
diff --git a/qubes-logos-1/plymouth/charge/progress-24.png b/qubes-logos/plymouth/charge/progress-24.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/progress-24.png
rename to qubes-logos/plymouth/charge/progress-24.png
diff --git a/qubes-logos-1/plymouth/charge/progress-25.png b/qubes-logos/plymouth/charge/progress-25.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/progress-25.png
rename to qubes-logos/plymouth/charge/progress-25.png
diff --git a/qubes-logos-1/plymouth/charge/progress-26.png b/qubes-logos/plymouth/charge/progress-26.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/progress-26.png
rename to qubes-logos/plymouth/charge/progress-26.png
diff --git a/qubes-logos-1/plymouth/charge/progress-27.png b/qubes-logos/plymouth/charge/progress-27.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/progress-27.png
rename to qubes-logos/plymouth/charge/progress-27.png
diff --git a/qubes-logos-1/plymouth/charge/progress-28.png b/qubes-logos/plymouth/charge/progress-28.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/progress-28.png
rename to qubes-logos/plymouth/charge/progress-28.png
diff --git a/qubes-logos-1/plymouth/charge/progress-29.png b/qubes-logos/plymouth/charge/progress-29.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/progress-29.png
rename to qubes-logos/plymouth/charge/progress-29.png
diff --git a/qubes-logos-1/plymouth/charge/progress-30.png b/qubes-logos/plymouth/charge/progress-30.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/progress-30.png
rename to qubes-logos/plymouth/charge/progress-30.png
diff --git a/qubes-logos-1/plymouth/charge/progress-31.png b/qubes-logos/plymouth/charge/progress-31.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/progress-31.png
rename to qubes-logos/plymouth/charge/progress-31.png
diff --git a/qubes-logos-1/plymouth/charge/progress-32.png b/qubes-logos/plymouth/charge/progress-32.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/progress-32.png
rename to qubes-logos/plymouth/charge/progress-32.png
diff --git a/qubes-logos-1/plymouth/charge/throbber-00.png b/qubes-logos/plymouth/charge/throbber-00.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/throbber-00.png
rename to qubes-logos/plymouth/charge/throbber-00.png
diff --git a/qubes-logos-1/plymouth/charge/throbber-01.png b/qubes-logos/plymouth/charge/throbber-01.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/throbber-01.png
rename to qubes-logos/plymouth/charge/throbber-01.png
diff --git a/qubes-logos-1/plymouth/charge/throbber-02.png b/qubes-logos/plymouth/charge/throbber-02.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/throbber-02.png
rename to qubes-logos/plymouth/charge/throbber-02.png
diff --git a/qubes-logos-1/plymouth/charge/throbber-03.png b/qubes-logos/plymouth/charge/throbber-03.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/throbber-03.png
rename to qubes-logos/plymouth/charge/throbber-03.png
diff --git a/qubes-logos-1/plymouth/charge/throbber-04.png b/qubes-logos/plymouth/charge/throbber-04.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/throbber-04.png
rename to qubes-logos/plymouth/charge/throbber-04.png
diff --git a/qubes-logos-1/plymouth/charge/throbber-05.png b/qubes-logos/plymouth/charge/throbber-05.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/throbber-05.png
rename to qubes-logos/plymouth/charge/throbber-05.png
diff --git a/qubes-logos-1/plymouth/charge/throbber-06.png b/qubes-logos/plymouth/charge/throbber-06.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/throbber-06.png
rename to qubes-logos/plymouth/charge/throbber-06.png
diff --git a/qubes-logos-1/plymouth/charge/throbber-07.png b/qubes-logos/plymouth/charge/throbber-07.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/throbber-07.png
rename to qubes-logos/plymouth/charge/throbber-07.png
diff --git a/qubes-logos-1/plymouth/charge/throbber-08.png b/qubes-logos/plymouth/charge/throbber-08.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/throbber-08.png
rename to qubes-logos/plymouth/charge/throbber-08.png
diff --git a/qubes-logos-1/plymouth/charge/throbber-09.png b/qubes-logos/plymouth/charge/throbber-09.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/throbber-09.png
rename to qubes-logos/plymouth/charge/throbber-09.png
diff --git a/qubes-logos-1/plymouth/charge/throbber-10.png b/qubes-logos/plymouth/charge/throbber-10.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/throbber-10.png
rename to qubes-logos/plymouth/charge/throbber-10.png
diff --git a/qubes-logos-1/plymouth/charge/throbber-11.png b/qubes-logos/plymouth/charge/throbber-11.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/throbber-11.png
rename to qubes-logos/plymouth/charge/throbber-11.png
diff --git a/qubes-logos-1/plymouth/charge/throbber-12.png b/qubes-logos/plymouth/charge/throbber-12.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/throbber-12.png
rename to qubes-logos/plymouth/charge/throbber-12.png
diff --git a/qubes-logos-1/plymouth/charge/throbber-13.png b/qubes-logos/plymouth/charge/throbber-13.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/throbber-13.png
rename to qubes-logos/plymouth/charge/throbber-13.png
diff --git a/qubes-logos-1/plymouth/charge/throbber-14.png b/qubes-logos/plymouth/charge/throbber-14.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/throbber-14.png
rename to qubes-logos/plymouth/charge/throbber-14.png
diff --git a/qubes-logos-1/plymouth/charge/throbber-15.png b/qubes-logos/plymouth/charge/throbber-15.png
similarity index 100%
rename from qubes-logos-1/plymouth/charge/throbber-15.png
rename to qubes-logos/plymouth/charge/throbber-15.png
diff --git a/qubes-logos-1/qubes-logos.spec b/qubes-logos/qubes-logos.spec
similarity index 100%
rename from qubes-logos-1/qubes-logos.spec
rename to qubes-logos/qubes-logos.spec
diff --git a/qubes-release-1/GPL b/qubes-release/GPL
similarity index 100%
rename from qubes-release-1/GPL
rename to qubes-release/GPL
diff --git a/qubes-release-1/Makefile b/qubes-release/Makefile
similarity index 100%
rename from qubes-release-1/Makefile
rename to qubes-release/Makefile
diff --git a/qubes-release-1/README.Qubes-Release-Notes b/qubes-release/README.Qubes-Release-Notes
similarity index 100%
rename from qubes-release-1/README.Qubes-Release-Notes
rename to qubes-release/README.Qubes-Release-Notes
diff --git a/qubes-release-1/RPM-GPG-KEY-fedora-13-primary b/qubes-release/RPM-GPG-KEY-fedora-13-primary
similarity index 100%
rename from qubes-release-1/RPM-GPG-KEY-fedora-13-primary
rename to qubes-release/RPM-GPG-KEY-fedora-13-primary
diff --git a/qubes-release-1/RPM-GPG-KEY-qubes-1-primary b/qubes-release/RPM-GPG-KEY-qubes-1-primary
similarity index 100%
rename from qubes-release-1/RPM-GPG-KEY-qubes-1-primary
rename to qubes-release/RPM-GPG-KEY-qubes-1-primary
diff --git a/qubes-release-1/debugfiles.list b/qubes-release/debugfiles.list
similarity index 100%
rename from qubes-release-1/debugfiles.list
rename to qubes-release/debugfiles.list
diff --git a/qubes-release-1/debuglinks.list b/qubes-release/debuglinks.list
similarity index 100%
rename from qubes-release-1/debuglinks.list
rename to qubes-release/debuglinks.list
diff --git a/qubes-release-1/debugsources.list b/qubes-release/debugsources.list
similarity index 100%
rename from qubes-release-1/debugsources.list
rename to qubes-release/debugsources.list
diff --git a/qubes-release-1/fedora.repo b/qubes-release/fedora.repo
similarity index 100%
rename from qubes-release-1/fedora.repo
rename to qubes-release/fedora.repo
diff --git a/qubes-release-1/qubes-r1-dom0.repo b/qubes-release/qubes-r1-dom0.repo
similarity index 100%
rename from qubes-release-1/qubes-r1-dom0.repo
rename to qubes-release/qubes-r1-dom0.repo
diff --git a/qubes-release-1/qubes-release.spec b/qubes-release/qubes-release.spec
similarity index 100%
rename from qubes-release-1/qubes-release.spec
rename to qubes-release/qubes-release.spec
diff --git a/qubes-release-1/sources b/qubes-release/sources
similarity index 100%
rename from qubes-release-1/sources
rename to qubes-release/sources