diff --git a/package/gnome24/abiword/abiword.cache b/package/gnome2/abiword/abiword.cache
similarity index 100%
rename from package/gnome24/abiword/abiword.cache
rename to package/gnome2/abiword/abiword.cache
diff --git a/package/gnome24/abiword/abiword.conf b/package/gnome2/abiword/abiword.conf
similarity index 100%
rename from package/gnome24/abiword/abiword.conf
rename to package/gnome2/abiword/abiword.conf
diff --git a/package/gnome24/abiword/abiword.desc b/package/gnome2/abiword/abiword.desc
similarity index 100%
rename from package/gnome24/abiword/abiword.desc
rename to package/gnome2/abiword/abiword.desc
diff --git a/package/gnome24/acme/acme.cache b/package/gnome2/acme/acme.cache
similarity index 100%
rename from package/gnome24/acme/acme.cache
rename to package/gnome2/acme/acme.cache
diff --git a/package/gnome24/acme/acme.conf b/package/gnome2/acme/acme.conf
similarity index 100%
rename from package/gnome24/acme/acme.conf
rename to package/gnome2/acme/acme.conf
diff --git a/package/gnome24/acme/acme.desc b/package/gnome2/acme/acme.desc
similarity index 100%
rename from package/gnome24/acme/acme.desc
rename to package/gnome2/acme/acme.desc
diff --git a/package/gnome24/alleyoop/alleyoop.cache b/package/gnome2/alleyoop/alleyoop.cache
similarity index 100%
rename from package/gnome24/alleyoop/alleyoop.cache
rename to package/gnome2/alleyoop/alleyoop.cache
diff --git a/package/gnome24/alleyoop/alleyoop.conf b/package/gnome2/alleyoop/alleyoop.conf
similarity index 100%
rename from package/gnome24/alleyoop/alleyoop.conf
rename to package/gnome2/alleyoop/alleyoop.conf
diff --git a/package/gnome24/alleyoop/alleyoop.desc b/package/gnome2/alleyoop/alleyoop.desc
similarity index 100%
rename from package/gnome24/alleyoop/alleyoop.desc
rename to package/gnome2/alleyoop/alleyoop.desc
diff --git a/package/gnome24/anjuta/anjuta.cache b/package/gnome2/anjuta/anjuta.cache
similarity index 100%
rename from package/gnome24/anjuta/anjuta.cache
rename to package/gnome2/anjuta/anjuta.cache
diff --git a/package/gnome24/anjuta/anjuta.conf b/package/gnome2/anjuta/anjuta.conf
similarity index 100%
rename from package/gnome24/anjuta/anjuta.conf
rename to package/gnome2/anjuta/anjuta.conf
diff --git a/package/gnome24/anjuta/anjuta.desc b/package/gnome2/anjuta/anjuta.desc
similarity index 100%
rename from package/gnome24/anjuta/anjuta.desc
rename to package/gnome2/anjuta/anjuta.desc
diff --git a/package/gnome24/at-poke/at-poke.cache b/package/gnome2/at-poke/at-poke.cache
similarity index 100%
rename from package/gnome24/at-poke/at-poke.cache
rename to package/gnome2/at-poke/at-poke.cache
diff --git a/package/gnome24/at-poke/at-poke.conf b/package/gnome2/at-poke/at-poke.conf
similarity index 100%
rename from package/gnome24/at-poke/at-poke.conf
rename to package/gnome2/at-poke/at-poke.conf
diff --git a/package/gnome24/at-poke/at-poke.desc b/package/gnome2/at-poke/at-poke.desc
similarity index 100%
rename from package/gnome24/at-poke/at-poke.desc
rename to package/gnome2/at-poke/at-poke.desc
diff --git a/package/gnome24/at-spi/at-spi.cache b/package/gnome2/at-spi/at-spi.cache
similarity index 100%
rename from package/gnome24/at-spi/at-spi.cache
rename to package/gnome2/at-spi/at-spi.cache
diff --git a/package/gnome24/at-spi/at-spi.conf b/package/gnome2/at-spi/at-spi.conf
similarity index 100%
rename from package/gnome24/at-spi/at-spi.conf
rename to package/gnome2/at-spi/at-spi.conf
diff --git a/package/gnome24/at-spi/at-spi.desc b/package/gnome2/at-spi/at-spi.desc
similarity index 100%
rename from package/gnome24/at-spi/at-spi.desc
rename to package/gnome2/at-spi/at-spi.desc
diff --git a/package/gnome24/atk/atk.cache b/package/gnome2/atk/atk.cache
similarity index 100%
rename from package/gnome24/atk/atk.cache
rename to package/gnome2/atk/atk.cache
diff --git a/package/gnome24/atk/atk.conf b/package/gnome2/atk/atk.conf
similarity index 100%
rename from package/gnome24/atk/atk.conf
rename to package/gnome2/atk/atk.conf
diff --git a/package/gnome24/atk/atk.desc b/package/gnome2/atk/atk.desc
similarity index 100%
rename from package/gnome24/atk/atk.desc
rename to package/gnome2/atk/atk.desc
diff --git a/package/gnome24/balsa/balsa.conf b/package/gnome2/balsa/balsa.conf
similarity index 100%
rename from package/gnome24/balsa/balsa.conf
rename to package/gnome2/balsa/balsa.conf
diff --git a/package/gnome24/balsa/balsa.desc b/package/gnome2/balsa/balsa.desc
similarity index 100%
rename from package/gnome24/balsa/balsa.desc
rename to package/gnome2/balsa/balsa.desc
diff --git a/package/gnome24/balsa/idl-dir.patch b/package/gnome2/balsa/idl-dir.patch
similarity index 100%
rename from package/gnome24/balsa/idl-dir.patch
rename to package/gnome2/balsa/idl-dir.patch
diff --git a/package/gnome24/battfink/battfink.cache b/package/gnome2/battfink/battfink.cache
similarity index 100%
rename from package/gnome24/battfink/battfink.cache
rename to package/gnome2/battfink/battfink.cache
diff --git a/package/gnome24/battfink/battfink.conf b/package/gnome2/battfink/battfink.conf
similarity index 100%
rename from package/gnome24/battfink/battfink.conf
rename to package/gnome2/battfink/battfink.conf
diff --git a/package/gnome24/battfink/battfink.desc b/package/gnome2/battfink/battfink.desc
similarity index 100%
rename from package/gnome24/battfink/battfink.desc
rename to package/gnome2/battfink/battfink.desc
diff --git a/package/gnome24/bluefish/bluefish.cache b/package/gnome2/bluefish/bluefish.cache
similarity index 100%
rename from package/gnome24/bluefish/bluefish.cache
rename to package/gnome2/bluefish/bluefish.cache
diff --git a/package/gnome24/bluefish/bluefish.conf b/package/gnome2/bluefish/bluefish.conf
similarity index 100%
rename from package/gnome24/bluefish/bluefish.conf
rename to package/gnome2/bluefish/bluefish.conf
diff --git a/package/gnome24/bluefish/bluefish.desc b/package/gnome2/bluefish/bluefish.desc
similarity index 100%
rename from package/gnome24/bluefish/bluefish.desc
rename to package/gnome2/bluefish/bluefish.desc
diff --git a/package/gnome24/bug-buddy/bug-buddy.cache b/package/gnome2/bug-buddy/bug-buddy.cache
similarity index 100%
rename from package/gnome24/bug-buddy/bug-buddy.cache
rename to package/gnome2/bug-buddy/bug-buddy.cache
diff --git a/package/gnome24/bug-buddy/bug-buddy.conf b/package/gnome2/bug-buddy/bug-buddy.conf
similarity index 100%
rename from package/gnome24/bug-buddy/bug-buddy.conf
rename to package/gnome2/bug-buddy/bug-buddy.conf
diff --git a/package/gnome24/bug-buddy/bug-buddy.desc b/package/gnome2/bug-buddy/bug-buddy.desc
similarity index 100%
rename from package/gnome24/bug-buddy/bug-buddy.desc
rename to package/gnome2/bug-buddy/bug-buddy.desc
diff --git a/package/gnome24/control-center/control-center.cache b/package/gnome2/control-center/control-center.cache
similarity index 100%
rename from package/gnome24/control-center/control-center.cache
rename to package/gnome2/control-center/control-center.cache
diff --git a/package/gnome24/control-center/control-center.conf b/package/gnome2/control-center/control-center.conf
similarity index 100%
rename from package/gnome24/control-center/control-center.conf
rename to package/gnome2/control-center/control-center.conf
diff --git a/package/gnome24/control-center/control-center.desc b/package/gnome2/control-center/control-center.desc
similarity index 100%
rename from package/gnome24/control-center/control-center.desc
rename to package/gnome2/control-center/control-center.desc
diff --git a/package/gnome24/devhelp/devhelp.cache b/package/gnome2/devhelp/devhelp.cache
similarity index 100%
rename from package/gnome24/devhelp/devhelp.cache
rename to package/gnome2/devhelp/devhelp.cache
diff --git a/package/gnome24/devhelp/devhelp.conf b/package/gnome2/devhelp/devhelp.conf
similarity index 100%
rename from package/gnome24/devhelp/devhelp.conf
rename to package/gnome2/devhelp/devhelp.conf
diff --git a/package/gnome24/devhelp/devhelp.desc b/package/gnome2/devhelp/devhelp.desc
similarity index 100%
rename from package/gnome24/devhelp/devhelp.desc
rename to package/gnome2/devhelp/devhelp.desc
diff --git a/package/gnome24/devilspie/devilspie.cache b/package/gnome2/devilspie/devilspie.cache
similarity index 100%
rename from package/gnome24/devilspie/devilspie.cache
rename to package/gnome2/devilspie/devilspie.cache
diff --git a/package/gnome24/devilspie/devilspie.conf b/package/gnome2/devilspie/devilspie.conf
similarity index 100%
rename from package/gnome24/devilspie/devilspie.conf
rename to package/gnome2/devilspie/devilspie.conf
diff --git a/package/gnome24/devilspie/devilspie.desc b/package/gnome2/devilspie/devilspie.desc
similarity index 100%
rename from package/gnome24/devilspie/devilspie.desc
rename to package/gnome2/devilspie/devilspie.desc
diff --git a/package/gnome24/dia/dia.cache b/package/gnome2/dia/dia.cache
similarity index 100%
rename from package/gnome24/dia/dia.cache
rename to package/gnome2/dia/dia.cache
diff --git a/package/gnome24/dia/dia.conf b/package/gnome2/dia/dia.conf
similarity index 100%
rename from package/gnome24/dia/dia.conf
rename to package/gnome2/dia/dia.conf
diff --git a/package/gnome24/dia/dia.desc b/package/gnome2/dia/dia.desc
similarity index 100%
rename from package/gnome24/dia/dia.desc
rename to package/gnome2/dia/dia.desc
diff --git a/package/gnome24/dia/png-hotfix.patch b/package/gnome2/dia/png-hotfix.patch
similarity index 100%
rename from package/gnome24/dia/png-hotfix.patch
rename to package/gnome2/dia/png-hotfix.patch
diff --git a/package/gnome24/drwright/drwright.cache b/package/gnome2/drwright/drwright.cache
similarity index 100%
rename from package/gnome24/drwright/drwright.cache
rename to package/gnome2/drwright/drwright.cache
diff --git a/package/gnome24/drwright/drwright.conf b/package/gnome2/drwright/drwright.conf
similarity index 100%
rename from package/gnome24/drwright/drwright.conf
rename to package/gnome2/drwright/drwright.conf
diff --git a/package/gnome24/drwright/drwright.desc b/package/gnome2/drwright/drwright.desc
similarity index 100%
rename from package/gnome24/drwright/drwright.desc
rename to package/gnome2/drwright/drwright.desc
diff --git a/package/gnome24/eel/eel.cache b/package/gnome2/eel/eel.cache
similarity index 100%
rename from package/gnome24/eel/eel.cache
rename to package/gnome2/eel/eel.cache
diff --git a/package/gnome24/eel/eel.conf b/package/gnome2/eel/eel.conf
similarity index 100%
rename from package/gnome24/eel/eel.conf
rename to package/gnome2/eel/eel.conf
diff --git a/package/gnome24/eel/eel.desc b/package/gnome2/eel/eel.desc
similarity index 100%
rename from package/gnome24/eel/eel.desc
rename to package/gnome2/eel/eel.desc
diff --git a/package/gnome24/enchant/enchant.cache b/package/gnome2/enchant/enchant.cache
similarity index 100%
rename from package/gnome24/enchant/enchant.cache
rename to package/gnome2/enchant/enchant.cache
diff --git a/package/gnome24/enchant/enchant.conf b/package/gnome2/enchant/enchant.conf
similarity index 100%
rename from package/gnome24/enchant/enchant.conf
rename to package/gnome2/enchant/enchant.conf
diff --git a/package/gnome24/enchant/enchant.desc b/package/gnome2/enchant/enchant.desc
similarity index 100%
rename from package/gnome24/enchant/enchant.desc
rename to package/gnome2/enchant/enchant.desc
diff --git a/package/gnome24/eog/eog.cache b/package/gnome2/eog/eog.cache
similarity index 100%
rename from package/gnome24/eog/eog.cache
rename to package/gnome2/eog/eog.cache
diff --git a/package/gnome24/eog/eog.conf b/package/gnome2/eog/eog.conf
similarity index 100%
rename from package/gnome24/eog/eog.conf
rename to package/gnome2/eog/eog.conf
diff --git a/package/gnome24/eog/eog.desc b/package/gnome2/eog/eog.desc
similarity index 100%
rename from package/gnome24/eog/eog.desc
rename to package/gnome2/eog/eog.desc
diff --git a/package/gnome24/epiphany/epiphany.cache b/package/gnome2/epiphany/epiphany.cache
similarity index 100%
rename from package/gnome24/epiphany/epiphany.cache
rename to package/gnome2/epiphany/epiphany.cache
diff --git a/package/gnome24/epiphany/epiphany.conf b/package/gnome2/epiphany/epiphany.conf
similarity index 100%
rename from package/gnome24/epiphany/epiphany.conf
rename to package/gnome2/epiphany/epiphany.conf
diff --git a/package/gnome24/epiphany/epiphany.desc b/package/gnome2/epiphany/epiphany.desc
similarity index 100%
rename from package/gnome24/epiphany/epiphany.desc
rename to package/gnome2/epiphany/epiphany.desc
diff --git a/package/gnome24/evolution/evolution.cache b/package/gnome2/evolution/evolution.cache
similarity index 100%
rename from package/gnome24/evolution/evolution.cache
rename to package/gnome2/evolution/evolution.cache
diff --git a/package/gnome24/evolution/evolution.conf b/package/gnome2/evolution/evolution.conf
similarity index 100%
rename from package/gnome24/evolution/evolution.conf
rename to package/gnome2/evolution/evolution.conf
diff --git a/package/gnome24/evolution/evolution.desc b/package/gnome2/evolution/evolution.desc
similarity index 100%
rename from package/gnome24/evolution/evolution.desc
rename to package/gnome2/evolution/evolution.desc
diff --git a/package/gnome24/evolution/hotfix.patch b/package/gnome2/evolution/hotfix.patch
similarity index 100%
rename from package/gnome24/evolution/hotfix.patch
rename to package/gnome2/evolution/hotfix.patch
diff --git a/package/gnome24/figment/figment.cache b/package/gnome2/figment/figment.cache
similarity index 100%
rename from package/gnome24/figment/figment.cache
rename to package/gnome2/figment/figment.cache
diff --git a/package/gnome24/figment/figment.conf b/package/gnome2/figment/figment.conf
similarity index 100%
rename from package/gnome24/figment/figment.conf
rename to package/gnome2/figment/figment.conf
diff --git a/package/gnome24/figment/figment.desc b/package/gnome2/figment/figment.desc
similarity index 100%
rename from package/gnome24/figment/figment.desc
rename to package/gnome2/figment/figment.desc
diff --git a/package/gnome24/file-roller/file-roller.cache b/package/gnome2/file-roller/file-roller.cache
similarity index 100%
rename from package/gnome24/file-roller/file-roller.cache
rename to package/gnome2/file-roller/file-roller.cache
diff --git a/package/gnome24/file-roller/file-roller.conf b/package/gnome2/file-roller/file-roller.conf
similarity index 100%
rename from package/gnome24/file-roller/file-roller.conf
rename to package/gnome2/file-roller/file-roller.conf
diff --git a/package/gnome24/file-roller/file-roller.desc b/package/gnome2/file-roller/file-roller.desc
similarity index 100%
rename from package/gnome24/file-roller/file-roller.desc
rename to package/gnome2/file-roller/file-roller.desc
diff --git a/package/gnome24/firestarter/firestarter.cache b/package/gnome2/firestarter/firestarter.cache
similarity index 100%
rename from package/gnome24/firestarter/firestarter.cache
rename to package/gnome2/firestarter/firestarter.cache
diff --git a/package/gnome24/firestarter/firestarter.conf b/package/gnome2/firestarter/firestarter.conf
similarity index 100%
rename from package/gnome24/firestarter/firestarter.conf
rename to package/gnome2/firestarter/firestarter.conf
diff --git a/package/gnome24/firestarter/firestarter.desc b/package/gnome2/firestarter/firestarter.desc
similarity index 100%
rename from package/gnome24/firestarter/firestarter.desc
rename to package/gnome2/firestarter/firestarter.desc
diff --git a/package/gnome24/gail/gail.cache b/package/gnome2/gail/gail.cache
similarity index 100%
rename from package/gnome24/gail/gail.cache
rename to package/gnome2/gail/gail.cache
diff --git a/package/gnome24/gail/gail.conf b/package/gnome2/gail/gail.conf
similarity index 100%
rename from package/gnome24/gail/gail.conf
rename to package/gnome2/gail/gail.conf
diff --git a/package/gnome24/gail/gail.desc b/package/gnome2/gail/gail.desc
similarity index 100%
rename from package/gnome24/gail/gail.desc
rename to package/gnome2/gail/gail.desc
diff --git a/package/gnome24/gal/gal.cache b/package/gnome2/gal/gal.cache
similarity index 100%
rename from package/gnome24/gal/gal.cache
rename to package/gnome2/gal/gal.cache
diff --git a/package/gnome24/gal/gal.conf b/package/gnome2/gal/gal.conf
similarity index 100%
rename from package/gnome24/gal/gal.conf
rename to package/gnome2/gal/gal.conf
diff --git a/package/gnome24/gal/gal.desc b/package/gnome2/gal/gal.desc
similarity index 100%
rename from package/gnome24/gal/gal.desc
rename to package/gnome2/gal/gal.desc
diff --git a/package/gnome24/galeon/galeon.cache b/package/gnome2/galeon/galeon.cache
similarity index 100%
rename from package/gnome24/galeon/galeon.cache
rename to package/gnome2/galeon/galeon.cache
diff --git a/package/gnome24/galeon/galeon.conf b/package/gnome2/galeon/galeon.conf
similarity index 100%
rename from package/gnome24/galeon/galeon.conf
rename to package/gnome2/galeon/galeon.conf
diff --git a/package/gnome24/galeon/galeon.desc b/package/gnome2/galeon/galeon.desc
similarity index 100%
rename from package/gnome24/galeon/galeon.desc
rename to package/gnome2/galeon/galeon.desc
diff --git a/package/gnome24/gcalctool/gcalctool.cache b/package/gnome2/gcalctool/gcalctool.cache
similarity index 100%
rename from package/gnome24/gcalctool/gcalctool.cache
rename to package/gnome2/gcalctool/gcalctool.cache
diff --git a/package/gnome24/gcalctool/gcalctool.conf b/package/gnome2/gcalctool/gcalctool.conf
similarity index 100%
rename from package/gnome24/gcalctool/gcalctool.conf
rename to package/gnome2/gcalctool/gcalctool.conf
diff --git a/package/gnome24/gcalctool/gcalctool.desc b/package/gnome2/gcalctool/gcalctool.desc
similarity index 100%
rename from package/gnome24/gcalctool/gcalctool.desc
rename to package/gnome2/gcalctool/gcalctool.desc
diff --git a/package/gnome24/gconf-editor/gconf-editor.cache b/package/gnome2/gconf-editor/gconf-editor.cache
similarity index 100%
rename from package/gnome24/gconf-editor/gconf-editor.cache
rename to package/gnome2/gconf-editor/gconf-editor.cache
diff --git a/package/gnome24/gconf-editor/gconf-editor.conf b/package/gnome2/gconf-editor/gconf-editor.conf
similarity index 100%
rename from package/gnome24/gconf-editor/gconf-editor.conf
rename to package/gnome2/gconf-editor/gconf-editor.conf
diff --git a/package/gnome24/gconf-editor/gconf-editor.desc b/package/gnome2/gconf-editor/gconf-editor.desc
similarity index 100%
rename from package/gnome24/gconf-editor/gconf-editor.desc
rename to package/gnome2/gconf-editor/gconf-editor.desc
diff --git a/package/gnome24/gconf/gconf-pkg.conf b/package/gnome2/gconf/gconf-pkg.conf
similarity index 100%
rename from package/gnome24/gconf/gconf-pkg.conf
rename to package/gnome2/gconf/gconf-pkg.conf
diff --git a/package/gnome24/gconf/gconf.cache b/package/gnome2/gconf/gconf.cache
similarity index 100%
rename from package/gnome24/gconf/gconf.cache
rename to package/gnome2/gconf/gconf.cache
diff --git a/package/gnome24/gconf/gconf.conf b/package/gnome2/gconf/gconf.conf
similarity index 100%
rename from package/gnome24/gconf/gconf.conf
rename to package/gnome2/gconf/gconf.conf
diff --git a/package/gnome24/gconf/gconf.cron b/package/gnome2/gconf/gconf.cron
similarity index 100%
rename from package/gnome24/gconf/gconf.cron
rename to package/gnome2/gconf/gconf.cron
diff --git a/package/gnome24/gconf/gconf.desc b/package/gnome2/gconf/gconf.desc
similarity index 100%
rename from package/gnome24/gconf/gconf.desc
rename to package/gnome2/gconf/gconf.desc
diff --git a/package/gnome24/gconfmm/gconfmm.cache b/package/gnome2/gconfmm/gconfmm.cache
similarity index 100%
rename from package/gnome24/gconfmm/gconfmm.cache
rename to package/gnome2/gconfmm/gconfmm.cache
diff --git a/package/gnome24/gconfmm/gconfmm.conf b/package/gnome2/gconfmm/gconfmm.conf
similarity index 100%
rename from package/gnome24/gconfmm/gconfmm.conf
rename to package/gnome2/gconfmm/gconfmm.conf
diff --git a/package/gnome24/gconfmm/gconfmm.desc b/package/gnome2/gconfmm/gconfmm.desc
similarity index 100%
rename from package/gnome24/gconfmm/gconfmm.desc
rename to package/gnome2/gconfmm/gconfmm.desc
diff --git a/package/gnome24/gdesklets/gdesklets.cache b/package/gnome2/gdesklets/gdesklets.cache
similarity index 100%
rename from package/gnome24/gdesklets/gdesklets.cache
rename to package/gnome2/gdesklets/gdesklets.cache
diff --git a/package/gnome24/gdesklets/gdesklets.conf b/package/gnome2/gdesklets/gdesklets.conf
similarity index 100%
rename from package/gnome24/gdesklets/gdesklets.conf
rename to package/gnome2/gdesklets/gdesklets.conf
diff --git a/package/gnome24/gdesklets/gdesklets.desc b/package/gnome2/gdesklets/gdesklets.desc
similarity index 100%
rename from package/gnome24/gdesklets/gdesklets.desc
rename to package/gnome2/gdesklets/gdesklets.desc
diff --git a/package/gnome24/gdl/gdl.conf b/package/gnome2/gdl/gdl.conf
similarity index 100%
rename from package/gnome24/gdl/gdl.conf
rename to package/gnome2/gdl/gdl.conf
diff --git a/package/gnome24/gdl/gdl.desc b/package/gnome2/gdl/gdl.desc
similarity index 100%
rename from package/gnome24/gdl/gdl.desc
rename to package/gnome2/gdl/gdl.desc
diff --git a/package/gnome24/gdm/gdm.cache b/package/gnome2/gdm/gdm.cache
similarity index 100%
rename from package/gnome24/gdm/gdm.cache
rename to package/gnome2/gdm/gdm.cache
diff --git a/package/gnome24/gdm/gdm.conf b/package/gnome2/gdm/gdm.conf
similarity index 100%
rename from package/gnome24/gdm/gdm.conf
rename to package/gnome2/gdm/gdm.conf
diff --git a/package/gnome24/gdm/gdm.cron b/package/gnome2/gdm/gdm.cron
similarity index 100%
rename from package/gnome24/gdm/gdm.cron
rename to package/gnome2/gdm/gdm.cron
diff --git a/package/gnome24/gdm/gdm.desc b/package/gnome2/gdm/gdm.desc
similarity index 100%
rename from package/gnome24/gdm/gdm.desc
rename to package/gnome2/gdm/gdm.desc
diff --git a/package/gnome24/gdm/postsysfiles.in b/package/gnome2/gdm/postsysfiles.in
similarity index 100%
rename from package/gnome24/gdm/postsysfiles.in
rename to package/gnome2/gdm/postsysfiles.in
diff --git a/package/gnome24/gedit-plugins/diff-hotfix.patch b/package/gnome2/gedit-plugins/diff-hotfix.patch
similarity index 100%
rename from package/gnome24/gedit-plugins/diff-hotfix.patch
rename to package/gnome2/gedit-plugins/diff-hotfix.patch
diff --git a/package/gnome24/gedit-plugins/gedit-plugins.cache b/package/gnome2/gedit-plugins/gedit-plugins.cache
similarity index 100%
rename from package/gnome24/gedit-plugins/gedit-plugins.cache
rename to package/gnome2/gedit-plugins/gedit-plugins.cache
diff --git a/package/gnome24/gedit-plugins/gedit-plugins.conf b/package/gnome2/gedit-plugins/gedit-plugins.conf
similarity index 100%
rename from package/gnome24/gedit-plugins/gedit-plugins.conf
rename to package/gnome2/gedit-plugins/gedit-plugins.conf
diff --git a/package/gnome24/gedit-plugins/gedit-plugins.desc b/package/gnome2/gedit-plugins/gedit-plugins.desc
similarity index 100%
rename from package/gnome24/gedit-plugins/gedit-plugins.desc
rename to package/gnome2/gedit-plugins/gedit-plugins.desc
diff --git a/package/gnome24/gedit/gedit.cache b/package/gnome2/gedit/gedit.cache
similarity index 100%
rename from package/gnome24/gedit/gedit.cache
rename to package/gnome2/gedit/gedit.cache
diff --git a/package/gnome24/gedit/gedit.conf b/package/gnome2/gedit/gedit.conf
similarity index 100%
rename from package/gnome24/gedit/gedit.conf
rename to package/gnome2/gedit/gedit.conf
diff --git a/package/gnome24/gedit/gedit.desc b/package/gnome2/gedit/gedit.desc
similarity index 100%
rename from package/gnome24/gedit/gedit.desc
rename to package/gnome2/gedit/gedit.desc
diff --git a/package/gnome24/gftp/gftp.cache b/package/gnome2/gftp/gftp.cache
similarity index 100%
rename from package/gnome24/gftp/gftp.cache
rename to package/gnome2/gftp/gftp.cache
diff --git a/package/gnome24/gftp/gftp.conf b/package/gnome2/gftp/gftp.conf
similarity index 100%
rename from package/gnome24/gftp/gftp.conf
rename to package/gnome2/gftp/gftp.conf
diff --git a/package/gnome24/gftp/gftp.desc b/package/gnome2/gftp/gftp.desc
similarity index 100%
rename from package/gnome24/gftp/gftp.desc
rename to package/gnome2/gftp/gftp.desc
diff --git a/package/gnome24/ggv/ggv.cache b/package/gnome2/ggv/ggv.cache
similarity index 100%
rename from package/gnome24/ggv/ggv.cache
rename to package/gnome2/ggv/ggv.cache
diff --git a/package/gnome24/ggv/ggv.conf b/package/gnome2/ggv/ggv.conf
similarity index 100%
rename from package/gnome24/ggv/ggv.conf
rename to package/gnome2/ggv/ggv.conf
diff --git a/package/gnome24/ggv/ggv.desc b/package/gnome2/ggv/ggv.desc
similarity index 100%
rename from package/gnome24/ggv/ggv.desc
rename to package/gnome2/ggv/ggv.desc
diff --git a/package/gnome24/ghex/ghex.cache b/package/gnome2/ghex/ghex.cache
similarity index 100%
rename from package/gnome24/ghex/ghex.cache
rename to package/gnome2/ghex/ghex.cache
diff --git a/package/gnome24/ghex/ghex.conf b/package/gnome2/ghex/ghex.conf
similarity index 100%
rename from package/gnome24/ghex/ghex.conf
rename to package/gnome2/ghex/ghex.conf
diff --git a/package/gnome24/ghex/ghex.desc b/package/gnome2/ghex/ghex.desc
similarity index 100%
rename from package/gnome24/ghex/ghex.desc
rename to package/gnome2/ghex/ghex.desc
diff --git a/package/gnome24/gimp/gimp.cache b/package/gnome2/gimp/gimp.cache
similarity index 100%
rename from package/gnome24/gimp/gimp.cache
rename to package/gnome2/gimp/gimp.cache
diff --git a/package/gnome24/gimp/gimp.conf b/package/gnome2/gimp/gimp.conf
similarity index 100%
rename from package/gnome24/gimp/gimp.conf
rename to package/gnome2/gimp/gimp.conf
diff --git a/package/gnome24/gimp/gimp.desc b/package/gnome2/gimp/gimp.desc
similarity index 100%
rename from package/gnome24/gimp/gimp.desc
rename to package/gnome2/gimp/gimp.desc
diff --git a/package/gnome24/glabels/glabels.cache b/package/gnome2/glabels/glabels.cache
similarity index 100%
rename from package/gnome24/glabels/glabels.cache
rename to package/gnome2/glabels/glabels.cache
diff --git a/package/gnome24/glabels/glabels.conf b/package/gnome2/glabels/glabels.conf
similarity index 100%
rename from package/gnome24/glabels/glabels.conf
rename to package/gnome2/glabels/glabels.conf
diff --git a/package/gnome24/glabels/glabels.desc b/package/gnome2/glabels/glabels.desc
similarity index 100%
rename from package/gnome24/glabels/glabels.desc
rename to package/gnome2/glabels/glabels.desc
diff --git a/package/gnome24/glade/glade.cache b/package/gnome2/glade/glade.cache
similarity index 100%
rename from package/gnome24/glade/glade.cache
rename to package/gnome2/glade/glade.cache
diff --git a/package/gnome24/glade/glade.conf b/package/gnome2/glade/glade.conf
similarity index 100%
rename from package/gnome24/glade/glade.conf
rename to package/gnome2/glade/glade.conf
diff --git a/package/gnome24/glade/glade.desc b/package/gnome2/glade/glade.desc
similarity index 100%
rename from package/gnome24/glade/glade.desc
rename to package/gnome2/glade/glade.desc
diff --git a/package/gnome24/glademm/glademm.cache b/package/gnome2/glademm/glademm.cache
similarity index 100%
rename from package/gnome24/glademm/glademm.cache
rename to package/gnome2/glademm/glademm.cache
diff --git a/package/gnome24/glademm/glademm.conf b/package/gnome2/glademm/glademm.conf
similarity index 100%
rename from package/gnome24/glademm/glademm.conf
rename to package/gnome2/glademm/glademm.conf
diff --git a/package/gnome24/glademm/glademm.desc b/package/gnome2/glademm/glademm.desc
similarity index 100%
rename from package/gnome24/glademm/glademm.desc
rename to package/gnome2/glademm/glademm.desc
diff --git a/package/gnome24/glib/config.hlp b/package/gnome2/glib/config.hlp
similarity index 100%
rename from package/gnome24/glib/config.hlp
rename to package/gnome2/glib/config.hlp
diff --git a/package/gnome24/glib/config.in b/package/gnome2/glib/config.in
similarity index 100%
rename from package/gnome24/glib/config.in
rename to package/gnome2/glib/config.in
diff --git a/package/gnome24/glib/gettext-unneeded.patch b/package/gnome2/glib/gettext-unneeded.patch
similarity index 100%
rename from package/gnome24/glib/gettext-unneeded.patch
rename to package/gnome2/glib/gettext-unneeded.patch
diff --git a/package/gnome24/glib/glib.cache b/package/gnome2/glib/glib.cache
similarity index 100%
rename from package/gnome24/glib/glib.cache
rename to package/gnome2/glib/glib.cache
diff --git a/package/gnome24/glib/glib.conf b/package/gnome2/glib/glib.conf
similarity index 100%
rename from package/gnome24/glib/glib.conf
rename to package/gnome2/glib/glib.conf
diff --git a/package/gnome24/glib/glib.desc b/package/gnome2/glib/glib.desc
similarity index 100%
rename from package/gnome24/glib/glib.desc
rename to package/gnome2/glib/glib.desc
diff --git a/package/gnome24/glib/gnome-2.conf b/package/gnome2/glib/gnome-2.conf
similarity index 100%
rename from package/gnome24/glib/gnome-2.conf
rename to package/gnome2/glib/gnome-2.conf
diff --git a/package/gnome24/glib/we-know-how-to-use-a-compiler.patch b/package/gnome2/glib/we-know-how-to-use-a-compiler.patch
similarity index 100%
rename from package/gnome24/glib/we-know-how-to-use-a-compiler.patch
rename to package/gnome2/glib/we-know-how-to-use-a-compiler.patch
diff --git a/package/gnome24/glibmm/glibmm.cache b/package/gnome2/glibmm/glibmm.cache
similarity index 100%
rename from package/gnome24/glibmm/glibmm.cache
rename to package/gnome2/glibmm/glibmm.cache
diff --git a/package/gnome24/glibmm/glibmm.conf b/package/gnome2/glibmm/glibmm.conf
similarity index 100%
rename from package/gnome24/glibmm/glibmm.conf
rename to package/gnome2/glibmm/glibmm.conf
diff --git a/package/gnome24/glibmm/glibmm.desc b/package/gnome2/glibmm/glibmm.desc
similarity index 100%
rename from package/gnome24/glibmm/glibmm.desc
rename to package/gnome2/glibmm/glibmm.desc
diff --git a/package/gnome24/gmime/gmime.cache b/package/gnome2/gmime/gmime.cache
similarity index 100%
rename from package/gnome24/gmime/gmime.cache
rename to package/gnome2/gmime/gmime.cache
diff --git a/package/gnome24/gmime/gmime.conf b/package/gnome2/gmime/gmime.conf
similarity index 100%
rename from package/gnome24/gmime/gmime.conf
rename to package/gnome2/gmime/gmime.conf
diff --git a/package/gnome24/gmime/gmime.desc b/package/gnome2/gmime/gmime.desc
similarity index 100%
rename from package/gnome24/gmime/gmime.desc
rename to package/gnome2/gmime/gmime.desc
diff --git a/package/gnome24/gnet/gnet.cache b/package/gnome2/gnet/gnet.cache
similarity index 100%
rename from package/gnome24/gnet/gnet.cache
rename to package/gnome2/gnet/gnet.cache
diff --git a/package/gnome24/gnet/gnet.conf b/package/gnome2/gnet/gnet.conf
similarity index 100%
rename from package/gnome24/gnet/gnet.conf
rename to package/gnome2/gnet/gnet.conf
diff --git a/package/gnome24/gnet/gnet.desc b/package/gnome2/gnet/gnet.desc
similarity index 100%
rename from package/gnome24/gnet/gnet.desc
rename to package/gnome2/gnet/gnet.desc
diff --git a/package/gnome24/gnet1/gnet1.cache b/package/gnome2/gnet1/gnet1.cache
similarity index 100%
rename from package/gnome24/gnet1/gnet1.cache
rename to package/gnome2/gnet1/gnet1.cache
diff --git a/package/gnome24/gnet1/gnet1.conf b/package/gnome2/gnet1/gnet1.conf
similarity index 100%
rename from package/gnome24/gnet1/gnet1.conf
rename to package/gnome2/gnet1/gnet1.conf
diff --git a/package/gnome24/gnet1/gnet1.desc b/package/gnome2/gnet1/gnet1.desc
similarity index 100%
rename from package/gnome24/gnet1/gnet1.desc
rename to package/gnome2/gnet1/gnet1.desc
diff --git a/package/gnome24/gnome-applets/gnome-applets.cache b/package/gnome2/gnome-applets/gnome-applets.cache
similarity index 100%
rename from package/gnome24/gnome-applets/gnome-applets.cache
rename to package/gnome2/gnome-applets/gnome-applets.cache
diff --git a/package/gnome24/gnome-applets/gnome-applets.conf b/package/gnome2/gnome-applets/gnome-applets.conf
similarity index 100%
rename from package/gnome24/gnome-applets/gnome-applets.conf
rename to package/gnome2/gnome-applets/gnome-applets.conf
diff --git a/package/gnome24/gnome-applets/gnome-applets.desc b/package/gnome2/gnome-applets/gnome-applets.desc
similarity index 100%
rename from package/gnome24/gnome-applets/gnome-applets.desc
rename to package/gnome2/gnome-applets/gnome-applets.desc
diff --git a/package/gnome24/gnome-applets/no-apm-on-powerpc.patch b/package/gnome2/gnome-applets/no-apm-on-powerpc.patch
similarity index 100%
rename from package/gnome24/gnome-applets/no-apm-on-powerpc.patch
rename to package/gnome2/gnome-applets/no-apm-on-powerpc.patch
diff --git a/package/gnome24/gnome-blog/gnome-blog.cache b/package/gnome2/gnome-blog/gnome-blog.cache
similarity index 100%
rename from package/gnome24/gnome-blog/gnome-blog.cache
rename to package/gnome2/gnome-blog/gnome-blog.cache
diff --git a/package/gnome24/gnome-blog/gnome-blog.conf b/package/gnome2/gnome-blog/gnome-blog.conf
similarity index 100%
rename from package/gnome24/gnome-blog/gnome-blog.conf
rename to package/gnome2/gnome-blog/gnome-blog.conf
diff --git a/package/gnome24/gnome-blog/gnome-blog.desc b/package/gnome2/gnome-blog/gnome-blog.desc
similarity index 100%
rename from package/gnome24/gnome-blog/gnome-blog.desc
rename to package/gnome2/gnome-blog/gnome-blog.desc
diff --git a/package/gnome24/gnome-build/gnome-build.conf b/package/gnome2/gnome-build/gnome-build.conf
similarity index 100%
rename from package/gnome24/gnome-build/gnome-build.conf
rename to package/gnome2/gnome-build/gnome-build.conf
diff --git a/package/gnome24/gnome-build/gnome-build.desc b/package/gnome2/gnome-build/gnome-build.desc
similarity index 100%
rename from package/gnome24/gnome-build/gnome-build.desc
rename to package/gnome2/gnome-build/gnome-build.desc
diff --git a/package/gnome24/gnome-common/gnome-common.cache b/package/gnome2/gnome-common/gnome-common.cache
similarity index 100%
rename from package/gnome24/gnome-common/gnome-common.cache
rename to package/gnome2/gnome-common/gnome-common.cache
diff --git a/package/gnome24/gnome-common/gnome-common.conf b/package/gnome2/gnome-common/gnome-common.conf
similarity index 100%
rename from package/gnome24/gnome-common/gnome-common.conf
rename to package/gnome2/gnome-common/gnome-common.conf
diff --git a/package/gnome24/gnome-common/gnome-common.desc b/package/gnome2/gnome-common/gnome-common.desc
similarity index 100%
rename from package/gnome24/gnome-common/gnome-common.desc
rename to package/gnome2/gnome-common/gnome-common.desc
diff --git a/package/gnome24/gnome-cups-manager/gnome-cups-manager.cache b/package/gnome2/gnome-cups-manager/gnome-cups-manager.cache
similarity index 100%
rename from package/gnome24/gnome-cups-manager/gnome-cups-manager.cache
rename to package/gnome2/gnome-cups-manager/gnome-cups-manager.cache
diff --git a/package/gnome24/gnome-cups-manager/gnome-cups-manager.conf b/package/gnome2/gnome-cups-manager/gnome-cups-manager.conf
similarity index 100%
rename from package/gnome24/gnome-cups-manager/gnome-cups-manager.conf
rename to package/gnome2/gnome-cups-manager/gnome-cups-manager.conf
diff --git a/package/gnome24/gnome-cups-manager/gnome-cups-manager.desc b/package/gnome2/gnome-cups-manager/gnome-cups-manager.desc
similarity index 100%
rename from package/gnome24/gnome-cups-manager/gnome-cups-manager.desc
rename to package/gnome2/gnome-cups-manager/gnome-cups-manager.desc
diff --git a/package/gnome24/gnome-debug/gnome-debug.conf b/package/gnome2/gnome-debug/gnome-debug.conf
similarity index 100%
rename from package/gnome24/gnome-debug/gnome-debug.conf
rename to package/gnome2/gnome-debug/gnome-debug.conf
diff --git a/package/gnome24/gnome-debug/gnome-debug.desc b/package/gnome2/gnome-debug/gnome-debug.desc
similarity index 100%
rename from package/gnome24/gnome-debug/gnome-debug.desc
rename to package/gnome2/gnome-debug/gnome-debug.desc
diff --git a/package/gnome24/gnome-desktop/gnome-desktop.cache b/package/gnome2/gnome-desktop/gnome-desktop.cache
similarity index 100%
rename from package/gnome24/gnome-desktop/gnome-desktop.cache
rename to package/gnome2/gnome-desktop/gnome-desktop.cache
diff --git a/package/gnome24/gnome-desktop/gnome-desktop.conf b/package/gnome2/gnome-desktop/gnome-desktop.conf
similarity index 100%
rename from package/gnome24/gnome-desktop/gnome-desktop.conf
rename to package/gnome2/gnome-desktop/gnome-desktop.conf
diff --git a/package/gnome24/gnome-desktop/gnome-desktop.desc b/package/gnome2/gnome-desktop/gnome-desktop.desc
similarity index 100%
rename from package/gnome24/gnome-desktop/gnome-desktop.desc
rename to package/gnome2/gnome-desktop/gnome-desktop.desc
diff --git a/package/gnome24/gnome-games/gnome-games.cache b/package/gnome2/gnome-games/gnome-games.cache
similarity index 100%
rename from package/gnome24/gnome-games/gnome-games.cache
rename to package/gnome2/gnome-games/gnome-games.cache
diff --git a/package/gnome24/gnome-games/gnome-games.conf b/package/gnome2/gnome-games/gnome-games.conf
similarity index 100%
rename from package/gnome24/gnome-games/gnome-games.conf
rename to package/gnome2/gnome-games/gnome-games.conf
diff --git a/package/gnome24/gnome-games/gnome-games.desc b/package/gnome2/gnome-games/gnome-games.desc
similarity index 100%
rename from package/gnome24/gnome-games/gnome-games.desc
rename to package/gnome2/gnome-games/gnome-games.desc
diff --git a/package/gnome24/gnome-icon-theme/gnome-icon-theme.cache b/package/gnome2/gnome-icon-theme/gnome-icon-theme.cache
similarity index 100%
rename from package/gnome24/gnome-icon-theme/gnome-icon-theme.cache
rename to package/gnome2/gnome-icon-theme/gnome-icon-theme.cache
diff --git a/package/gnome24/gnome-icon-theme/gnome-icon-theme.conf b/package/gnome2/gnome-icon-theme/gnome-icon-theme.conf
similarity index 100%
rename from package/gnome24/gnome-icon-theme/gnome-icon-theme.conf
rename to package/gnome2/gnome-icon-theme/gnome-icon-theme.conf
diff --git a/package/gnome24/gnome-icon-theme/gnome-icon-theme.desc b/package/gnome2/gnome-icon-theme/gnome-icon-theme.desc
similarity index 100%
rename from package/gnome24/gnome-icon-theme/gnome-icon-theme.desc
rename to package/gnome2/gnome-icon-theme/gnome-icon-theme.desc
diff --git a/package/gnome24/gnome-keyring/gnome-keyring.cache b/package/gnome2/gnome-keyring/gnome-keyring.cache
similarity index 100%
rename from package/gnome24/gnome-keyring/gnome-keyring.cache
rename to package/gnome2/gnome-keyring/gnome-keyring.cache
diff --git a/package/gnome24/gnome-keyring/gnome-keyring.conf b/package/gnome2/gnome-keyring/gnome-keyring.conf
similarity index 100%
rename from package/gnome24/gnome-keyring/gnome-keyring.conf
rename to package/gnome2/gnome-keyring/gnome-keyring.conf
diff --git a/package/gnome24/gnome-keyring/gnome-keyring.desc b/package/gnome2/gnome-keyring/gnome-keyring.desc
similarity index 100%
rename from package/gnome24/gnome-keyring/gnome-keyring.desc
rename to package/gnome2/gnome-keyring/gnome-keyring.desc
diff --git a/package/gnome24/gnome-mag/gnome-mag.cache b/package/gnome2/gnome-mag/gnome-mag.cache
similarity index 100%
rename from package/gnome24/gnome-mag/gnome-mag.cache
rename to package/gnome2/gnome-mag/gnome-mag.cache
diff --git a/package/gnome24/gnome-mag/gnome-mag.conf b/package/gnome2/gnome-mag/gnome-mag.conf
similarity index 100%
rename from package/gnome24/gnome-mag/gnome-mag.conf
rename to package/gnome2/gnome-mag/gnome-mag.conf
diff --git a/package/gnome24/gnome-mag/gnome-mag.desc b/package/gnome2/gnome-mag/gnome-mag.desc
similarity index 100%
rename from package/gnome24/gnome-mag/gnome-mag.desc
rename to package/gnome2/gnome-mag/gnome-mag.desc
diff --git a/package/gnome24/gnome-media/gnome-media.cache b/package/gnome2/gnome-media/gnome-media.cache
similarity index 100%
rename from package/gnome24/gnome-media/gnome-media.cache
rename to package/gnome2/gnome-media/gnome-media.cache
diff --git a/package/gnome24/gnome-media/gnome-media.conf b/package/gnome2/gnome-media/gnome-media.conf
similarity index 100%
rename from package/gnome24/gnome-media/gnome-media.conf
rename to package/gnome2/gnome-media/gnome-media.conf
diff --git a/package/gnome24/gnome-media/gnome-media.desc b/package/gnome2/gnome-media/gnome-media.desc
similarity index 100%
rename from package/gnome24/gnome-media/gnome-media.desc
rename to package/gnome2/gnome-media/gnome-media.desc
diff --git a/package/gnome24/gnome-mime-data/gnome-mime-data.cache b/package/gnome2/gnome-mime-data/gnome-mime-data.cache
similarity index 100%
rename from package/gnome24/gnome-mime-data/gnome-mime-data.cache
rename to package/gnome2/gnome-mime-data/gnome-mime-data.cache
diff --git a/package/gnome24/gnome-mime-data/gnome-mime-data.conf b/package/gnome2/gnome-mime-data/gnome-mime-data.conf
similarity index 100%
rename from package/gnome24/gnome-mime-data/gnome-mime-data.conf
rename to package/gnome2/gnome-mime-data/gnome-mime-data.conf
diff --git a/package/gnome24/gnome-mime-data/gnome-mime-data.desc b/package/gnome2/gnome-mime-data/gnome-mime-data.desc
similarity index 100%
rename from package/gnome24/gnome-mime-data/gnome-mime-data.desc
rename to package/gnome2/gnome-mime-data/gnome-mime-data.desc
diff --git a/package/gnome24/gnome-panel/gnome-panel.cache b/package/gnome2/gnome-panel/gnome-panel.cache
similarity index 100%
rename from package/gnome24/gnome-panel/gnome-panel.cache
rename to package/gnome2/gnome-panel/gnome-panel.cache
diff --git a/package/gnome24/gnome-panel/gnome-panel.conf b/package/gnome2/gnome-panel/gnome-panel.conf
similarity index 100%
rename from package/gnome24/gnome-panel/gnome-panel.conf
rename to package/gnome2/gnome-panel/gnome-panel.conf
diff --git a/package/gnome24/gnome-panel/gnome-panel.desc b/package/gnome2/gnome-panel/gnome-panel.desc
similarity index 100%
rename from package/gnome24/gnome-panel/gnome-panel.desc
rename to package/gnome2/gnome-panel/gnome-panel.desc
diff --git a/package/gnome24/gnome-pilot-conduits/gnome-pilot-conduits.cache b/package/gnome2/gnome-pilot-conduits/gnome-pilot-conduits.cache
similarity index 100%
rename from package/gnome24/gnome-pilot-conduits/gnome-pilot-conduits.cache
rename to package/gnome2/gnome-pilot-conduits/gnome-pilot-conduits.cache
diff --git a/package/gnome24/gnome-pilot-conduits/gnome-pilot-conduits.conf b/package/gnome2/gnome-pilot-conduits/gnome-pilot-conduits.conf
similarity index 100%
rename from package/gnome24/gnome-pilot-conduits/gnome-pilot-conduits.conf
rename to package/gnome2/gnome-pilot-conduits/gnome-pilot-conduits.conf
diff --git a/package/gnome24/gnome-pilot-conduits/gnome-pilot-conduits.desc b/package/gnome2/gnome-pilot-conduits/gnome-pilot-conduits.desc
similarity index 100%
rename from package/gnome24/gnome-pilot-conduits/gnome-pilot-conduits.desc
rename to package/gnome2/gnome-pilot-conduits/gnome-pilot-conduits.desc
diff --git a/package/gnome24/gnome-pilot/gnome-pilot.cache b/package/gnome2/gnome-pilot/gnome-pilot.cache
similarity index 100%
rename from package/gnome24/gnome-pilot/gnome-pilot.cache
rename to package/gnome2/gnome-pilot/gnome-pilot.cache
diff --git a/package/gnome24/gnome-pilot/gnome-pilot.conf b/package/gnome2/gnome-pilot/gnome-pilot.conf
similarity index 100%
rename from package/gnome24/gnome-pilot/gnome-pilot.conf
rename to package/gnome2/gnome-pilot/gnome-pilot.conf
diff --git a/package/gnome24/gnome-pilot/gnome-pilot.desc b/package/gnome2/gnome-pilot/gnome-pilot.desc
similarity index 100%
rename from package/gnome24/gnome-pilot/gnome-pilot.desc
rename to package/gnome2/gnome-pilot/gnome-pilot.desc
diff --git a/package/gnome24/gnome-python/gnome-python.cache b/package/gnome2/gnome-python/gnome-python.cache
similarity index 100%
rename from package/gnome24/gnome-python/gnome-python.cache
rename to package/gnome2/gnome-python/gnome-python.cache
diff --git a/package/gnome24/gnome-python/gnome-python.conf b/package/gnome2/gnome-python/gnome-python.conf
similarity index 100%
rename from package/gnome24/gnome-python/gnome-python.conf
rename to package/gnome2/gnome-python/gnome-python.conf
diff --git a/package/gnome24/gnome-python/gnome-python.desc b/package/gnome2/gnome-python/gnome-python.desc
similarity index 100%
rename from package/gnome24/gnome-python/gnome-python.desc
rename to package/gnome2/gnome-python/gnome-python.desc
diff --git a/package/gnome24/gnome-session/gnome-session.cache b/package/gnome2/gnome-session/gnome-session.cache
similarity index 100%
rename from package/gnome24/gnome-session/gnome-session.cache
rename to package/gnome2/gnome-session/gnome-session.cache
diff --git a/package/gnome24/gnome-session/gnome-session.conf b/package/gnome2/gnome-session/gnome-session.conf
similarity index 100%
rename from package/gnome24/gnome-session/gnome-session.conf
rename to package/gnome2/gnome-session/gnome-session.conf
diff --git a/package/gnome24/gnome-session/gnome-session.desc b/package/gnome2/gnome-session/gnome-session.desc
similarity index 100%
rename from package/gnome24/gnome-session/gnome-session.desc
rename to package/gnome2/gnome-session/gnome-session.desc
diff --git a/package/gnome24/gnome-speech/gnome-speech.cache b/package/gnome2/gnome-speech/gnome-speech.cache
similarity index 100%
rename from package/gnome24/gnome-speech/gnome-speech.cache
rename to package/gnome2/gnome-speech/gnome-speech.cache
diff --git a/package/gnome24/gnome-speech/gnome-speech.conf b/package/gnome2/gnome-speech/gnome-speech.conf
similarity index 100%
rename from package/gnome24/gnome-speech/gnome-speech.conf
rename to package/gnome2/gnome-speech/gnome-speech.conf
diff --git a/package/gnome24/gnome-speech/gnome-speech.desc b/package/gnome2/gnome-speech/gnome-speech.desc
similarity index 100%
rename from package/gnome24/gnome-speech/gnome-speech.desc
rename to package/gnome2/gnome-speech/gnome-speech.desc
diff --git a/package/gnome24/gnome-spell/gnome-spell.cache b/package/gnome2/gnome-spell/gnome-spell.cache
similarity index 100%
rename from package/gnome24/gnome-spell/gnome-spell.cache
rename to package/gnome2/gnome-spell/gnome-spell.cache
diff --git a/package/gnome24/gnome-spell/gnome-spell.conf b/package/gnome2/gnome-spell/gnome-spell.conf
similarity index 100%
rename from package/gnome24/gnome-spell/gnome-spell.conf
rename to package/gnome2/gnome-spell/gnome-spell.conf
diff --git a/package/gnome24/gnome-spell/gnome-spell.desc b/package/gnome2/gnome-spell/gnome-spell.desc
similarity index 100%
rename from package/gnome24/gnome-spell/gnome-spell.desc
rename to package/gnome2/gnome-spell/gnome-spell.desc
diff --git a/package/gnome24/gnome-system-monitor/gnome-system-monitor.cache b/package/gnome2/gnome-system-monitor/gnome-system-monitor.cache
similarity index 100%
rename from package/gnome24/gnome-system-monitor/gnome-system-monitor.cache
rename to package/gnome2/gnome-system-monitor/gnome-system-monitor.cache
diff --git a/package/gnome24/gnome-system-monitor/gnome-system-monitor.conf b/package/gnome2/gnome-system-monitor/gnome-system-monitor.conf
similarity index 100%
rename from package/gnome24/gnome-system-monitor/gnome-system-monitor.conf
rename to package/gnome2/gnome-system-monitor/gnome-system-monitor.conf
diff --git a/package/gnome24/gnome-system-monitor/gnome-system-monitor.desc b/package/gnome2/gnome-system-monitor/gnome-system-monitor.desc
similarity index 100%
rename from package/gnome24/gnome-system-monitor/gnome-system-monitor.desc
rename to package/gnome2/gnome-system-monitor/gnome-system-monitor.desc
diff --git a/package/gnome24/gnome-system-tools/crack-missing-header.patch b/package/gnome2/gnome-system-tools/crack-missing-header.patch
similarity index 100%
rename from package/gnome24/gnome-system-tools/crack-missing-header.patch
rename to package/gnome2/gnome-system-tools/crack-missing-header.patch
diff --git a/package/gnome24/gnome-system-tools/gnome-system-tools.cache b/package/gnome2/gnome-system-tools/gnome-system-tools.cache
similarity index 100%
rename from package/gnome24/gnome-system-tools/gnome-system-tools.cache
rename to package/gnome2/gnome-system-tools/gnome-system-tools.cache
diff --git a/package/gnome24/gnome-system-tools/gnome-system-tools.conf b/package/gnome2/gnome-system-tools/gnome-system-tools.conf
similarity index 100%
rename from package/gnome24/gnome-system-tools/gnome-system-tools.conf
rename to package/gnome2/gnome-system-tools/gnome-system-tools.conf
diff --git a/package/gnome24/gnome-system-tools/gnome-system-tools.desc b/package/gnome2/gnome-system-tools/gnome-system-tools.desc
similarity index 100%
rename from package/gnome24/gnome-system-tools/gnome-system-tools.desc
rename to package/gnome2/gnome-system-tools/gnome-system-tools.desc
diff --git a/package/gnome24/gnome-terminal/gnome-terminal.cache b/package/gnome2/gnome-terminal/gnome-terminal.cache
similarity index 100%
rename from package/gnome24/gnome-terminal/gnome-terminal.cache
rename to package/gnome2/gnome-terminal/gnome-terminal.cache
diff --git a/package/gnome24/gnome-terminal/gnome-terminal.conf b/package/gnome2/gnome-terminal/gnome-terminal.conf
similarity index 100%
rename from package/gnome24/gnome-terminal/gnome-terminal.conf
rename to package/gnome2/gnome-terminal/gnome-terminal.conf
diff --git a/package/gnome24/gnome-terminal/gnome-terminal.desc b/package/gnome2/gnome-terminal/gnome-terminal.desc
similarity index 100%
rename from package/gnome24/gnome-terminal/gnome-terminal.desc
rename to package/gnome2/gnome-terminal/gnome-terminal.desc
diff --git a/package/gnome24/gnome-themes/gnome-themes.cache b/package/gnome2/gnome-themes/gnome-themes.cache
similarity index 100%
rename from package/gnome24/gnome-themes/gnome-themes.cache
rename to package/gnome2/gnome-themes/gnome-themes.cache
diff --git a/package/gnome24/gnome-themes/gnome-themes.conf b/package/gnome2/gnome-themes/gnome-themes.conf
similarity index 100%
rename from package/gnome24/gnome-themes/gnome-themes.conf
rename to package/gnome2/gnome-themes/gnome-themes.conf
diff --git a/package/gnome24/gnome-themes/gnome-themes.desc b/package/gnome2/gnome-themes/gnome-themes.desc
similarity index 100%
rename from package/gnome24/gnome-themes/gnome-themes.desc
rename to package/gnome2/gnome-themes/gnome-themes.desc
diff --git a/package/gnome24/gnome-utils/gnome-utils.cache b/package/gnome2/gnome-utils/gnome-utils.cache
similarity index 100%
rename from package/gnome24/gnome-utils/gnome-utils.cache
rename to package/gnome2/gnome-utils/gnome-utils.cache
diff --git a/package/gnome24/gnome-utils/gnome-utils.conf b/package/gnome2/gnome-utils/gnome-utils.conf
similarity index 100%
rename from package/gnome24/gnome-utils/gnome-utils.conf
rename to package/gnome2/gnome-utils/gnome-utils.conf
diff --git a/package/gnome24/gnome-utils/gnome-utils.desc b/package/gnome2/gnome-utils/gnome-utils.desc
similarity index 100%
rename from package/gnome24/gnome-utils/gnome-utils.desc
rename to package/gnome2/gnome-utils/gnome-utils.desc
diff --git a/package/gnome24/gnome-vfs-extras/gnome-vfs-extras.cache b/package/gnome2/gnome-vfs-extras/gnome-vfs-extras.cache
similarity index 100%
rename from package/gnome24/gnome-vfs-extras/gnome-vfs-extras.cache
rename to package/gnome2/gnome-vfs-extras/gnome-vfs-extras.cache
diff --git a/package/gnome24/gnome-vfs-extras/gnome-vfs-extras.conf b/package/gnome2/gnome-vfs-extras/gnome-vfs-extras.conf
similarity index 100%
rename from package/gnome24/gnome-vfs-extras/gnome-vfs-extras.conf
rename to package/gnome2/gnome-vfs-extras/gnome-vfs-extras.conf
diff --git a/package/gnome24/gnome-vfs-extras/gnome-vfs-extras.desc b/package/gnome2/gnome-vfs-extras/gnome-vfs-extras.desc
similarity index 100%
rename from package/gnome24/gnome-vfs-extras/gnome-vfs-extras.desc
rename to package/gnome2/gnome-vfs-extras/gnome-vfs-extras.desc
diff --git a/package/gnome24/gnome-vfs-sftp/gnome-vfs-sftp.cache b/package/gnome2/gnome-vfs-sftp/gnome-vfs-sftp.cache
similarity index 100%
rename from package/gnome24/gnome-vfs-sftp/gnome-vfs-sftp.cache
rename to package/gnome2/gnome-vfs-sftp/gnome-vfs-sftp.cache
diff --git a/package/gnome24/gnome-vfs-sftp/gnome-vfs-sftp.conf b/package/gnome2/gnome-vfs-sftp/gnome-vfs-sftp.conf
similarity index 100%
rename from package/gnome24/gnome-vfs-sftp/gnome-vfs-sftp.conf
rename to package/gnome2/gnome-vfs-sftp/gnome-vfs-sftp.conf
diff --git a/package/gnome24/gnome-vfs-sftp/gnome-vfs-sftp.desc b/package/gnome2/gnome-vfs-sftp/gnome-vfs-sftp.desc
similarity index 100%
rename from package/gnome24/gnome-vfs-sftp/gnome-vfs-sftp.desc
rename to package/gnome2/gnome-vfs-sftp/gnome-vfs-sftp.desc
diff --git a/package/gnome24/gnome-vfs/gnome-vfs.cache b/package/gnome2/gnome-vfs/gnome-vfs.cache
similarity index 100%
rename from package/gnome24/gnome-vfs/gnome-vfs.cache
rename to package/gnome2/gnome-vfs/gnome-vfs.cache
diff --git a/package/gnome24/gnome-vfs/gnome-vfs.conf b/package/gnome2/gnome-vfs/gnome-vfs.conf
similarity index 100%
rename from package/gnome24/gnome-vfs/gnome-vfs.conf
rename to package/gnome2/gnome-vfs/gnome-vfs.conf
diff --git a/package/gnome24/gnome-vfs/gnome-vfs.desc b/package/gnome2/gnome-vfs/gnome-vfs.desc
similarity index 100%
rename from package/gnome24/gnome-vfs/gnome-vfs.desc
rename to package/gnome2/gnome-vfs/gnome-vfs.desc
diff --git a/package/gnome24/gnome-vfsmm/gnome-vfsmm.cache b/package/gnome2/gnome-vfsmm/gnome-vfsmm.cache
similarity index 100%
rename from package/gnome24/gnome-vfsmm/gnome-vfsmm.cache
rename to package/gnome2/gnome-vfsmm/gnome-vfsmm.cache
diff --git a/package/gnome24/gnome-vfsmm/gnome-vfsmm.conf b/package/gnome2/gnome-vfsmm/gnome-vfsmm.conf
similarity index 100%
rename from package/gnome24/gnome-vfsmm/gnome-vfsmm.conf
rename to package/gnome2/gnome-vfsmm/gnome-vfsmm.conf
diff --git a/package/gnome24/gnome-vfsmm/gnome-vfsmm.desc b/package/gnome2/gnome-vfsmm/gnome-vfsmm.desc
similarity index 100%
rename from package/gnome24/gnome-vfsmm/gnome-vfsmm.desc
rename to package/gnome2/gnome-vfsmm/gnome-vfsmm.desc
diff --git a/package/gnome24/gnome2-user-docs/gnome2-user-docs.cache b/package/gnome2/gnome2-user-docs/gnome2-user-docs.cache
similarity index 100%
rename from package/gnome24/gnome2-user-docs/gnome2-user-docs.cache
rename to package/gnome2/gnome2-user-docs/gnome2-user-docs.cache
diff --git a/package/gnome24/gnome2-user-docs/gnome2-user-docs.conf b/package/gnome2/gnome2-user-docs/gnome2-user-docs.conf
similarity index 100%
rename from package/gnome24/gnome2-user-docs/gnome2-user-docs.conf
rename to package/gnome2/gnome2-user-docs/gnome2-user-docs.conf
diff --git a/package/gnome24/gnome2-user-docs/gnome2-user-docs.desc b/package/gnome2/gnome2-user-docs/gnome2-user-docs.desc
similarity index 100%
rename from package/gnome24/gnome2-user-docs/gnome2-user-docs.desc
rename to package/gnome2/gnome2-user-docs/gnome2-user-docs.desc
diff --git a/package/gnome24/gnomeicu/gnomeicu.cache b/package/gnome2/gnomeicu/gnomeicu.cache
similarity index 100%
rename from package/gnome24/gnomeicu/gnomeicu.cache
rename to package/gnome2/gnomeicu/gnomeicu.cache
diff --git a/package/gnome24/gnomeicu/gnomeicu.conf b/package/gnome2/gnomeicu/gnomeicu.conf
similarity index 100%
rename from package/gnome24/gnomeicu/gnomeicu.conf
rename to package/gnome2/gnomeicu/gnomeicu.conf
diff --git a/package/gnome24/gnomeicu/gnomeicu.desc b/package/gnome2/gnomeicu/gnomeicu.desc
similarity index 100%
rename from package/gnome24/gnomeicu/gnomeicu.desc
rename to package/gnome2/gnomeicu/gnomeicu.desc
diff --git a/package/gnome24/gnomemeeting/gnomemeeting.cache b/package/gnome2/gnomemeeting/gnomemeeting.cache
similarity index 100%
rename from package/gnome24/gnomemeeting/gnomemeeting.cache
rename to package/gnome2/gnomemeeting/gnomemeeting.cache
diff --git a/package/gnome24/gnomemeeting/gnomemeeting.conf b/package/gnome2/gnomemeeting/gnomemeeting.conf
similarity index 100%
rename from package/gnome24/gnomemeeting/gnomemeeting.conf
rename to package/gnome2/gnomemeeting/gnomemeeting.conf
diff --git a/package/gnome24/gnomemeeting/gnomemeeting.desc b/package/gnome2/gnomemeeting/gnomemeeting.desc
similarity index 100%
rename from package/gnome24/gnomemeeting/gnomemeeting.desc
rename to package/gnome2/gnomemeeting/gnomemeeting.desc
diff --git a/package/gnome24/gnopernicus/gnopernicus.cache b/package/gnome2/gnopernicus/gnopernicus.cache
similarity index 100%
rename from package/gnome24/gnopernicus/gnopernicus.cache
rename to package/gnome2/gnopernicus/gnopernicus.cache
diff --git a/package/gnome24/gnopernicus/gnopernicus.conf b/package/gnome2/gnopernicus/gnopernicus.conf
similarity index 100%
rename from package/gnome24/gnopernicus/gnopernicus.conf
rename to package/gnome2/gnopernicus/gnopernicus.conf
diff --git a/package/gnome24/gnopernicus/gnopernicus.desc b/package/gnome2/gnopernicus/gnopernicus.desc
similarity index 100%
rename from package/gnome24/gnopernicus/gnopernicus.desc
rename to package/gnome2/gnopernicus/gnopernicus.desc
diff --git a/package/gnome24/gnotepad+/gnotepad+.cache b/package/gnome2/gnotepad+/gnotepad+.cache
similarity index 100%
rename from package/gnome24/gnotepad+/gnotepad+.cache
rename to package/gnome2/gnotepad+/gnotepad+.cache
diff --git a/package/gnome24/gnotepad+/gnotepad+.conf b/package/gnome2/gnotepad+/gnotepad+.conf
similarity index 100%
rename from package/gnome24/gnotepad+/gnotepad+.conf
rename to package/gnome2/gnotepad+/gnotepad+.conf
diff --git a/package/gnome24/gnotepad+/gnotepad+.desc b/package/gnome2/gnotepad+/gnotepad+.desc
similarity index 100%
rename from package/gnome24/gnotepad+/gnotepad+.desc
rename to package/gnome2/gnotepad+/gnotepad+.desc
diff --git a/package/gnome24/gnumeric/gnumeric.cache b/package/gnome2/gnumeric/gnumeric.cache
similarity index 100%
rename from package/gnome24/gnumeric/gnumeric.cache
rename to package/gnome2/gnumeric/gnumeric.cache
diff --git a/package/gnome24/gnumeric/gnumeric.conf b/package/gnome2/gnumeric/gnumeric.conf
similarity index 100%
rename from package/gnome24/gnumeric/gnumeric.conf
rename to package/gnome2/gnumeric/gnumeric.conf
diff --git a/package/gnome24/gnumeric/gnumeric.desc b/package/gnome2/gnumeric/gnumeric.desc
similarity index 100%
rename from package/gnome24/gnumeric/gnumeric.desc
rename to package/gnome2/gnumeric/gnumeric.desc
diff --git a/package/gnome24/gob/gob.cache b/package/gnome2/gob/gob.cache
similarity index 100%
rename from package/gnome24/gob/gob.cache
rename to package/gnome2/gob/gob.cache
diff --git a/package/gnome24/gob/gob.conf b/package/gnome2/gob/gob.conf
similarity index 100%
rename from package/gnome24/gob/gob.conf
rename to package/gnome2/gob/gob.conf
diff --git a/package/gnome24/gob/gob.desc b/package/gnome2/gob/gob.desc
similarity index 100%
rename from package/gnome24/gob/gob.desc
rename to package/gnome2/gob/gob.desc
diff --git a/package/gnome24/gok/gok.cache b/package/gnome2/gok/gok.cache
similarity index 100%
rename from package/gnome24/gok/gok.cache
rename to package/gnome2/gok/gok.cache
diff --git a/package/gnome24/gok/gok.conf b/package/gnome2/gok/gok.conf
similarity index 100%
rename from package/gnome24/gok/gok.conf
rename to package/gnome2/gok/gok.conf
diff --git a/package/gnome24/gok/gok.desc b/package/gnome2/gok/gok.desc
similarity index 100%
rename from package/gnome24/gok/gok.desc
rename to package/gnome2/gok/gok.desc
diff --git a/package/gnome24/gossip/gossip.cache b/package/gnome2/gossip/gossip.cache
similarity index 100%
rename from package/gnome24/gossip/gossip.cache
rename to package/gnome2/gossip/gossip.cache
diff --git a/package/gnome24/gossip/gossip.conf b/package/gnome2/gossip/gossip.conf
similarity index 100%
rename from package/gnome24/gossip/gossip.conf
rename to package/gnome2/gossip/gossip.conf
diff --git a/package/gnome24/gossip/gossip.desc b/package/gnome2/gossip/gossip.desc
similarity index 100%
rename from package/gnome24/gossip/gossip.desc
rename to package/gnome2/gossip/gossip.desc
diff --git a/package/gnome24/gpdf/gpdf.cache b/package/gnome2/gpdf/gpdf.cache
similarity index 100%
rename from package/gnome24/gpdf/gpdf.cache
rename to package/gnome2/gpdf/gpdf.cache
diff --git a/package/gnome24/gpdf/gpdf.conf b/package/gnome2/gpdf/gpdf.conf
similarity index 100%
rename from package/gnome24/gpdf/gpdf.conf
rename to package/gnome2/gpdf/gpdf.conf
diff --git a/package/gnome24/gpdf/gpdf.desc b/package/gnome2/gpdf/gpdf.desc
similarity index 100%
rename from package/gnome24/gpdf/gpdf.desc
rename to package/gnome2/gpdf/gpdf.desc
diff --git a/package/gnome24/grandr_applet/grandr_applet.cache b/package/gnome2/grandr_applet/grandr_applet.cache
similarity index 100%
rename from package/gnome24/grandr_applet/grandr_applet.cache
rename to package/gnome2/grandr_applet/grandr_applet.cache
diff --git a/package/gnome24/grandr_applet/grandr_applet.conf b/package/gnome2/grandr_applet/grandr_applet.conf
similarity index 100%
rename from package/gnome24/grandr_applet/grandr_applet.conf
rename to package/gnome2/grandr_applet/grandr_applet.conf
diff --git a/package/gnome24/grandr_applet/grandr_applet.desc b/package/gnome2/grandr_applet/grandr_applet.desc
similarity index 100%
rename from package/gnome24/grandr_applet/grandr_applet.desc
rename to package/gnome2/grandr_applet/grandr_applet.desc
diff --git a/package/gnome24/gst-editor/gst-editor.cache b/package/gnome2/gst-editor/gst-editor.cache
similarity index 100%
rename from package/gnome24/gst-editor/gst-editor.cache
rename to package/gnome2/gst-editor/gst-editor.cache
diff --git a/package/gnome24/gst-editor/gst-editor.conf b/package/gnome2/gst-editor/gst-editor.conf
similarity index 100%
rename from package/gnome24/gst-editor/gst-editor.conf
rename to package/gnome2/gst-editor/gst-editor.conf
diff --git a/package/gnome24/gst-editor/gst-editor.desc b/package/gnome2/gst-editor/gst-editor.desc
similarity index 100%
rename from package/gnome24/gst-editor/gst-editor.desc
rename to package/gnome2/gst-editor/gst-editor.desc
diff --git a/package/gnome24/gst-plugins/gst-plugins.cache b/package/gnome2/gst-plugins/gst-plugins.cache
similarity index 100%
rename from package/gnome24/gst-plugins/gst-plugins.cache
rename to package/gnome2/gst-plugins/gst-plugins.cache
diff --git a/package/gnome24/gst-plugins/gst-plugins.conf b/package/gnome2/gst-plugins/gst-plugins.conf
similarity index 100%
rename from package/gnome24/gst-plugins/gst-plugins.conf
rename to package/gnome2/gst-plugins/gst-plugins.conf
diff --git a/package/gnome24/gst-plugins/gst-plugins.desc b/package/gnome2/gst-plugins/gst-plugins.desc
similarity index 100%
rename from package/gnome24/gst-plugins/gst-plugins.desc
rename to package/gnome2/gst-plugins/gst-plugins.desc
diff --git a/package/gnome24/gstreamer/gstreamer-pkg.conf b/package/gnome2/gstreamer/gstreamer-pkg.conf
similarity index 100%
rename from package/gnome24/gstreamer/gstreamer-pkg.conf
rename to package/gnome2/gstreamer/gstreamer-pkg.conf
diff --git a/package/gnome24/gstreamer/gstreamer.cache b/package/gnome2/gstreamer/gstreamer.cache
similarity index 100%
rename from package/gnome24/gstreamer/gstreamer.cache
rename to package/gnome2/gstreamer/gstreamer.cache
diff --git a/package/gnome24/gstreamer/gstreamer.conf b/package/gnome2/gstreamer/gstreamer.conf
similarity index 100%
rename from package/gnome24/gstreamer/gstreamer.conf
rename to package/gnome2/gstreamer/gstreamer.conf
diff --git a/package/gnome24/gstreamer/gstreamer.cron b/package/gnome2/gstreamer/gstreamer.cron
similarity index 100%
rename from package/gnome24/gstreamer/gstreamer.cron
rename to package/gnome2/gstreamer/gstreamer.cron
diff --git a/package/gnome24/gstreamer/gstreamer.desc b/package/gnome2/gstreamer/gstreamer.desc
similarity index 100%
rename from package/gnome24/gstreamer/gstreamer.desc
rename to package/gnome2/gstreamer/gstreamer.desc
diff --git a/package/gnome24/gswitchit/gswitchit.cache b/package/gnome2/gswitchit/gswitchit.cache
similarity index 100%
rename from package/gnome24/gswitchit/gswitchit.cache
rename to package/gnome2/gswitchit/gswitchit.cache
diff --git a/package/gnome24/gswitchit/gswitchit.conf b/package/gnome2/gswitchit/gswitchit.conf
similarity index 100%
rename from package/gnome24/gswitchit/gswitchit.conf
rename to package/gnome2/gswitchit/gswitchit.conf
diff --git a/package/gnome24/gswitchit/gswitchit.desc b/package/gnome2/gswitchit/gswitchit.desc
similarity index 100%
rename from package/gnome24/gswitchit/gswitchit.desc
rename to package/gnome2/gswitchit/gswitchit.desc
diff --git a/package/gnome24/gthumb/gthumb.cache b/package/gnome2/gthumb/gthumb.cache
similarity index 100%
rename from package/gnome24/gthumb/gthumb.cache
rename to package/gnome2/gthumb/gthumb.cache
diff --git a/package/gnome24/gthumb/gthumb.conf b/package/gnome2/gthumb/gthumb.conf
similarity index 100%
rename from package/gnome24/gthumb/gthumb.conf
rename to package/gnome2/gthumb/gthumb.conf
diff --git a/package/gnome24/gthumb/gthumb.desc b/package/gnome2/gthumb/gthumb.desc
similarity index 100%
rename from package/gnome24/gthumb/gthumb.desc
rename to package/gnome2/gthumb/gthumb.desc
diff --git a/package/gnome24/gtk+/fontsel-fix.patch b/package/gnome2/gtk+/fontsel-fix.patch
similarity index 100%
rename from package/gnome24/gtk+/fontsel-fix.patch
rename to package/gnome2/gtk+/fontsel-fix.patch
diff --git a/package/gnome24/gtk+/gdkpixbuf.cron b/package/gnome2/gtk+/gdkpixbuf.cron
similarity index 100%
rename from package/gnome24/gtk+/gdkpixbuf.cron
rename to package/gnome2/gtk+/gdkpixbuf.cron
diff --git a/package/gnome24/gtk+/gtk+-pkg.conf b/package/gnome2/gtk+/gtk+-pkg.conf
similarity index 100%
rename from package/gnome24/gtk+/gtk+-pkg.conf
rename to package/gnome2/gtk+/gtk+-pkg.conf
diff --git a/package/gnome24/gtk+/gtk+.cache b/package/gnome2/gtk+/gtk+.cache
similarity index 100%
rename from package/gnome24/gtk+/gtk+.cache
rename to package/gnome2/gtk+/gtk+.cache
diff --git a/package/gnome24/gtk+/gtk+.conf b/package/gnome2/gtk+/gtk+.conf
similarity index 100%
rename from package/gnome24/gtk+/gtk+.conf
rename to package/gnome2/gtk+/gtk+.conf
diff --git a/package/gnome24/gtk+/gtk+.desc b/package/gnome2/gtk+/gtk+.desc
similarity index 100%
rename from package/gnome24/gtk+/gtk+.desc
rename to package/gnome2/gtk+/gtk+.desc
diff --git a/package/gnome24/gtk-engines/gtk-engines.cache b/package/gnome2/gtk-engines/gtk-engines.cache
similarity index 100%
rename from package/gnome24/gtk-engines/gtk-engines.cache
rename to package/gnome2/gtk-engines/gtk-engines.cache
diff --git a/package/gnome24/gtk-engines/gtk-engines.conf b/package/gnome2/gtk-engines/gtk-engines.conf
similarity index 100%
rename from package/gnome24/gtk-engines/gtk-engines.conf
rename to package/gnome2/gtk-engines/gtk-engines.conf
diff --git a/package/gnome24/gtk-engines/gtk-engines.desc b/package/gnome2/gtk-engines/gtk-engines.desc
similarity index 100%
rename from package/gnome24/gtk-engines/gtk-engines.desc
rename to package/gnome2/gtk-engines/gtk-engines.desc
diff --git a/package/gnome24/gtkdoc/gtkdoc.cache b/package/gnome2/gtkdoc/gtkdoc.cache
similarity index 100%
rename from package/gnome24/gtkdoc/gtkdoc.cache
rename to package/gnome2/gtkdoc/gtkdoc.cache
diff --git a/package/gnome24/gtkdoc/gtkdoc.conf b/package/gnome2/gtkdoc/gtkdoc.conf
similarity index 100%
rename from package/gnome24/gtkdoc/gtkdoc.conf
rename to package/gnome2/gtkdoc/gtkdoc.conf
diff --git a/package/gnome24/gtkdoc/gtkdoc.desc b/package/gnome2/gtkdoc/gtkdoc.desc
similarity index 100%
rename from package/gnome24/gtkdoc/gtkdoc.desc
rename to package/gnome2/gtkdoc/gtkdoc.desc
diff --git a/package/gnome24/gtkextra/fix_autogen.patch b/package/gnome2/gtkextra/fix_autogen.patch
similarity index 100%
rename from package/gnome24/gtkextra/fix_autogen.patch
rename to package/gnome2/gtkextra/fix_autogen.patch
diff --git a/package/gnome24/gtkextra/fix_configure_in.patch b/package/gnome2/gtkextra/fix_configure_in.patch
similarity index 100%
rename from package/gnome24/gtkextra/fix_configure_in.patch
rename to package/gnome2/gtkextra/fix_configure_in.patch
diff --git a/package/gnome24/gtkextra/gtkextra.cache b/package/gnome2/gtkextra/gtkextra.cache
similarity index 100%
rename from package/gnome24/gtkextra/gtkextra.cache
rename to package/gnome2/gtkextra/gtkextra.cache
diff --git a/package/gnome24/gtkextra/gtkextra.conf b/package/gnome2/gtkextra/gtkextra.conf
similarity index 100%
rename from package/gnome24/gtkextra/gtkextra.conf
rename to package/gnome2/gtkextra/gtkextra.conf
diff --git a/package/gnome24/gtkextra/gtkextra.desc b/package/gnome2/gtkextra/gtkextra.desc
similarity index 100%
rename from package/gnome24/gtkextra/gtkextra.desc
rename to package/gnome2/gtkextra/gtkextra.desc
diff --git a/package/gnome24/gtkextra/gtkpsfont-hotfix.patch b/package/gnome2/gtkextra/gtkpsfont-hotfix.patch
similarity index 100%
rename from package/gnome24/gtkextra/gtkpsfont-hotfix.patch
rename to package/gnome2/gtkextra/gtkpsfont-hotfix.patch
diff --git a/package/gnome24/gtkhtml/gtkhtml.cache b/package/gnome2/gtkhtml/gtkhtml.cache
similarity index 100%
rename from package/gnome24/gtkhtml/gtkhtml.cache
rename to package/gnome2/gtkhtml/gtkhtml.cache
diff --git a/package/gnome24/gtkhtml/gtkhtml.conf b/package/gnome2/gtkhtml/gtkhtml.conf
similarity index 100%
rename from package/gnome24/gtkhtml/gtkhtml.conf
rename to package/gnome2/gtkhtml/gtkhtml.conf
diff --git a/package/gnome24/gtkhtml/gtkhtml.desc b/package/gnome2/gtkhtml/gtkhtml.desc
similarity index 100%
rename from package/gnome24/gtkhtml/gtkhtml.desc
rename to package/gnome2/gtkhtml/gtkhtml.desc
diff --git a/package/gnome24/gtkmm/gtkmm.cache b/package/gnome2/gtkmm/gtkmm.cache
similarity index 100%
rename from package/gnome24/gtkmm/gtkmm.cache
rename to package/gnome2/gtkmm/gtkmm.cache
diff --git a/package/gnome24/gtkmm/gtkmm.conf b/package/gnome2/gtkmm/gtkmm.conf
similarity index 100%
rename from package/gnome24/gtkmm/gtkmm.conf
rename to package/gnome2/gtkmm/gtkmm.conf
diff --git a/package/gnome24/gtkmm/gtkmm.desc b/package/gnome2/gtkmm/gtkmm.desc
similarity index 100%
rename from package/gnome24/gtkmm/gtkmm.desc
rename to package/gnome2/gtkmm/gtkmm.desc
diff --git a/package/gnome24/gtksourceview/gtksourceview.cache b/package/gnome2/gtksourceview/gtksourceview.cache
similarity index 100%
rename from package/gnome24/gtksourceview/gtksourceview.cache
rename to package/gnome2/gtksourceview/gtksourceview.cache
diff --git a/package/gnome24/gtksourceview/gtksourceview.conf b/package/gnome2/gtksourceview/gtksourceview.conf
similarity index 100%
rename from package/gnome24/gtksourceview/gtksourceview.conf
rename to package/gnome2/gtksourceview/gtksourceview.conf
diff --git a/package/gnome24/gtksourceview/gtksourceview.desc b/package/gnome2/gtksourceview/gtksourceview.desc
similarity index 100%
rename from package/gnome24/gtksourceview/gtksourceview.desc
rename to package/gnome2/gtksourceview/gtksourceview.desc
diff --git a/package/gnome24/gucharmap/gucharmap.cache b/package/gnome2/gucharmap/gucharmap.cache
similarity index 100%
rename from package/gnome24/gucharmap/gucharmap.cache
rename to package/gnome2/gucharmap/gucharmap.cache
diff --git a/package/gnome24/gucharmap/gucharmap.conf b/package/gnome2/gucharmap/gucharmap.conf
similarity index 100%
rename from package/gnome24/gucharmap/gucharmap.conf
rename to package/gnome2/gucharmap/gucharmap.conf
diff --git a/package/gnome24/gucharmap/gucharmap.desc b/package/gnome2/gucharmap/gucharmap.desc
similarity index 100%
rename from package/gnome24/gucharmap/gucharmap.desc
rename to package/gnome2/gucharmap/gucharmap.desc
diff --git a/package/gnome24/gworldclock/gworldclock.cache b/package/gnome2/gworldclock/gworldclock.cache
similarity index 100%
rename from package/gnome24/gworldclock/gworldclock.cache
rename to package/gnome2/gworldclock/gworldclock.cache
diff --git a/package/gnome24/gworldclock/gworldclock.conf b/package/gnome2/gworldclock/gworldclock.conf
similarity index 100%
rename from package/gnome24/gworldclock/gworldclock.conf
rename to package/gnome2/gworldclock/gworldclock.conf
diff --git a/package/gnome24/gworldclock/gworldclock.desc b/package/gnome2/gworldclock/gworldclock.desc
similarity index 100%
rename from package/gnome24/gworldclock/gworldclock.desc
rename to package/gnome2/gworldclock/gworldclock.desc
diff --git a/package/gnome24/hicolor-icon-theme/hicolor-icon-theme.desc b/package/gnome2/hicolor-icon-theme/hicolor-icon-theme.desc
similarity index 100%
rename from package/gnome24/hicolor-icon-theme/hicolor-icon-theme.desc
rename to package/gnome2/hicolor-icon-theme/hicolor-icon-theme.desc
diff --git a/package/gnome24/hotapplet/hotapplet.cache b/package/gnome2/hotapplet/hotapplet.cache
similarity index 100%
rename from package/gnome24/hotapplet/hotapplet.cache
rename to package/gnome2/hotapplet/hotapplet.cache
diff --git a/package/gnome24/hotapplet/hotapplet.conf b/package/gnome2/hotapplet/hotapplet.conf
similarity index 100%
rename from package/gnome24/hotapplet/hotapplet.conf
rename to package/gnome2/hotapplet/hotapplet.conf
diff --git a/package/gnome24/hotapplet/hotapplet.desc b/package/gnome2/hotapplet/hotapplet.desc
similarity index 100%
rename from package/gnome24/hotapplet/hotapplet.desc
rename to package/gnome2/hotapplet/hotapplet.desc
diff --git a/package/gnome24/libbonobo/libbonobo.cache b/package/gnome2/libbonobo/libbonobo.cache
similarity index 100%
rename from package/gnome24/libbonobo/libbonobo.cache
rename to package/gnome2/libbonobo/libbonobo.cache
diff --git a/package/gnome24/libbonobo/libbonobo.conf b/package/gnome2/libbonobo/libbonobo.conf
similarity index 100%
rename from package/gnome24/libbonobo/libbonobo.conf
rename to package/gnome2/libbonobo/libbonobo.conf
diff --git a/package/gnome24/libbonobo/libbonobo.desc b/package/gnome2/libbonobo/libbonobo.desc
similarity index 100%
rename from package/gnome24/libbonobo/libbonobo.desc
rename to package/gnome2/libbonobo/libbonobo.desc
diff --git a/package/gnome24/libbonobomm/libbonobomm.cache b/package/gnome2/libbonobomm/libbonobomm.cache
similarity index 100%
rename from package/gnome24/libbonobomm/libbonobomm.cache
rename to package/gnome2/libbonobomm/libbonobomm.cache
diff --git a/package/gnome24/libbonobomm/libbonobomm.conf b/package/gnome2/libbonobomm/libbonobomm.conf
similarity index 100%
rename from package/gnome24/libbonobomm/libbonobomm.conf
rename to package/gnome2/libbonobomm/libbonobomm.conf
diff --git a/package/gnome24/libbonobomm/libbonobomm.desc b/package/gnome2/libbonobomm/libbonobomm.desc
similarity index 100%
rename from package/gnome24/libbonobomm/libbonobomm.desc
rename to package/gnome2/libbonobomm/libbonobomm.desc
diff --git a/package/gnome24/libbonoboui/libbonoboui.cache b/package/gnome2/libbonoboui/libbonoboui.cache
similarity index 100%
rename from package/gnome24/libbonoboui/libbonoboui.cache
rename to package/gnome2/libbonoboui/libbonoboui.cache
diff --git a/package/gnome24/libbonoboui/libbonoboui.conf b/package/gnome2/libbonoboui/libbonoboui.conf
similarity index 100%
rename from package/gnome24/libbonoboui/libbonoboui.conf
rename to package/gnome2/libbonoboui/libbonoboui.conf
diff --git a/package/gnome24/libbonoboui/libbonoboui.desc b/package/gnome2/libbonoboui/libbonoboui.desc
similarity index 100%
rename from package/gnome24/libbonoboui/libbonoboui.desc
rename to package/gnome2/libbonoboui/libbonoboui.desc
diff --git a/package/gnome24/libbonobouimm/libbonobouimm.cache b/package/gnome2/libbonobouimm/libbonobouimm.cache
similarity index 100%
rename from package/gnome24/libbonobouimm/libbonobouimm.cache
rename to package/gnome2/libbonobouimm/libbonobouimm.cache
diff --git a/package/gnome24/libbonobouimm/libbonobouimm.conf b/package/gnome2/libbonobouimm/libbonobouimm.conf
similarity index 100%
rename from package/gnome24/libbonobouimm/libbonobouimm.conf
rename to package/gnome2/libbonobouimm/libbonobouimm.conf
diff --git a/package/gnome24/libbonobouimm/libbonobouimm.desc b/package/gnome2/libbonobouimm/libbonobouimm.desc
similarity index 100%
rename from package/gnome24/libbonobouimm/libbonobouimm.desc
rename to package/gnome2/libbonobouimm/libbonobouimm.desc
diff --git a/package/gnome24/libcroco/libcroco.cache b/package/gnome2/libcroco/libcroco.cache
similarity index 100%
rename from package/gnome24/libcroco/libcroco.cache
rename to package/gnome2/libcroco/libcroco.cache
diff --git a/package/gnome24/libcroco/libcroco.conf b/package/gnome2/libcroco/libcroco.conf
similarity index 100%
rename from package/gnome24/libcroco/libcroco.conf
rename to package/gnome2/libcroco/libcroco.conf
diff --git a/package/gnome24/libcroco/libcroco.desc b/package/gnome2/libcroco/libcroco.desc
similarity index 100%
rename from package/gnome24/libcroco/libcroco.desc
rename to package/gnome2/libcroco/libcroco.desc
diff --git a/package/gnome24/libesmtp/libesmtp.cache b/package/gnome2/libesmtp/libesmtp.cache
similarity index 100%
rename from package/gnome24/libesmtp/libesmtp.cache
rename to package/gnome2/libesmtp/libesmtp.cache
diff --git a/package/gnome24/libesmtp/libesmtp.conf b/package/gnome2/libesmtp/libesmtp.conf
similarity index 100%
rename from package/gnome24/libesmtp/libesmtp.conf
rename to package/gnome2/libesmtp/libesmtp.conf
diff --git a/package/gnome24/libesmtp/libesmtp.desc b/package/gnome2/libesmtp/libesmtp.desc
similarity index 100%
rename from package/gnome24/libesmtp/libesmtp.desc
rename to package/gnome2/libesmtp/libesmtp.desc
diff --git a/package/gnome24/libgail-gnome/libgail-gnome.cache b/package/gnome2/libgail-gnome/libgail-gnome.cache
similarity index 100%
rename from package/gnome24/libgail-gnome/libgail-gnome.cache
rename to package/gnome2/libgail-gnome/libgail-gnome.cache
diff --git a/package/gnome24/libgail-gnome/libgail-gnome.conf b/package/gnome2/libgail-gnome/libgail-gnome.conf
similarity index 100%
rename from package/gnome24/libgail-gnome/libgail-gnome.conf
rename to package/gnome2/libgail-gnome/libgail-gnome.conf
diff --git a/package/gnome24/libgail-gnome/libgail-gnome.desc b/package/gnome2/libgail-gnome/libgail-gnome.desc
similarity index 100%
rename from package/gnome24/libgail-gnome/libgail-gnome.desc
rename to package/gnome2/libgail-gnome/libgail-gnome.desc
diff --git a/package/gnome24/libgda/libgda.cache b/package/gnome2/libgda/libgda.cache
similarity index 100%
rename from package/gnome24/libgda/libgda.cache
rename to package/gnome2/libgda/libgda.cache
diff --git a/package/gnome24/libgda/libgda.conf b/package/gnome2/libgda/libgda.conf
similarity index 100%
rename from package/gnome24/libgda/libgda.conf
rename to package/gnome2/libgda/libgda.conf
diff --git a/package/gnome24/libgda/libgda.desc b/package/gnome2/libgda/libgda.desc
similarity index 100%
rename from package/gnome24/libgda/libgda.desc
rename to package/gnome2/libgda/libgda.desc
diff --git a/package/gnome24/libglade/libglade.cache b/package/gnome2/libglade/libglade.cache
similarity index 100%
rename from package/gnome24/libglade/libglade.cache
rename to package/gnome2/libglade/libglade.cache
diff --git a/package/gnome24/libglade/libglade.conf b/package/gnome2/libglade/libglade.conf
similarity index 100%
rename from package/gnome24/libglade/libglade.conf
rename to package/gnome2/libglade/libglade.conf
diff --git a/package/gnome24/libglade/libglade.desc b/package/gnome2/libglade/libglade.desc
similarity index 100%
rename from package/gnome24/libglade/libglade.desc
rename to package/gnome2/libglade/libglade.desc
diff --git a/package/gnome24/libglademm/libglademm.cache b/package/gnome2/libglademm/libglademm.cache
similarity index 100%
rename from package/gnome24/libglademm/libglademm.cache
rename to package/gnome2/libglademm/libglademm.cache
diff --git a/package/gnome24/libglademm/libglademm.conf b/package/gnome2/libglademm/libglademm.conf
similarity index 100%
rename from package/gnome24/libglademm/libglademm.conf
rename to package/gnome2/libglademm/libglademm.conf
diff --git a/package/gnome24/libglademm/libglademm.desc b/package/gnome2/libglademm/libglademm.desc
similarity index 100%
rename from package/gnome24/libglademm/libglademm.desc
rename to package/gnome2/libglademm/libglademm.desc
diff --git a/package/gnome24/libgnome/libgnome.cache b/package/gnome2/libgnome/libgnome.cache
similarity index 100%
rename from package/gnome24/libgnome/libgnome.cache
rename to package/gnome2/libgnome/libgnome.cache
diff --git a/package/gnome24/libgnome/libgnome.conf b/package/gnome2/libgnome/libgnome.conf
similarity index 100%
rename from package/gnome24/libgnome/libgnome.conf
rename to package/gnome2/libgnome/libgnome.conf
diff --git a/package/gnome24/libgnome/libgnome.desc b/package/gnome2/libgnome/libgnome.desc
similarity index 100%
rename from package/gnome24/libgnome/libgnome.desc
rename to package/gnome2/libgnome/libgnome.desc
diff --git a/package/gnome24/libgnomecanvas/libgnomecanvas.cache b/package/gnome2/libgnomecanvas/libgnomecanvas.cache
similarity index 100%
rename from package/gnome24/libgnomecanvas/libgnomecanvas.cache
rename to package/gnome2/libgnomecanvas/libgnomecanvas.cache
diff --git a/package/gnome24/libgnomecanvas/libgnomecanvas.conf b/package/gnome2/libgnomecanvas/libgnomecanvas.conf
similarity index 100%
rename from package/gnome24/libgnomecanvas/libgnomecanvas.conf
rename to package/gnome2/libgnomecanvas/libgnomecanvas.conf
diff --git a/package/gnome24/libgnomecanvas/libgnomecanvas.desc b/package/gnome2/libgnomecanvas/libgnomecanvas.desc
similarity index 100%
rename from package/gnome24/libgnomecanvas/libgnomecanvas.desc
rename to package/gnome2/libgnomecanvas/libgnomecanvas.desc
diff --git a/package/gnome24/libgnomecanvasmm/libgnomecanvasmm.cache b/package/gnome2/libgnomecanvasmm/libgnomecanvasmm.cache
similarity index 100%
rename from package/gnome24/libgnomecanvasmm/libgnomecanvasmm.cache
rename to package/gnome2/libgnomecanvasmm/libgnomecanvasmm.cache
diff --git a/package/gnome24/libgnomecanvasmm/libgnomecanvasmm.conf b/package/gnome2/libgnomecanvasmm/libgnomecanvasmm.conf
similarity index 100%
rename from package/gnome24/libgnomecanvasmm/libgnomecanvasmm.conf
rename to package/gnome2/libgnomecanvasmm/libgnomecanvasmm.conf
diff --git a/package/gnome24/libgnomecanvasmm/libgnomecanvasmm.desc b/package/gnome2/libgnomecanvasmm/libgnomecanvasmm.desc
similarity index 100%
rename from package/gnome24/libgnomecanvasmm/libgnomecanvasmm.desc
rename to package/gnome2/libgnomecanvasmm/libgnomecanvasmm.desc
diff --git a/package/gnome24/libgnomecups/libgnomecups.cache b/package/gnome2/libgnomecups/libgnomecups.cache
similarity index 100%
rename from package/gnome24/libgnomecups/libgnomecups.cache
rename to package/gnome2/libgnomecups/libgnomecups.cache
diff --git a/package/gnome24/libgnomecups/libgnomecups.conf b/package/gnome2/libgnomecups/libgnomecups.conf
similarity index 100%
rename from package/gnome24/libgnomecups/libgnomecups.conf
rename to package/gnome2/libgnomecups/libgnomecups.conf
diff --git a/package/gnome24/libgnomecups/libgnomecups.desc b/package/gnome2/libgnomecups/libgnomecups.desc
similarity index 100%
rename from package/gnome24/libgnomecups/libgnomecups.desc
rename to package/gnome2/libgnomecups/libgnomecups.desc
diff --git a/package/gnome24/libgnomedb/libgnomedb.cache b/package/gnome2/libgnomedb/libgnomedb.cache
similarity index 100%
rename from package/gnome24/libgnomedb/libgnomedb.cache
rename to package/gnome2/libgnomedb/libgnomedb.cache
diff --git a/package/gnome24/libgnomedb/libgnomedb.conf b/package/gnome2/libgnomedb/libgnomedb.conf
similarity index 100%
rename from package/gnome24/libgnomedb/libgnomedb.conf
rename to package/gnome2/libgnomedb/libgnomedb.conf
diff --git a/package/gnome24/libgnomedb/libgnomedb.desc b/package/gnome2/libgnomedb/libgnomedb.desc
similarity index 100%
rename from package/gnome24/libgnomedb/libgnomedb.desc
rename to package/gnome2/libgnomedb/libgnomedb.desc
diff --git a/package/gnome24/libgnomemm/libgnomemm.cache b/package/gnome2/libgnomemm/libgnomemm.cache
similarity index 100%
rename from package/gnome24/libgnomemm/libgnomemm.cache
rename to package/gnome2/libgnomemm/libgnomemm.cache
diff --git a/package/gnome24/libgnomemm/libgnomemm.conf b/package/gnome2/libgnomemm/libgnomemm.conf
similarity index 100%
rename from package/gnome24/libgnomemm/libgnomemm.conf
rename to package/gnome2/libgnomemm/libgnomemm.conf
diff --git a/package/gnome24/libgnomemm/libgnomemm.desc b/package/gnome2/libgnomemm/libgnomemm.desc
similarity index 100%
rename from package/gnome24/libgnomemm/libgnomemm.desc
rename to package/gnome2/libgnomemm/libgnomemm.desc
diff --git a/package/gnome24/libgnomeprint/libgnomeprint.cache b/package/gnome2/libgnomeprint/libgnomeprint.cache
similarity index 100%
rename from package/gnome24/libgnomeprint/libgnomeprint.cache
rename to package/gnome2/libgnomeprint/libgnomeprint.cache
diff --git a/package/gnome24/libgnomeprint/libgnomeprint.conf b/package/gnome2/libgnomeprint/libgnomeprint.conf
similarity index 100%
rename from package/gnome24/libgnomeprint/libgnomeprint.conf
rename to package/gnome2/libgnomeprint/libgnomeprint.conf
diff --git a/package/gnome24/libgnomeprint/libgnomeprint.desc b/package/gnome2/libgnomeprint/libgnomeprint.desc
similarity index 100%
rename from package/gnome24/libgnomeprint/libgnomeprint.desc
rename to package/gnome2/libgnomeprint/libgnomeprint.desc
diff --git a/package/gnome24/libgnomeprintui/libgnomeprintui.cache b/package/gnome2/libgnomeprintui/libgnomeprintui.cache
similarity index 100%
rename from package/gnome24/libgnomeprintui/libgnomeprintui.cache
rename to package/gnome2/libgnomeprintui/libgnomeprintui.cache
diff --git a/package/gnome24/libgnomeprintui/libgnomeprintui.conf b/package/gnome2/libgnomeprintui/libgnomeprintui.conf
similarity index 100%
rename from package/gnome24/libgnomeprintui/libgnomeprintui.conf
rename to package/gnome2/libgnomeprintui/libgnomeprintui.conf
diff --git a/package/gnome24/libgnomeprintui/libgnomeprintui.desc b/package/gnome2/libgnomeprintui/libgnomeprintui.desc
similarity index 100%
rename from package/gnome24/libgnomeprintui/libgnomeprintui.desc
rename to package/gnome2/libgnomeprintui/libgnomeprintui.desc
diff --git a/package/gnome24/libgnomeui/libgnomeui.cache b/package/gnome2/libgnomeui/libgnomeui.cache
similarity index 100%
rename from package/gnome24/libgnomeui/libgnomeui.cache
rename to package/gnome2/libgnomeui/libgnomeui.cache
diff --git a/package/gnome24/libgnomeui/libgnomeui.conf b/package/gnome2/libgnomeui/libgnomeui.conf
similarity index 100%
rename from package/gnome24/libgnomeui/libgnomeui.conf
rename to package/gnome2/libgnomeui/libgnomeui.conf
diff --git a/package/gnome24/libgnomeui/libgnomeui.desc b/package/gnome2/libgnomeui/libgnomeui.desc
similarity index 100%
rename from package/gnome24/libgnomeui/libgnomeui.desc
rename to package/gnome2/libgnomeui/libgnomeui.desc
diff --git a/package/gnome24/libgnomeuimm/libgnomeuimm.cache b/package/gnome2/libgnomeuimm/libgnomeuimm.cache
similarity index 100%
rename from package/gnome24/libgnomeuimm/libgnomeuimm.cache
rename to package/gnome2/libgnomeuimm/libgnomeuimm.cache
diff --git a/package/gnome24/libgnomeuimm/libgnomeuimm.conf b/package/gnome2/libgnomeuimm/libgnomeuimm.conf
similarity index 100%
rename from package/gnome24/libgnomeuimm/libgnomeuimm.conf
rename to package/gnome2/libgnomeuimm/libgnomeuimm.conf
diff --git a/package/gnome24/libgnomeuimm/libgnomeuimm.desc b/package/gnome2/libgnomeuimm/libgnomeuimm.desc
similarity index 100%
rename from package/gnome24/libgnomeuimm/libgnomeuimm.desc
rename to package/gnome2/libgnomeuimm/libgnomeuimm.desc
diff --git a/package/gnome24/libgsf/libgsf.cache b/package/gnome2/libgsf/libgsf.cache
similarity index 100%
rename from package/gnome24/libgsf/libgsf.cache
rename to package/gnome2/libgsf/libgsf.cache
diff --git a/package/gnome24/libgsf/libgsf.conf b/package/gnome2/libgsf/libgsf.conf
similarity index 100%
rename from package/gnome24/libgsf/libgsf.conf
rename to package/gnome2/libgsf/libgsf.conf
diff --git a/package/gnome24/libgsf/libgsf.desc b/package/gnome2/libgsf/libgsf.desc
similarity index 100%
rename from package/gnome24/libgsf/libgsf.desc
rename to package/gnome2/libgsf/libgsf.desc
diff --git a/package/gnome24/libgtkhtml/libgtkhtml.cache b/package/gnome2/libgtkhtml/libgtkhtml.cache
similarity index 100%
rename from package/gnome24/libgtkhtml/libgtkhtml.cache
rename to package/gnome2/libgtkhtml/libgtkhtml.cache
diff --git a/package/gnome24/libgtkhtml/libgtkhtml.conf b/package/gnome2/libgtkhtml/libgtkhtml.conf
similarity index 100%
rename from package/gnome24/libgtkhtml/libgtkhtml.conf
rename to package/gnome2/libgtkhtml/libgtkhtml.conf
diff --git a/package/gnome24/libgtkhtml/libgtkhtml.desc b/package/gnome2/libgtkhtml/libgtkhtml.desc
similarity index 100%
rename from package/gnome24/libgtkhtml/libgtkhtml.desc
rename to package/gnome2/libgtkhtml/libgtkhtml.desc
diff --git a/package/gnome24/libgtop/libgtop.cache b/package/gnome2/libgtop/libgtop.cache
similarity index 100%
rename from package/gnome24/libgtop/libgtop.cache
rename to package/gnome2/libgtop/libgtop.cache
diff --git a/package/gnome24/libgtop/libgtop.conf b/package/gnome2/libgtop/libgtop.conf
similarity index 100%
rename from package/gnome24/libgtop/libgtop.conf
rename to package/gnome2/libgtop/libgtop.conf
diff --git a/package/gnome24/libgtop/libgtop.desc b/package/gnome2/libgtop/libgtop.desc
similarity index 100%
rename from package/gnome24/libgtop/libgtop.desc
rename to package/gnome2/libgtop/libgtop.desc
diff --git a/package/gnome24/libidl/libidl.cache b/package/gnome2/libidl/libidl.cache
similarity index 100%
rename from package/gnome24/libidl/libidl.cache
rename to package/gnome2/libidl/libidl.cache
diff --git a/package/gnome24/libidl/libidl.conf b/package/gnome2/libidl/libidl.conf
similarity index 100%
rename from package/gnome24/libidl/libidl.conf
rename to package/gnome2/libidl/libidl.conf
diff --git a/package/gnome24/libidl/libidl.desc b/package/gnome2/libidl/libidl.desc
similarity index 100%
rename from package/gnome24/libidl/libidl.desc
rename to package/gnome2/libidl/libidl.desc
diff --git a/package/gnome24/libmrproject/libmrproject.cache b/package/gnome2/libmrproject/libmrproject.cache
similarity index 100%
rename from package/gnome24/libmrproject/libmrproject.cache
rename to package/gnome2/libmrproject/libmrproject.cache
diff --git a/package/gnome24/libmrproject/libmrproject.conf b/package/gnome2/libmrproject/libmrproject.conf
similarity index 100%
rename from package/gnome24/libmrproject/libmrproject.conf
rename to package/gnome2/libmrproject/libmrproject.conf
diff --git a/package/gnome24/libmrproject/libmrproject.desc b/package/gnome2/libmrproject/libmrproject.desc
similarity index 100%
rename from package/gnome24/libmrproject/libmrproject.desc
rename to package/gnome2/libmrproject/libmrproject.desc
diff --git a/package/gnome24/libole/libole.cache b/package/gnome2/libole/libole.cache
similarity index 100%
rename from package/gnome24/libole/libole.cache
rename to package/gnome2/libole/libole.cache
diff --git a/package/gnome24/libole/libole.conf b/package/gnome2/libole/libole.conf
similarity index 100%
rename from package/gnome24/libole/libole.conf
rename to package/gnome2/libole/libole.conf
diff --git a/package/gnome24/libole/libole.desc b/package/gnome2/libole/libole.desc
similarity index 100%
rename from package/gnome24/libole/libole.desc
rename to package/gnome2/libole/libole.desc
diff --git a/package/gnome24/librsvg/librsvg.cache b/package/gnome2/librsvg/librsvg.cache
similarity index 100%
rename from package/gnome24/librsvg/librsvg.cache
rename to package/gnome2/librsvg/librsvg.cache
diff --git a/package/gnome24/librsvg/librsvg.conf b/package/gnome2/librsvg/librsvg.conf
similarity index 100%
rename from package/gnome24/librsvg/librsvg.conf
rename to package/gnome2/librsvg/librsvg.conf
diff --git a/package/gnome24/librsvg/librsvg.desc b/package/gnome2/librsvg/librsvg.desc
similarity index 100%
rename from package/gnome24/librsvg/librsvg.desc
rename to package/gnome2/librsvg/librsvg.desc
diff --git a/package/gnome24/libsoup/libsoup.cache b/package/gnome2/libsoup/libsoup.cache
similarity index 100%
rename from package/gnome24/libsoup/libsoup.cache
rename to package/gnome2/libsoup/libsoup.cache
diff --git a/package/gnome24/libsoup/libsoup.conf b/package/gnome2/libsoup/libsoup.conf
similarity index 100%
rename from package/gnome24/libsoup/libsoup.conf
rename to package/gnome2/libsoup/libsoup.conf
diff --git a/package/gnome24/libsoup/libsoup.desc b/package/gnome2/libsoup/libsoup.desc
similarity index 100%
rename from package/gnome24/libsoup/libsoup.desc
rename to package/gnome2/libsoup/libsoup.desc
diff --git a/package/gnome24/libwnck/libwnck.cache b/package/gnome2/libwnck/libwnck.cache
similarity index 100%
rename from package/gnome24/libwnck/libwnck.cache
rename to package/gnome2/libwnck/libwnck.cache
diff --git a/package/gnome24/libwnck/libwnck.conf b/package/gnome2/libwnck/libwnck.conf
similarity index 100%
rename from package/gnome24/libwnck/libwnck.conf
rename to package/gnome2/libwnck/libwnck.conf
diff --git a/package/gnome24/libwnck/libwnck.desc b/package/gnome2/libwnck/libwnck.desc
similarity index 100%
rename from package/gnome24/libwnck/libwnck.desc
rename to package/gnome2/libwnck/libwnck.desc
diff --git a/package/gnome24/libxklavier/libxklavier.cache b/package/gnome2/libxklavier/libxklavier.cache
similarity index 100%
rename from package/gnome24/libxklavier/libxklavier.cache
rename to package/gnome2/libxklavier/libxklavier.cache
diff --git a/package/gnome24/libxklavier/libxklavier.conf b/package/gnome2/libxklavier/libxklavier.conf
similarity index 100%
rename from package/gnome24/libxklavier/libxklavier.conf
rename to package/gnome2/libxklavier/libxklavier.conf
diff --git a/package/gnome24/libxklavier/libxklavier.desc b/package/gnome2/libxklavier/libxklavier.desc
similarity index 100%
rename from package/gnome24/libxklavier/libxklavier.desc
rename to package/gnome2/libxklavier/libxklavier.desc
diff --git a/package/gnome24/libzvt/libzvt.cache b/package/gnome2/libzvt/libzvt.cache
similarity index 100%
rename from package/gnome24/libzvt/libzvt.cache
rename to package/gnome2/libzvt/libzvt.cache
diff --git a/package/gnome24/libzvt/libzvt.conf b/package/gnome2/libzvt/libzvt.conf
similarity index 100%
rename from package/gnome24/libzvt/libzvt.conf
rename to package/gnome2/libzvt/libzvt.conf
diff --git a/package/gnome24/libzvt/libzvt.desc b/package/gnome2/libzvt/libzvt.desc
similarity index 100%
rename from package/gnome24/libzvt/libzvt.desc
rename to package/gnome2/libzvt/libzvt.desc
diff --git a/package/gnome24/linc/linc.conf b/package/gnome2/linc/linc.conf
similarity index 100%
rename from package/gnome24/linc/linc.conf
rename to package/gnome2/linc/linc.conf
diff --git a/package/gnome24/linc/linc.desc b/package/gnome2/linc/linc.desc
similarity index 100%
rename from package/gnome24/linc/linc.desc
rename to package/gnome2/linc/linc.desc
diff --git a/package/gnome24/lock-keys-applet/lock-keys-applet.cache b/package/gnome2/lock-keys-applet/lock-keys-applet.cache
similarity index 100%
rename from package/gnome24/lock-keys-applet/lock-keys-applet.cache
rename to package/gnome2/lock-keys-applet/lock-keys-applet.cache
diff --git a/package/gnome24/lock-keys-applet/lock-keys-applet.conf b/package/gnome2/lock-keys-applet/lock-keys-applet.conf
similarity index 100%
rename from package/gnome24/lock-keys-applet/lock-keys-applet.conf
rename to package/gnome2/lock-keys-applet/lock-keys-applet.conf
diff --git a/package/gnome24/lock-keys-applet/lock-keys-applet.desc b/package/gnome2/lock-keys-applet/lock-keys-applet.desc
similarity index 100%
rename from package/gnome24/lock-keys-applet/lock-keys-applet.desc
rename to package/gnome2/lock-keys-applet/lock-keys-applet.desc
diff --git a/package/gnome24/loudmouth/loudmouth.cache b/package/gnome2/loudmouth/loudmouth.cache
similarity index 100%
rename from package/gnome24/loudmouth/loudmouth.cache
rename to package/gnome2/loudmouth/loudmouth.cache
diff --git a/package/gnome24/loudmouth/loudmouth.conf b/package/gnome2/loudmouth/loudmouth.conf
similarity index 100%
rename from package/gnome24/loudmouth/loudmouth.conf
rename to package/gnome2/loudmouth/loudmouth.conf
diff --git a/package/gnome24/loudmouth/loudmouth.desc b/package/gnome2/loudmouth/loudmouth.desc
similarity index 100%
rename from package/gnome24/loudmouth/loudmouth.desc
rename to package/gnome2/loudmouth/loudmouth.desc
diff --git a/package/gnome24/memprof/memprof.cache b/package/gnome2/memprof/memprof.cache
similarity index 100%
rename from package/gnome24/memprof/memprof.cache
rename to package/gnome2/memprof/memprof.cache
diff --git a/package/gnome24/memprof/memprof.conf b/package/gnome2/memprof/memprof.conf
similarity index 100%
rename from package/gnome24/memprof/memprof.conf
rename to package/gnome2/memprof/memprof.conf
diff --git a/package/gnome24/memprof/memprof.desc b/package/gnome2/memprof/memprof.desc
similarity index 100%
rename from package/gnome24/memprof/memprof.desc
rename to package/gnome2/memprof/memprof.desc
diff --git a/package/gnome24/mergeant/mergeant.cache b/package/gnome2/mergeant/mergeant.cache
similarity index 100%
rename from package/gnome24/mergeant/mergeant.cache
rename to package/gnome2/mergeant/mergeant.cache
diff --git a/package/gnome24/mergeant/mergeant.conf b/package/gnome2/mergeant/mergeant.conf
similarity index 100%
rename from package/gnome24/mergeant/mergeant.conf
rename to package/gnome2/mergeant/mergeant.conf
diff --git a/package/gnome24/mergeant/mergeant.desc b/package/gnome2/mergeant/mergeant.desc
similarity index 100%
rename from package/gnome24/mergeant/mergeant.desc
rename to package/gnome2/mergeant/mergeant.desc
diff --git a/package/gnome24/metacity/metacity.cache b/package/gnome2/metacity/metacity.cache
similarity index 100%
rename from package/gnome24/metacity/metacity.cache
rename to package/gnome2/metacity/metacity.cache
diff --git a/package/gnome24/metacity/metacity.conf b/package/gnome2/metacity/metacity.conf
similarity index 100%
rename from package/gnome24/metacity/metacity.conf
rename to package/gnome2/metacity/metacity.conf
diff --git a/package/gnome24/metacity/metacity.desc b/package/gnome2/metacity/metacity.desc
similarity index 100%
rename from package/gnome24/metacity/metacity.desc
rename to package/gnome2/metacity/metacity.desc
diff --git a/package/gnome24/metatheme/metatheme.cache b/package/gnome2/metatheme/metatheme.cache
similarity index 100%
rename from package/gnome24/metatheme/metatheme.cache
rename to package/gnome2/metatheme/metatheme.cache
diff --git a/package/gnome24/metatheme/metatheme.conf b/package/gnome2/metatheme/metatheme.conf
similarity index 100%
rename from package/gnome24/metatheme/metatheme.conf
rename to package/gnome2/metatheme/metatheme.conf
diff --git a/package/gnome24/metatheme/metatheme.desc b/package/gnome2/metatheme/metatheme.desc
similarity index 100%
rename from package/gnome24/metatheme/metatheme.desc
rename to package/gnome2/metatheme/metatheme.desc
diff --git a/package/gnome24/mrproject/mrproject.cache b/package/gnome2/mrproject/mrproject.cache
similarity index 100%
rename from package/gnome24/mrproject/mrproject.cache
rename to package/gnome2/mrproject/mrproject.cache
diff --git a/package/gnome24/mrproject/mrproject.conf b/package/gnome2/mrproject/mrproject.conf
similarity index 100%
rename from package/gnome24/mrproject/mrproject.conf
rename to package/gnome2/mrproject/mrproject.conf
diff --git a/package/gnome24/mrproject/mrproject.desc b/package/gnome2/mrproject/mrproject.desc
similarity index 100%
rename from package/gnome24/mrproject/mrproject.desc
rename to package/gnome2/mrproject/mrproject.desc
diff --git a/package/gnome24/nautilus-cd-burner/nautilus-cd-burner.cache b/package/gnome2/nautilus-cd-burner/nautilus-cd-burner.cache
similarity index 100%
rename from package/gnome24/nautilus-cd-burner/nautilus-cd-burner.cache
rename to package/gnome2/nautilus-cd-burner/nautilus-cd-burner.cache
diff --git a/package/gnome24/nautilus-cd-burner/nautilus-cd-burner.conf b/package/gnome2/nautilus-cd-burner/nautilus-cd-burner.conf
similarity index 100%
rename from package/gnome24/nautilus-cd-burner/nautilus-cd-burner.conf
rename to package/gnome2/nautilus-cd-burner/nautilus-cd-burner.conf
diff --git a/package/gnome24/nautilus-cd-burner/nautilus-cd-burner.desc b/package/gnome2/nautilus-cd-burner/nautilus-cd-burner.desc
similarity index 100%
rename from package/gnome24/nautilus-cd-burner/nautilus-cd-burner.desc
rename to package/gnome2/nautilus-cd-burner/nautilus-cd-burner.desc
diff --git a/package/gnome24/nautilus-gtkhtml/nautilus-gtkhtml.cache b/package/gnome2/nautilus-gtkhtml/nautilus-gtkhtml.cache
similarity index 100%
rename from package/gnome24/nautilus-gtkhtml/nautilus-gtkhtml.cache
rename to package/gnome2/nautilus-gtkhtml/nautilus-gtkhtml.cache
diff --git a/package/gnome24/nautilus-gtkhtml/nautilus-gtkhtml.conf b/package/gnome2/nautilus-gtkhtml/nautilus-gtkhtml.conf
similarity index 100%
rename from package/gnome24/nautilus-gtkhtml/nautilus-gtkhtml.conf
rename to package/gnome2/nautilus-gtkhtml/nautilus-gtkhtml.conf
diff --git a/package/gnome24/nautilus-gtkhtml/nautilus-gtkhtml.desc b/package/gnome2/nautilus-gtkhtml/nautilus-gtkhtml.desc
similarity index 100%
rename from package/gnome24/nautilus-gtkhtml/nautilus-gtkhtml.desc
rename to package/gnome2/nautilus-gtkhtml/nautilus-gtkhtml.desc
diff --git a/package/gnome24/nautilus-media/nautilus-media.cache b/package/gnome2/nautilus-media/nautilus-media.cache
similarity index 100%
rename from package/gnome24/nautilus-media/nautilus-media.cache
rename to package/gnome2/nautilus-media/nautilus-media.cache
diff --git a/package/gnome24/nautilus-media/nautilus-media.conf b/package/gnome2/nautilus-media/nautilus-media.conf
similarity index 100%
rename from package/gnome24/nautilus-media/nautilus-media.conf
rename to package/gnome2/nautilus-media/nautilus-media.conf
diff --git a/package/gnome24/nautilus-media/nautilus-media.desc b/package/gnome2/nautilus-media/nautilus-media.desc
similarity index 100%
rename from package/gnome24/nautilus-media/nautilus-media.desc
rename to package/gnome2/nautilus-media/nautilus-media.desc
diff --git a/package/gnome24/nautilus/nautilus.cache b/package/gnome2/nautilus/nautilus.cache
similarity index 100%
rename from package/gnome24/nautilus/nautilus.cache
rename to package/gnome2/nautilus/nautilus.cache
diff --git a/package/gnome24/nautilus/nautilus.conf b/package/gnome2/nautilus/nautilus.conf
similarity index 100%
rename from package/gnome24/nautilus/nautilus.conf
rename to package/gnome2/nautilus/nautilus.conf
diff --git a/package/gnome24/nautilus/nautilus.desc b/package/gnome2/nautilus/nautilus.desc
similarity index 100%
rename from package/gnome24/nautilus/nautilus.desc
rename to package/gnome2/nautilus/nautilus.desc
diff --git a/package/gnome24/netspeed_applet/netspeed_applet.cache b/package/gnome2/netspeed_applet/netspeed_applet.cache
similarity index 100%
rename from package/gnome24/netspeed_applet/netspeed_applet.cache
rename to package/gnome2/netspeed_applet/netspeed_applet.cache
diff --git a/package/gnome24/netspeed_applet/netspeed_applet.conf b/package/gnome2/netspeed_applet/netspeed_applet.conf
similarity index 100%
rename from package/gnome24/netspeed_applet/netspeed_applet.conf
rename to package/gnome2/netspeed_applet/netspeed_applet.conf
diff --git a/package/gnome24/netspeed_applet/netspeed_applet.desc b/package/gnome2/netspeed_applet/netspeed_applet.desc
similarity index 100%
rename from package/gnome24/netspeed_applet/netspeed_applet.desc
rename to package/gnome2/netspeed_applet/netspeed_applet.desc
diff --git a/package/gnome24/orbit2/orbit2.cache b/package/gnome2/orbit2/orbit2.cache
similarity index 100%
rename from package/gnome24/orbit2/orbit2.cache
rename to package/gnome2/orbit2/orbit2.cache
diff --git a/package/gnome24/orbit2/orbit2.conf b/package/gnome2/orbit2/orbit2.conf
similarity index 100%
rename from package/gnome24/orbit2/orbit2.conf
rename to package/gnome2/orbit2/orbit2.conf
diff --git a/package/gnome24/orbit2/orbit2.desc b/package/gnome2/orbit2/orbit2.desc
similarity index 100%
rename from package/gnome24/orbit2/orbit2.desc
rename to package/gnome2/orbit2/orbit2.desc
diff --git a/package/gnome24/orbitcpp/orbitcpp.cache b/package/gnome2/orbitcpp/orbitcpp.cache
similarity index 100%
rename from package/gnome24/orbitcpp/orbitcpp.cache
rename to package/gnome2/orbitcpp/orbitcpp.cache
diff --git a/package/gnome24/orbitcpp/orbitcpp.conf b/package/gnome2/orbitcpp/orbitcpp.conf
similarity index 100%
rename from package/gnome24/orbitcpp/orbitcpp.conf
rename to package/gnome2/orbitcpp/orbitcpp.conf
diff --git a/package/gnome24/orbitcpp/orbitcpp.desc b/package/gnome2/orbitcpp/orbitcpp.desc
similarity index 100%
rename from package/gnome24/orbitcpp/orbitcpp.desc
rename to package/gnome2/orbitcpp/orbitcpp.desc
diff --git a/package/gnome24/pan/pan.cache b/package/gnome2/pan/pan.cache
similarity index 100%
rename from package/gnome24/pan/pan.cache
rename to package/gnome2/pan/pan.cache
diff --git a/package/gnome24/pan/pan.conf b/package/gnome2/pan/pan.conf
similarity index 100%
rename from package/gnome24/pan/pan.conf
rename to package/gnome2/pan/pan.conf
diff --git a/package/gnome24/pan/pan.desc b/package/gnome2/pan/pan.desc
similarity index 100%
rename from package/gnome24/pan/pan.desc
rename to package/gnome2/pan/pan.desc
diff --git a/package/gnome24/pango/pango.cache b/package/gnome2/pango/pango.cache
similarity index 100%
rename from package/gnome24/pango/pango.cache
rename to package/gnome2/pango/pango.cache
diff --git a/package/gnome24/pango/pango.conf b/package/gnome2/pango/pango.conf
similarity index 100%
rename from package/gnome24/pango/pango.conf
rename to package/gnome2/pango/pango.conf
diff --git a/package/gnome24/pango/pango.desc b/package/gnome2/pango/pango.desc
similarity index 100%
rename from package/gnome24/pango/pango.desc
rename to package/gnome2/pango/pango.desc
diff --git a/package/gnome24/pkgview/pkgview.cache b/package/gnome2/pkgview/pkgview.cache
similarity index 100%
rename from package/gnome24/pkgview/pkgview.cache
rename to package/gnome2/pkgview/pkgview.cache
diff --git a/package/gnome24/pkgview/pkgview.conf b/package/gnome2/pkgview/pkgview.conf
similarity index 100%
rename from package/gnome24/pkgview/pkgview.conf
rename to package/gnome2/pkgview/pkgview.conf
diff --git a/package/gnome24/pkgview/pkgview.desc b/package/gnome2/pkgview/pkgview.desc
similarity index 100%
rename from package/gnome24/pkgview/pkgview.desc
rename to package/gnome2/pkgview/pkgview.desc
diff --git a/package/gnome24/pybliographer/pybliographer.cache b/package/gnome2/pybliographer/pybliographer.cache
similarity index 100%
rename from package/gnome24/pybliographer/pybliographer.cache
rename to package/gnome2/pybliographer/pybliographer.cache
diff --git a/package/gnome24/pybliographer/pybliographer.conf b/package/gnome2/pybliographer/pybliographer.conf
similarity index 100%
rename from package/gnome24/pybliographer/pybliographer.conf
rename to package/gnome2/pybliographer/pybliographer.conf
diff --git a/package/gnome24/pybliographer/pybliographer.desc b/package/gnome2/pybliographer/pybliographer.desc
similarity index 100%
rename from package/gnome24/pybliographer/pybliographer.desc
rename to package/gnome2/pybliographer/pybliographer.desc
diff --git a/package/gnome24/pygtk/pygtk.cache b/package/gnome2/pygtk/pygtk.cache
similarity index 100%
rename from package/gnome24/pygtk/pygtk.cache
rename to package/gnome2/pygtk/pygtk.cache
diff --git a/package/gnome24/pygtk/pygtk.conf b/package/gnome2/pygtk/pygtk.conf
similarity index 100%
rename from package/gnome24/pygtk/pygtk.conf
rename to package/gnome2/pygtk/pygtk.conf
diff --git a/package/gnome24/pygtk/pygtk.desc b/package/gnome2/pygtk/pygtk.desc
similarity index 100%
rename from package/gnome24/pygtk/pygtk.desc
rename to package/gnome2/pygtk/pygtk.desc
diff --git a/package/gnome24/pyorbit/pyorbit.cache b/package/gnome2/pyorbit/pyorbit.cache
similarity index 100%
rename from package/gnome24/pyorbit/pyorbit.cache
rename to package/gnome2/pyorbit/pyorbit.cache
diff --git a/package/gnome24/pyorbit/pyorbit.conf b/package/gnome2/pyorbit/pyorbit.conf
similarity index 100%
rename from package/gnome24/pyorbit/pyorbit.conf
rename to package/gnome2/pyorbit/pyorbit.conf
diff --git a/package/gnome24/pyorbit/pyorbit.desc b/package/gnome2/pyorbit/pyorbit.desc
similarity index 100%
rename from package/gnome24/pyorbit/pyorbit.desc
rename to package/gnome2/pyorbit/pyorbit.desc
diff --git a/package/gnome24/quick-lounge-applet/quick-lounge-applet.cache b/package/gnome2/quick-lounge-applet/quick-lounge-applet.cache
similarity index 100%
rename from package/gnome24/quick-lounge-applet/quick-lounge-applet.cache
rename to package/gnome2/quick-lounge-applet/quick-lounge-applet.cache
diff --git a/package/gnome24/quick-lounge-applet/quick-lounge-applet.conf b/package/gnome2/quick-lounge-applet/quick-lounge-applet.conf
similarity index 100%
rename from package/gnome24/quick-lounge-applet/quick-lounge-applet.conf
rename to package/gnome2/quick-lounge-applet/quick-lounge-applet.conf
diff --git a/package/gnome24/quick-lounge-applet/quick-lounge-applet.desc b/package/gnome2/quick-lounge-applet/quick-lounge-applet.desc
similarity index 100%
rename from package/gnome24/quick-lounge-applet/quick-lounge-applet.desc
rename to package/gnome2/quick-lounge-applet/quick-lounge-applet.desc
diff --git a/package/gnome24/regexxer/regexxer.cache b/package/gnome2/regexxer/regexxer.cache
similarity index 100%
rename from package/gnome24/regexxer/regexxer.cache
rename to package/gnome2/regexxer/regexxer.cache
diff --git a/package/gnome24/regexxer/regexxer.conf b/package/gnome2/regexxer/regexxer.conf
similarity index 100%
rename from package/gnome24/regexxer/regexxer.conf
rename to package/gnome2/regexxer/regexxer.conf
diff --git a/package/gnome24/regexxer/regexxer.desc b/package/gnome2/regexxer/regexxer.desc
similarity index 100%
rename from package/gnome24/regexxer/regexxer.desc
rename to package/gnome2/regexxer/regexxer.desc
diff --git a/package/gnome24/rep-gtk/rep-gtk.cache b/package/gnome2/rep-gtk/rep-gtk.cache
similarity index 100%
rename from package/gnome24/rep-gtk/rep-gtk.cache
rename to package/gnome2/rep-gtk/rep-gtk.cache
diff --git a/package/gnome24/rep-gtk/rep-gtk.conf b/package/gnome2/rep-gtk/rep-gtk.conf
similarity index 100%
rename from package/gnome24/rep-gtk/rep-gtk.conf
rename to package/gnome2/rep-gtk/rep-gtk.conf
diff --git a/package/gnome24/rep-gtk/rep-gtk.desc b/package/gnome2/rep-gtk/rep-gtk.desc
similarity index 100%
rename from package/gnome24/rep-gtk/rep-gtk.desc
rename to package/gnome2/rep-gtk/rep-gtk.desc
diff --git a/package/gnome24/rhythmbox/rhythmbox.cache b/package/gnome2/rhythmbox/rhythmbox.cache
similarity index 100%
rename from package/gnome24/rhythmbox/rhythmbox.cache
rename to package/gnome2/rhythmbox/rhythmbox.cache
diff --git a/package/gnome24/rhythmbox/rhythmbox.conf b/package/gnome2/rhythmbox/rhythmbox.conf
similarity index 100%
rename from package/gnome24/rhythmbox/rhythmbox.conf
rename to package/gnome2/rhythmbox/rhythmbox.conf
diff --git a/package/gnome24/rhythmbox/rhythmbox.desc b/package/gnome2/rhythmbox/rhythmbox.desc
similarity index 100%
rename from package/gnome24/rhythmbox/rhythmbox.desc
rename to package/gnome2/rhythmbox/rhythmbox.desc
diff --git a/package/gnome24/sawfish/sawfish.cache b/package/gnome2/sawfish/sawfish.cache
similarity index 100%
rename from package/gnome24/sawfish/sawfish.cache
rename to package/gnome2/sawfish/sawfish.cache
diff --git a/package/gnome24/sawfish/sawfish.conf b/package/gnome2/sawfish/sawfish.conf
similarity index 100%
rename from package/gnome24/sawfish/sawfish.conf
rename to package/gnome2/sawfish/sawfish.conf
diff --git a/package/gnome24/sawfish/sawfish.desc b/package/gnome2/sawfish/sawfish.desc
similarity index 100%
rename from package/gnome24/sawfish/sawfish.desc
rename to package/gnome2/sawfish/sawfish.desc
diff --git a/package/gnome24/scrollkeeper/scrollkeeper-pkg.conf b/package/gnome2/scrollkeeper/scrollkeeper-pkg.conf
similarity index 100%
rename from package/gnome24/scrollkeeper/scrollkeeper-pkg.conf
rename to package/gnome2/scrollkeeper/scrollkeeper-pkg.conf
diff --git a/package/gnome24/scrollkeeper/scrollkeeper.cache b/package/gnome2/scrollkeeper/scrollkeeper.cache
similarity index 100%
rename from package/gnome24/scrollkeeper/scrollkeeper.cache
rename to package/gnome2/scrollkeeper/scrollkeeper.cache
diff --git a/package/gnome24/scrollkeeper/scrollkeeper.conf b/package/gnome2/scrollkeeper/scrollkeeper.conf
similarity index 100%
rename from package/gnome24/scrollkeeper/scrollkeeper.conf
rename to package/gnome2/scrollkeeper/scrollkeeper.conf
diff --git a/package/gnome24/scrollkeeper/scrollkeeper.cron b/package/gnome2/scrollkeeper/scrollkeeper.cron
similarity index 100%
rename from package/gnome24/scrollkeeper/scrollkeeper.cron
rename to package/gnome2/scrollkeeper/scrollkeeper.cron
diff --git a/package/gnome24/scrollkeeper/scrollkeeper.desc b/package/gnome2/scrollkeeper/scrollkeeper.desc
similarity index 100%
rename from package/gnome24/scrollkeeper/scrollkeeper.desc
rename to package/gnome2/scrollkeeper/scrollkeeper.desc
diff --git a/package/gnome24/seahorse/gpgme-version.patch b/package/gnome2/seahorse/gpgme-version.patch
similarity index 100%
rename from package/gnome24/seahorse/gpgme-version.patch
rename to package/gnome2/seahorse/gpgme-version.patch
diff --git a/package/gnome24/seahorse/seahorse.cache b/package/gnome2/seahorse/seahorse.cache
similarity index 100%
rename from package/gnome24/seahorse/seahorse.cache
rename to package/gnome2/seahorse/seahorse.cache
diff --git a/package/gnome24/seahorse/seahorse.conf b/package/gnome2/seahorse/seahorse.conf
similarity index 100%
rename from package/gnome24/seahorse/seahorse.conf
rename to package/gnome2/seahorse/seahorse.conf
diff --git a/package/gnome24/seahorse/seahorse.desc b/package/gnome2/seahorse/seahorse.desc
similarity index 100%
rename from package/gnome24/seahorse/seahorse.desc
rename to package/gnome2/seahorse/seahorse.desc
diff --git a/package/gnome24/sound-juicer/sound-juicer.cache b/package/gnome2/sound-juicer/sound-juicer.cache
similarity index 100%
rename from package/gnome24/sound-juicer/sound-juicer.cache
rename to package/gnome2/sound-juicer/sound-juicer.cache
diff --git a/package/gnome24/sound-juicer/sound-juicer.conf b/package/gnome2/sound-juicer/sound-juicer.conf
similarity index 100%
rename from package/gnome24/sound-juicer/sound-juicer.conf
rename to package/gnome2/sound-juicer/sound-juicer.conf
diff --git a/package/gnome24/sound-juicer/sound-juicer.desc b/package/gnome2/sound-juicer/sound-juicer.desc
similarity index 100%
rename from package/gnome24/sound-juicer/sound-juicer.desc
rename to package/gnome2/sound-juicer/sound-juicer.desc
diff --git a/package/gnome24/spheres-and-crystals/spheres-and-crystals.cache b/package/gnome2/spheres-and-crystals/spheres-and-crystals.cache
similarity index 100%
rename from package/gnome24/spheres-and-crystals/spheres-and-crystals.cache
rename to package/gnome2/spheres-and-crystals/spheres-and-crystals.cache
diff --git a/package/gnome24/spheres-and-crystals/spheres-and-crystals.conf b/package/gnome2/spheres-and-crystals/spheres-and-crystals.conf
similarity index 100%
rename from package/gnome24/spheres-and-crystals/spheres-and-crystals.conf
rename to package/gnome2/spheres-and-crystals/spheres-and-crystals.conf
diff --git a/package/gnome24/spheres-and-crystals/spheres-and-crystals.desc b/package/gnome2/spheres-and-crystals/spheres-and-crystals.desc
similarity index 100%
rename from package/gnome24/spheres-and-crystals/spheres-and-crystals.desc
rename to package/gnome2/spheres-and-crystals/spheres-and-crystals.desc
diff --git a/package/gnome24/startup-notification/startup-notification.cache b/package/gnome2/startup-notification/startup-notification.cache
similarity index 100%
rename from package/gnome24/startup-notification/startup-notification.cache
rename to package/gnome2/startup-notification/startup-notification.cache
diff --git a/package/gnome24/startup-notification/startup-notification.conf b/package/gnome2/startup-notification/startup-notification.conf
similarity index 100%
rename from package/gnome24/startup-notification/startup-notification.conf
rename to package/gnome2/startup-notification/startup-notification.conf
diff --git a/package/gnome24/startup-notification/startup-notification.desc b/package/gnome2/startup-notification/startup-notification.desc
similarity index 100%
rename from package/gnome24/startup-notification/startup-notification.desc
rename to package/gnome2/startup-notification/startup-notification.desc
diff --git a/package/gnome24/straw/install-hotfix.patch b/package/gnome2/straw/install-hotfix.patch
similarity index 100%
rename from package/gnome24/straw/install-hotfix.patch
rename to package/gnome2/straw/install-hotfix.patch
diff --git a/package/gnome24/straw/straw.cache b/package/gnome2/straw/straw.cache
similarity index 100%
rename from package/gnome24/straw/straw.cache
rename to package/gnome2/straw/straw.cache
diff --git a/package/gnome24/straw/straw.conf b/package/gnome2/straw/straw.conf
similarity index 100%
rename from package/gnome24/straw/straw.conf
rename to package/gnome2/straw/straw.conf
diff --git a/package/gnome24/straw/straw.desc b/package/gnome2/straw/straw.desc
similarity index 100%
rename from package/gnome24/straw/straw.desc
rename to package/gnome2/straw/straw.desc
diff --git a/package/gnome24/totem/totem.cache b/package/gnome2/totem/totem.cache
similarity index 100%
rename from package/gnome24/totem/totem.cache
rename to package/gnome2/totem/totem.cache
diff --git a/package/gnome24/totem/totem.conf b/package/gnome2/totem/totem.conf
similarity index 100%
rename from package/gnome24/totem/totem.conf
rename to package/gnome2/totem/totem.conf
diff --git a/package/gnome24/totem/totem.desc b/package/gnome2/totem/totem.desc
similarity index 100%
rename from package/gnome24/totem/totem.desc
rename to package/gnome2/totem/totem.desc
diff --git a/package/gnome24/vte/vte.cache b/package/gnome2/vte/vte.cache
similarity index 100%
rename from package/gnome24/vte/vte.cache
rename to package/gnome2/vte/vte.cache
diff --git a/package/gnome24/vte/vte.conf b/package/gnome2/vte/vte.conf
similarity index 100%
rename from package/gnome24/vte/vte.conf
rename to package/gnome2/vte/vte.conf
diff --git a/package/gnome24/vte/vte.desc b/package/gnome2/vte/vte.desc
similarity index 100%
rename from package/gnome24/vte/vte.desc
rename to package/gnome2/vte/vte.desc
diff --git a/package/gnome24/yelp/yelp.cache b/package/gnome2/yelp/yelp.cache
similarity index 100%
rename from package/gnome24/yelp/yelp.cache
rename to package/gnome2/yelp/yelp.cache
diff --git a/package/gnome24/yelp/yelp.conf b/package/gnome2/yelp/yelp.conf
similarity index 100%
rename from package/gnome24/yelp/yelp.conf
rename to package/gnome2/yelp/yelp.conf
diff --git a/package/gnome24/yelp/yelp.desc b/package/gnome2/yelp/yelp.desc
similarity index 100%
rename from package/gnome24/yelp/yelp.desc
rename to package/gnome2/yelp/yelp.desc
diff --git a/package/gnome24/zenity/zenity.cache b/package/gnome2/zenity/zenity.cache
similarity index 100%
rename from package/gnome24/zenity/zenity.cache
rename to package/gnome2/zenity/zenity.cache
diff --git a/package/gnome24/zenity/zenity.conf b/package/gnome2/zenity/zenity.conf
similarity index 100%
rename from package/gnome24/zenity/zenity.conf
rename to package/gnome2/zenity/zenity.conf
diff --git a/package/gnome24/zenity/zenity.desc b/package/gnome2/zenity/zenity.desc
similarity index 100%
rename from package/gnome24/zenity/zenity.desc
rename to package/gnome2/zenity/zenity.desc