diff --git a/sonar/gnome-basic/Packages-Desktop b/sonar/gnome-edition/Packages-Desktop
similarity index 100%
rename from sonar/gnome-basic/Packages-Desktop
rename to sonar/gnome-edition/Packages-Desktop
diff --git a/sonar/gnome-basic/Packages-Live b/sonar/gnome-edition/Packages-Live
similarity index 100%
rename from sonar/gnome-basic/Packages-Live
rename to sonar/gnome-edition/Packages-Live
diff --git a/sonar/gnome-basic/Packages-Mhwd b/sonar/gnome-edition/Packages-Mhwd
similarity index 100%
rename from sonar/gnome-basic/Packages-Mhwd
rename to sonar/gnome-edition/Packages-Mhwd
diff --git a/sonar/gnome-basic/Packages-Root b/sonar/gnome-edition/Packages-Root
similarity index 100%
rename from sonar/gnome-basic/Packages-Root
rename to sonar/gnome-edition/Packages-Root
diff --git a/sonar/gnome-basic/desktop-overlay/etc/gdm/custom.conf b/sonar/gnome-edition/desktop-overlay/etc/gdm/custom.conf
similarity index 100%
rename from sonar/gnome-basic/desktop-overlay/etc/gdm/custom.conf
rename to sonar/gnome-edition/desktop-overlay/etc/gdm/custom.conf
diff --git a/sonar/gnome-basic/desktop-overlay/etc/speech-dispatcher/modules/espeak.conf b/sonar/gnome-edition/desktop-overlay/etc/speech-dispatcher/modules/espeak.conf
similarity index 100%
rename from sonar/gnome-basic/desktop-overlay/etc/speech-dispatcher/modules/espeak.conf
rename to sonar/gnome-edition/desktop-overlay/etc/speech-dispatcher/modules/espeak.conf
diff --git a/sonar/gnome-basic/live-overlay b/sonar/gnome-edition/live-overlay
similarity index 100%
rename from sonar/gnome-basic/live-overlay
rename to sonar/gnome-edition/live-overlay
diff --git a/sonar/gnome-basic/mkinitcpio.conf b/sonar/gnome-edition/mkinitcpio.conf
similarity index 100%
rename from sonar/gnome-basic/mkinitcpio.conf
rename to sonar/gnome-edition/mkinitcpio.conf
diff --git a/sonar/gnome-basic/profile.conf b/sonar/gnome-edition/profile.conf
similarity index 100%
rename from sonar/gnome-basic/profile.conf
rename to sonar/gnome-edition/profile.conf
diff --git a/sonar/mate-basic/Packages-Desktop b/sonar/mate-edition/Packages-Desktop
similarity index 100%
rename from sonar/mate-basic/Packages-Desktop
rename to sonar/mate-edition/Packages-Desktop
diff --git a/sonar/mate-basic/Packages-Live b/sonar/mate-edition/Packages-Live
similarity index 100%
rename from sonar/mate-basic/Packages-Live
rename to sonar/mate-edition/Packages-Live
diff --git a/sonar/mate-basic/Packages-Mhwd b/sonar/mate-edition/Packages-Mhwd
similarity index 100%
rename from sonar/mate-basic/Packages-Mhwd
rename to sonar/mate-edition/Packages-Mhwd
diff --git a/sonar/mate-basic/Packages-Root b/sonar/mate-edition/Packages-Root
similarity index 100%
rename from sonar/mate-basic/Packages-Root
rename to sonar/mate-edition/Packages-Root
diff --git a/sonar/mate-basic/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf b/sonar/mate-edition/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf
similarity index 100%
rename from sonar/mate-basic/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf
rename to sonar/mate-edition/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf
diff --git a/sonar/mate-basic/desktop-overlay/etc/pamac.conf b/sonar/mate-edition/desktop-overlay/etc/pamac.conf
similarity index 100%
rename from sonar/mate-basic/desktop-overlay/etc/pamac.conf
rename to sonar/mate-edition/desktop-overlay/etc/pamac.conf
diff --git a/sonar/mate-basic/desktop-overlay/etc/purple/accels b/sonar/mate-edition/desktop-overlay/etc/purple/accels
similarity index 100%
rename from sonar/mate-basic/desktop-overlay/etc/purple/accels
rename to sonar/mate-edition/desktop-overlay/etc/purple/accels
diff --git a/sonar/mate-basic/desktop-overlay/etc/purple/accounts.xml b/sonar/mate-edition/desktop-overlay/etc/purple/accounts.xml
similarity index 100%
rename from sonar/mate-basic/desktop-overlay/etc/purple/accounts.xml
rename to sonar/mate-edition/desktop-overlay/etc/purple/accounts.xml
diff --git a/sonar/mate-basic/desktop-overlay/etc/purple/blist.xml b/sonar/mate-edition/desktop-overlay/etc/purple/blist.xml
similarity index 100%
rename from sonar/mate-basic/desktop-overlay/etc/purple/blist.xml
rename to sonar/mate-edition/desktop-overlay/etc/purple/blist.xml
diff --git a/sonar/mate-basic/desktop-overlay/etc/purple/certificates/x509/tls_peers/irc.netwirc.tk b/sonar/mate-edition/desktop-overlay/etc/purple/certificates/x509/tls_peers/irc.netwirc.tk
similarity index 100%
rename from sonar/mate-basic/desktop-overlay/etc/purple/certificates/x509/tls_peers/irc.netwirc.tk
rename to sonar/mate-edition/desktop-overlay/etc/purple/certificates/x509/tls_peers/irc.netwirc.tk
diff --git a/sonar/mate-basic/desktop-overlay/etc/purple/prefs.xml b/sonar/mate-edition/desktop-overlay/etc/purple/prefs.xml
similarity index 100%
rename from sonar/mate-basic/desktop-overlay/etc/purple/prefs.xml
rename to sonar/mate-edition/desktop-overlay/etc/purple/prefs.xml
diff --git a/sonar/mate-basic/desktop-overlay/etc/purple/status.xml b/sonar/mate-edition/desktop-overlay/etc/purple/status.xml
similarity index 100%
rename from sonar/mate-basic/desktop-overlay/etc/purple/status.xml
rename to sonar/mate-edition/desktop-overlay/etc/purple/status.xml
diff --git a/sonar/mate-basic/live-overlay b/sonar/mate-edition/live-overlay
similarity index 100%
rename from sonar/mate-basic/live-overlay
rename to sonar/mate-edition/live-overlay
diff --git a/sonar/mate-basic/mkinitcpio.conf b/sonar/mate-edition/mkinitcpio.conf
similarity index 100%
rename from sonar/mate-basic/mkinitcpio.conf
rename to sonar/mate-edition/mkinitcpio.conf
diff --git a/sonar/mate-basic/profile.conf b/sonar/mate-edition/profile.conf
similarity index 100%
rename from sonar/mate-basic/profile.conf
rename to sonar/mate-edition/profile.conf