diff --git a/package/kde31/arts/arts.cache b/package/kde/arts/arts.cache
similarity index 100%
rename from package/kde31/arts/arts.cache
rename to package/kde/arts/arts.cache
diff --git a/package/kde31/arts/arts.conf b/package/kde/arts/arts.conf
similarity index 100%
rename from package/kde31/arts/arts.conf
rename to package/kde/arts/arts.conf
diff --git a/package/kde31/arts/arts.desc b/package/kde/arts/arts.desc
similarity index 100%
rename from package/kde31/arts/arts.desc
rename to package/kde/arts/arts.desc
diff --git a/package/kde31/kde-i18n-de/kde-i18n-de.cache b/package/kde/kde-i18n-de/kde-i18n-de.cache
similarity index 100%
rename from package/kde31/kde-i18n-de/kde-i18n-de.cache
rename to package/kde/kde-i18n-de/kde-i18n-de.cache
diff --git a/package/kde31/kde-i18n-de/kde-i18n-de.conf b/package/kde/kde-i18n-de/kde-i18n-de.conf
similarity index 100%
rename from package/kde31/kde-i18n-de/kde-i18n-de.conf
rename to package/kde/kde-i18n-de/kde-i18n-de.conf
diff --git a/package/kde31/kde-i18n-de/kde-i18n-de.desc b/package/kde/kde-i18n-de/kde-i18n-de.desc
similarity index 100%
rename from package/kde31/kde-i18n-de/kde-i18n-de.desc
rename to package/kde/kde-i18n-de/kde-i18n-de.desc
diff --git a/package/kde31/kde-i18n-es/kde-i18n-es.cache b/package/kde/kde-i18n-es/kde-i18n-es.cache
similarity index 100%
rename from package/kde31/kde-i18n-es/kde-i18n-es.cache
rename to package/kde/kde-i18n-es/kde-i18n-es.cache
diff --git a/package/kde31/kde-i18n-es/kde-i18n-es.conf b/package/kde/kde-i18n-es/kde-i18n-es.conf
similarity index 100%
rename from package/kde31/kde-i18n-es/kde-i18n-es.conf
rename to package/kde/kde-i18n-es/kde-i18n-es.conf
diff --git a/package/kde31/kde-i18n-es/kde-i18n-es.desc b/package/kde/kde-i18n-es/kde-i18n-es.desc
similarity index 100%
rename from package/kde31/kde-i18n-es/kde-i18n-es.desc
rename to package/kde/kde-i18n-es/kde-i18n-es.desc
diff --git a/package/kde31/kde-i18n-fr/kde-i18n-fr.cache b/package/kde/kde-i18n-fr/kde-i18n-fr.cache
similarity index 100%
rename from package/kde31/kde-i18n-fr/kde-i18n-fr.cache
rename to package/kde/kde-i18n-fr/kde-i18n-fr.cache
diff --git a/package/kde31/kde-i18n-fr/kde-i18n-fr.conf b/package/kde/kde-i18n-fr/kde-i18n-fr.conf
similarity index 100%
rename from package/kde31/kde-i18n-fr/kde-i18n-fr.conf
rename to package/kde/kde-i18n-fr/kde-i18n-fr.conf
diff --git a/package/kde31/kde-i18n-fr/kde-i18n-fr.desc b/package/kde/kde-i18n-fr/kde-i18n-fr.desc
similarity index 100%
rename from package/kde31/kde-i18n-fr/kde-i18n-fr.desc
rename to package/kde/kde-i18n-fr/kde-i18n-fr.desc
diff --git a/package/kde31/kde-i18n-it/kde-i18n-it.cache b/package/kde/kde-i18n-it/kde-i18n-it.cache
similarity index 100%
rename from package/kde31/kde-i18n-it/kde-i18n-it.cache
rename to package/kde/kde-i18n-it/kde-i18n-it.cache
diff --git a/package/kde31/kde-i18n-it/kde-i18n-it.conf b/package/kde/kde-i18n-it/kde-i18n-it.conf
similarity index 100%
rename from package/kde31/kde-i18n-it/kde-i18n-it.conf
rename to package/kde/kde-i18n-it/kde-i18n-it.conf
diff --git a/package/kde31/kde-i18n-it/kde-i18n-it.desc b/package/kde/kde-i18n-it/kde-i18n-it.desc
similarity index 100%
rename from package/kde31/kde-i18n-it/kde-i18n-it.desc
rename to package/kde/kde-i18n-it/kde-i18n-it.desc
diff --git a/package/kde31/kdeaccessibility/kdeaccessibility.cache b/package/kde/kdeaccessibility/kdeaccessibility.cache
similarity index 100%
rename from package/kde31/kdeaccessibility/kdeaccessibility.cache
rename to package/kde/kdeaccessibility/kdeaccessibility.cache
diff --git a/package/kde31/kdeaccessibility/kdeaccessibility.conf b/package/kde/kdeaccessibility/kdeaccessibility.conf
similarity index 100%
rename from package/kde31/kdeaccessibility/kdeaccessibility.conf
rename to package/kde/kdeaccessibility/kdeaccessibility.conf
diff --git a/package/kde31/kdeaccessibility/kdeaccessibility.desc b/package/kde/kdeaccessibility/kdeaccessibility.desc
similarity index 100%
rename from package/kde31/kdeaccessibility/kdeaccessibility.desc
rename to package/kde/kdeaccessibility/kdeaccessibility.desc
diff --git a/package/kde31/kdeaddons/kdeaddons.cache b/package/kde/kdeaddons/kdeaddons.cache
similarity index 100%
rename from package/kde31/kdeaddons/kdeaddons.cache
rename to package/kde/kdeaddons/kdeaddons.cache
diff --git a/package/kde31/kdeaddons/kdeaddons.conf b/package/kde/kdeaddons/kdeaddons.conf
similarity index 100%
rename from package/kde31/kdeaddons/kdeaddons.conf
rename to package/kde/kdeaddons/kdeaddons.conf
diff --git a/package/kde31/kdeaddons/kdeaddons.desc b/package/kde/kdeaddons/kdeaddons.desc
similarity index 100%
rename from package/kde31/kdeaddons/kdeaddons.desc
rename to package/kde/kdeaddons/kdeaddons.desc
diff --git a/package/kde31/kdeadmin/kdeadmin.cache b/package/kde/kdeadmin/kdeadmin.cache
similarity index 100%
rename from package/kde31/kdeadmin/kdeadmin.cache
rename to package/kde/kdeadmin/kdeadmin.cache
diff --git a/package/kde31/kdeadmin/kdeadmin.conf b/package/kde/kdeadmin/kdeadmin.conf
similarity index 100%
rename from package/kde31/kdeadmin/kdeadmin.conf
rename to package/kde/kdeadmin/kdeadmin.conf
diff --git a/package/kde31/kdeadmin/kdeadmin.desc b/package/kde/kdeadmin/kdeadmin.desc
similarity index 100%
rename from package/kde31/kdeadmin/kdeadmin.desc
rename to package/kde/kdeadmin/kdeadmin.desc
diff --git a/package/kde31/kdeartwork/kdeartwork.cache b/package/kde/kdeartwork/kdeartwork.cache
similarity index 100%
rename from package/kde31/kdeartwork/kdeartwork.cache
rename to package/kde/kdeartwork/kdeartwork.cache
diff --git a/package/kde31/kdeartwork/kdeartwork.conf b/package/kde/kdeartwork/kdeartwork.conf
similarity index 100%
rename from package/kde31/kdeartwork/kdeartwork.conf
rename to package/kde/kdeartwork/kdeartwork.conf
diff --git a/package/kde31/kdeartwork/kdeartwork.desc b/package/kde/kdeartwork/kdeartwork.desc
similarity index 100%
rename from package/kde31/kdeartwork/kdeartwork.desc
rename to package/kde/kdeartwork/kdeartwork.desc
diff --git a/package/kde31/kdebase/Xsession.post b/package/kde/kdebase/Xsession.post
similarity index 100%
rename from package/kde31/kdebase/Xsession.post
rename to package/kde/kdebase/Xsession.post
diff --git a/package/kde31/kdebase/Xsession.pre b/package/kde/kdebase/Xsession.pre
similarity index 100%
rename from package/kde31/kdebase/Xsession.pre
rename to package/kde/kdebase/Xsession.pre
diff --git a/package/kde31/kdebase/kdebase.cache b/package/kde/kdebase/kdebase.cache
similarity index 100%
rename from package/kde31/kdebase/kdebase.cache
rename to package/kde/kdebase/kdebase.cache
diff --git a/package/kde31/kdebase/kdebase.conf b/package/kde/kdebase/kdebase.conf
similarity index 100%
rename from package/kde31/kdebase/kdebase.conf
rename to package/kde/kdebase/kdebase.conf
diff --git a/package/kde31/kdebase/kdebase.desc b/package/kde/kdebase/kdebase.desc
similarity index 100%
rename from package/kde31/kdebase/kdebase.desc
rename to package/kde/kdebase/kdebase.desc
diff --git a/package/kde31/kdebase/kdm.cron b/package/kde/kdebase/kdm.cron
similarity index 100%
rename from package/kde31/kdebase/kdm.cron
rename to package/kde/kdebase/kdm.cron
diff --git a/package/kde31/kdebindings/kdebindings.cache b/package/kde/kdebindings/kdebindings.cache
similarity index 100%
rename from package/kde31/kdebindings/kdebindings.cache
rename to package/kde/kdebindings/kdebindings.cache
diff --git a/package/kde31/kdebindings/kdebindings.conf b/package/kde/kdebindings/kdebindings.conf
similarity index 100%
rename from package/kde31/kdebindings/kdebindings.conf
rename to package/kde/kdebindings/kdebindings.conf
diff --git a/package/kde31/kdebindings/kdebindings.desc b/package/kde/kdebindings/kdebindings.desc
similarity index 100%
rename from package/kde31/kdebindings/kdebindings.desc
rename to package/kde/kdebindings/kdebindings.desc
diff --git a/package/kde31/kdeedu/kdeedu.cache b/package/kde/kdeedu/kdeedu.cache
similarity index 100%
rename from package/kde31/kdeedu/kdeedu.cache
rename to package/kde/kdeedu/kdeedu.cache
diff --git a/package/kde31/kdeedu/kdeedu.conf b/package/kde/kdeedu/kdeedu.conf
similarity index 100%
rename from package/kde31/kdeedu/kdeedu.conf
rename to package/kde/kdeedu/kdeedu.conf
diff --git a/package/kde31/kdeedu/kdeedu.desc b/package/kde/kdeedu/kdeedu.desc
similarity index 100%
rename from package/kde31/kdeedu/kdeedu.desc
rename to package/kde/kdeedu/kdeedu.desc
diff --git a/package/kde31/kdegames/kdegames.cache b/package/kde/kdegames/kdegames.cache
similarity index 100%
rename from package/kde31/kdegames/kdegames.cache
rename to package/kde/kdegames/kdegames.cache
diff --git a/package/kde31/kdegames/kdegames.conf b/package/kde/kdegames/kdegames.conf
similarity index 100%
rename from package/kde31/kdegames/kdegames.conf
rename to package/kde/kdegames/kdegames.conf
diff --git a/package/kde31/kdegames/kdegames.desc b/package/kde/kdegames/kdegames.desc
similarity index 100%
rename from package/kde31/kdegames/kdegames.desc
rename to package/kde/kdegames/kdegames.desc
diff --git a/package/kde31/kdegraphics/kdegraphics.cache b/package/kde/kdegraphics/kdegraphics.cache
similarity index 100%
rename from package/kde31/kdegraphics/kdegraphics.cache
rename to package/kde/kdegraphics/kdegraphics.cache
diff --git a/package/kde31/kdegraphics/kdegraphics.conf b/package/kde/kdegraphics/kdegraphics.conf
similarity index 100%
rename from package/kde31/kdegraphics/kdegraphics.conf
rename to package/kde/kdegraphics/kdegraphics.conf
diff --git a/package/kde31/kdegraphics/kdegraphics.desc b/package/kde/kdegraphics/kdegraphics.desc
similarity index 100%
rename from package/kde31/kdegraphics/kdegraphics.desc
rename to package/kde/kdegraphics/kdegraphics.desc
diff --git a/package/kde31/kdelibs/config.hlp b/package/kde/kdelibs/config.hlp
similarity index 100%
rename from package/kde31/kdelibs/config.hlp
rename to package/kde/kdelibs/config.hlp
diff --git a/package/kde31/kdelibs/config.in b/package/kde/kdelibs/config.in
similarity index 100%
rename from package/kde31/kdelibs/config.in
rename to package/kde/kdelibs/config.in
diff --git a/package/kde31/kdelibs/kde-32.conf b/package/kde/kdelibs/kde-32.conf
similarity index 100%
rename from package/kde31/kdelibs/kde-32.conf
rename to package/kde/kdelibs/kde-32.conf
diff --git a/package/kde31/kdelibs/kdelibs.cache b/package/kde/kdelibs/kdelibs.cache
similarity index 100%
rename from package/kde31/kdelibs/kdelibs.cache
rename to package/kde/kdelibs/kdelibs.cache
diff --git a/package/kde31/kdelibs/kdelibs.conf b/package/kde/kdelibs/kdelibs.conf
similarity index 100%
rename from package/kde31/kdelibs/kdelibs.conf
rename to package/kde/kdelibs/kdelibs.conf
diff --git a/package/kde31/kdelibs/kdelibs.desc b/package/kde/kdelibs/kdelibs.desc
similarity index 100%
rename from package/kde31/kdelibs/kdelibs.desc
rename to package/kde/kdelibs/kdelibs.desc
diff --git a/package/kde31/kdelibs/qt-3.3-fix.patch b/package/kde/kdelibs/qt-3.3-fix.patch
similarity index 100%
rename from package/kde31/kdelibs/qt-3.3-fix.patch
rename to package/kde/kdelibs/qt-3.3-fix.patch
diff --git a/package/kde31/kdemultimedia/kdemultimedia.cache b/package/kde/kdemultimedia/kdemultimedia.cache
similarity index 100%
rename from package/kde31/kdemultimedia/kdemultimedia.cache
rename to package/kde/kdemultimedia/kdemultimedia.cache
diff --git a/package/kde31/kdemultimedia/kdemultimedia.conf b/package/kde/kdemultimedia/kdemultimedia.conf
similarity index 100%
rename from package/kde31/kdemultimedia/kdemultimedia.conf
rename to package/kde/kdemultimedia/kdemultimedia.conf
diff --git a/package/kde31/kdemultimedia/kdemultimedia.desc b/package/kde/kdemultimedia/kdemultimedia.desc
similarity index 100%
rename from package/kde31/kdemultimedia/kdemultimedia.desc
rename to package/kde/kdemultimedia/kdemultimedia.desc
diff --git a/package/kde31/kdenetwork/kdenetwork.cache b/package/kde/kdenetwork/kdenetwork.cache
similarity index 100%
rename from package/kde31/kdenetwork/kdenetwork.cache
rename to package/kde/kdenetwork/kdenetwork.cache
diff --git a/package/kde31/kdenetwork/kdenetwork.conf b/package/kde/kdenetwork/kdenetwork.conf
similarity index 100%
rename from package/kde31/kdenetwork/kdenetwork.conf
rename to package/kde/kdenetwork/kdenetwork.conf
diff --git a/package/kde31/kdenetwork/kdenetwork.desc b/package/kde/kdenetwork/kdenetwork.desc
similarity index 100%
rename from package/kde31/kdenetwork/kdenetwork.desc
rename to package/kde/kdenetwork/kdenetwork.desc
diff --git a/package/kde31/kdepim/kdepim.cache b/package/kde/kdepim/kdepim.cache
similarity index 100%
rename from package/kde31/kdepim/kdepim.cache
rename to package/kde/kdepim/kdepim.cache
diff --git a/package/kde31/kdepim/kdepim.conf b/package/kde/kdepim/kdepim.conf
similarity index 100%
rename from package/kde31/kdepim/kdepim.conf
rename to package/kde/kdepim/kdepim.conf
diff --git a/package/kde31/kdepim/kdepim.desc b/package/kde/kdepim/kdepim.desc
similarity index 100%
rename from package/kde31/kdepim/kdepim.desc
rename to package/kde/kdepim/kdepim.desc
diff --git a/package/kde31/kdesdk/kdesdk.cache b/package/kde/kdesdk/kdesdk.cache
similarity index 100%
rename from package/kde31/kdesdk/kdesdk.cache
rename to package/kde/kdesdk/kdesdk.cache
diff --git a/package/kde31/kdesdk/kdesdk.conf b/package/kde/kdesdk/kdesdk.conf
similarity index 100%
rename from package/kde31/kdesdk/kdesdk.conf
rename to package/kde/kdesdk/kdesdk.conf
diff --git a/package/kde31/kdesdk/kdesdk.desc b/package/kde/kdesdk/kdesdk.desc
similarity index 100%
rename from package/kde31/kdesdk/kdesdk.desc
rename to package/kde/kdesdk/kdesdk.desc
diff --git a/package/kde31/kdetoys/kdetoys.cache b/package/kde/kdetoys/kdetoys.cache
similarity index 100%
rename from package/kde31/kdetoys/kdetoys.cache
rename to package/kde/kdetoys/kdetoys.cache
diff --git a/package/kde31/kdetoys/kdetoys.conf b/package/kde/kdetoys/kdetoys.conf
similarity index 100%
rename from package/kde31/kdetoys/kdetoys.conf
rename to package/kde/kdetoys/kdetoys.conf
diff --git a/package/kde31/kdetoys/kdetoys.desc b/package/kde/kdetoys/kdetoys.desc
similarity index 100%
rename from package/kde31/kdetoys/kdetoys.desc
rename to package/kde/kdetoys/kdetoys.desc
diff --git a/package/kde31/kdeutils/kdeutils.cache b/package/kde/kdeutils/kdeutils.cache
similarity index 100%
rename from package/kde31/kdeutils/kdeutils.cache
rename to package/kde/kdeutils/kdeutils.cache
diff --git a/package/kde31/kdeutils/kdeutils.conf b/package/kde/kdeutils/kdeutils.conf
similarity index 100%
rename from package/kde31/kdeutils/kdeutils.conf
rename to package/kde/kdeutils/kdeutils.conf
diff --git a/package/kde31/kdeutils/kdeutils.desc b/package/kde/kdeutils/kdeutils.desc
similarity index 100%
rename from package/kde31/kdeutils/kdeutils.desc
rename to package/kde/kdeutils/kdeutils.desc
diff --git a/package/kde31/qt/disable-tutorial-examples.patch b/package/kde/qt/disable-tutorial-examples.patch
similarity index 100%
rename from package/kde31/qt/disable-tutorial-examples.patch
rename to package/kde/qt/disable-tutorial-examples.patch
diff --git a/package/kde31/qt/qt.cache b/package/kde/qt/qt.cache
similarity index 100%
rename from package/kde31/qt/qt.cache
rename to package/kde/qt/qt.cache
diff --git a/package/kde31/qt/qt.conf b/package/kde/qt/qt.conf
similarity index 100%
rename from package/kde31/qt/qt.conf
rename to package/kde/qt/qt.conf
diff --git a/package/kde31/qt/qt.desc b/package/kde/qt/qt.desc
similarity index 100%
rename from package/kde31/qt/qt.desc
rename to package/kde/qt/qt.desc
diff --git a/package/kde31/quanta/quanta.cache b/package/kde/quanta/quanta.cache
similarity index 100%
rename from package/kde31/quanta/quanta.cache
rename to package/kde/quanta/quanta.cache
diff --git a/package/kde31/quanta/quanta.conf b/package/kde/quanta/quanta.conf
similarity index 100%
rename from package/kde31/quanta/quanta.conf
rename to package/kde/quanta/quanta.conf
diff --git a/package/kde31/quanta/quanta.desc b/package/kde/quanta/quanta.desc
similarity index 100%
rename from package/kde31/quanta/quanta.desc
rename to package/kde/quanta/quanta.desc
diff --git a/package/kde31/update-kde.sh b/package/kde/update-kde.sh
similarity index 100%
rename from package/kde31/update-kde.sh
rename to package/kde/update-kde.sh