diff --git a/debian/_base/applications/abakus/debian/cdbs/debian-tde.mk b/debian/_base/applications/development/kdbg/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/abakus/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/development/kdbg/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/abakus/debian/cdbs/versions.pl b/debian/_base/applications/development/kdbg/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/abakus/debian/cdbs/versions.pl
rename to debian/_base/applications/development/kdbg/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kdbg/debian/changelog b/debian/_base/applications/development/kdbg/debian/changelog
similarity index 100%
rename from debian/_base/applications/kdbg/debian/changelog
rename to debian/_base/applications/development/kdbg/debian/changelog
diff --git a/debian/_base/applications/abakus/debian/compat b/debian/_base/applications/development/kdbg/debian/compat
similarity index 100%
rename from debian/_base/applications/abakus/debian/compat
rename to debian/_base/applications/development/kdbg/debian/compat
diff --git a/debian/_base/applications/kdbg/debian/control b/debian/_base/applications/development/kdbg/debian/control
similarity index 100%
rename from debian/_base/applications/kdbg/debian/control
rename to debian/_base/applications/development/kdbg/debian/control
diff --git a/debian/_base/applications/kdbg/debian/copyright b/debian/_base/applications/development/kdbg/debian/copyright
similarity index 100%
rename from debian/_base/applications/kdbg/debian/copyright
rename to debian/_base/applications/development/kdbg/debian/copyright
diff --git a/debian/_base/applications/kdbg/debian/doc-base b/debian/_base/applications/development/kdbg/debian/doc-base
similarity index 100%
rename from debian/_base/applications/kdbg/debian/doc-base
rename to debian/_base/applications/development/kdbg/debian/doc-base
diff --git a/debian/_base/applications/kdbg/debian/docs b/debian/_base/applications/development/kdbg/debian/docs
similarity index 100%
rename from debian/_base/applications/kdbg/debian/docs
rename to debian/_base/applications/development/kdbg/debian/docs
diff --git a/debian/_base/applications/kdbg/debian/install b/debian/_base/applications/development/kdbg/debian/install
similarity index 100%
rename from debian/_base/applications/kdbg/debian/install
rename to debian/_base/applications/development/kdbg/debian/install
diff --git a/debian/_base/applications/kdbg/debian/menu b/debian/_base/applications/development/kdbg/debian/menu
similarity index 100%
rename from debian/_base/applications/kdbg/debian/menu
rename to debian/_base/applications/development/kdbg/debian/menu
diff --git a/debian/_base/applications/kdbg/debian/rules b/debian/_base/applications/development/kdbg/debian/rules
similarity index 100%
rename from debian/_base/applications/kdbg/debian/rules
rename to debian/_base/applications/development/kdbg/debian/rules
diff --git a/debian/_base/applications/abakus/debian/source/format b/debian/_base/applications/development/kdbg/debian/source/format
similarity index 100%
rename from debian/_base/applications/abakus/debian/source/format
rename to debian/_base/applications/development/kdbg/debian/source/format
diff --git a/debian/_base/applications/abakus/debian/source/options b/debian/_base/applications/development/kdbg/debian/source/options
similarity index 100%
rename from debian/_base/applications/abakus/debian/source/options
rename to debian/_base/applications/development/kdbg/debian/source/options
diff --git a/debian/_base/applications/amarok/debian/cdbs/debian-tde.mk b/debian/_base/applications/development/kdiff3/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/amarok/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/development/kdiff3/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/amarok/debian/cdbs/versions.pl b/debian/_base/applications/development/kdiff3/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/amarok/debian/cdbs/versions.pl
rename to debian/_base/applications/development/kdiff3/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kdiff3/debian/changelog b/debian/_base/applications/development/kdiff3/debian/changelog
similarity index 100%
rename from debian/_base/applications/kdiff3/debian/changelog
rename to debian/_base/applications/development/kdiff3/debian/changelog
diff --git a/debian/_base/applications/amarok/debian/compat b/debian/_base/applications/development/kdiff3/debian/compat
similarity index 100%
rename from debian/_base/applications/amarok/debian/compat
rename to debian/_base/applications/development/kdiff3/debian/compat
diff --git a/debian/_base/applications/kdiff3/debian/control b/debian/_base/applications/development/kdiff3/debian/control
similarity index 100%
rename from debian/_base/applications/kdiff3/debian/control
rename to debian/_base/applications/development/kdiff3/debian/control
diff --git a/debian/_base/applications/kdiff3/debian/copyright b/debian/_base/applications/development/kdiff3/debian/copyright
similarity index 100%
rename from debian/_base/applications/kdiff3/debian/copyright
rename to debian/_base/applications/development/kdiff3/debian/copyright
diff --git a/debian/_base/applications/abakus/debian/docs b/debian/_base/applications/development/kdiff3/debian/docs
similarity index 100%
rename from debian/_base/applications/abakus/debian/docs
rename to debian/_base/applications/development/kdiff3/debian/docs
diff --git a/debian/_base/applications/kdiff3/debian/kdiff3-trinity-doc.doc-base b/debian/_base/applications/development/kdiff3/debian/kdiff3-trinity-doc.doc-base
similarity index 100%
rename from debian/_base/applications/kdiff3/debian/kdiff3-trinity-doc.doc-base
rename to debian/_base/applications/development/kdiff3/debian/kdiff3-trinity-doc.doc-base
diff --git a/debian/_base/applications/kdiff3/debian/kdiff3-trinity-doc.install b/debian/_base/applications/development/kdiff3/debian/kdiff3-trinity-doc.install
similarity index 100%
rename from debian/_base/applications/kdiff3/debian/kdiff3-trinity-doc.install
rename to debian/_base/applications/development/kdiff3/debian/kdiff3-trinity-doc.install
diff --git a/debian/_base/applications/kdiff3/debian/kdiff3-trinity-doc.links b/debian/_base/applications/development/kdiff3/debian/kdiff3-trinity-doc.links
similarity index 100%
rename from debian/_base/applications/kdiff3/debian/kdiff3-trinity-doc.links
rename to debian/_base/applications/development/kdiff3/debian/kdiff3-trinity-doc.links
diff --git a/debian/_base/applications/kdiff3/debian/kdiff3-trinity.install b/debian/_base/applications/development/kdiff3/debian/kdiff3-trinity.install
similarity index 100%
rename from debian/_base/applications/kdiff3/debian/kdiff3-trinity.install
rename to debian/_base/applications/development/kdiff3/debian/kdiff3-trinity.install
diff --git a/debian/_base/applications/kbarcode/debian/patches/.gitignore b/debian/_base/applications/development/kdiff3/debian/patches/.gitignore
similarity index 100%
rename from debian/_base/applications/kbarcode/debian/patches/.gitignore
rename to debian/_base/applications/development/kdiff3/debian/patches/.gitignore
diff --git a/debian/_base/applications/basket/debian/rules b/debian/_base/applications/development/kdiff3/debian/rules
similarity index 100%
rename from debian/_base/applications/basket/debian/rules
rename to debian/_base/applications/development/kdiff3/debian/rules
diff --git a/debian/_base/applications/amarok/debian/source/format b/debian/_base/applications/development/kdiff3/debian/source/format
similarity index 100%
rename from debian/_base/applications/amarok/debian/source/format
rename to debian/_base/applications/development/kdiff3/debian/source/format
diff --git a/debian/_base/applications/amarok/debian/source/options b/debian/_base/applications/development/kdiff3/debian/source/options
similarity index 100%
rename from debian/_base/applications/amarok/debian/source/options
rename to debian/_base/applications/development/kdiff3/debian/source/options
diff --git a/debian/_base/applications/basket/debian/cdbs/debian-tde.mk b/debian/_base/applications/development/kpicosim/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/basket/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/development/kpicosim/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/basket/debian/cdbs/versions.pl b/debian/_base/applications/development/kpicosim/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/basket/debian/cdbs/versions.pl
rename to debian/_base/applications/development/kpicosim/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kpicosim/debian/changelog b/debian/_base/applications/development/kpicosim/debian/changelog
similarity index 100%
rename from debian/_base/applications/kpicosim/debian/changelog
rename to debian/_base/applications/development/kpicosim/debian/changelog
diff --git a/debian/_base/applications/basket/debian/compat b/debian/_base/applications/development/kpicosim/debian/compat
similarity index 100%
rename from debian/_base/applications/basket/debian/compat
rename to debian/_base/applications/development/kpicosim/debian/compat
diff --git a/debian/_base/applications/kpicosim/debian/control b/debian/_base/applications/development/kpicosim/debian/control
similarity index 100%
rename from debian/_base/applications/kpicosim/debian/control
rename to debian/_base/applications/development/kpicosim/debian/control
diff --git a/debian/_base/applications/kpicosim/debian/copyright b/debian/_base/applications/development/kpicosim/debian/copyright
similarity index 100%
rename from debian/_base/applications/kpicosim/debian/copyright
rename to debian/_base/applications/development/kpicosim/debian/copyright
diff --git a/debian/_base/applications/kaffeine-mozilla/debian/docs b/debian/_base/applications/development/kpicosim/debian/docs
similarity index 100%
rename from debian/_base/applications/kaffeine-mozilla/debian/docs
rename to debian/_base/applications/development/kpicosim/debian/docs
diff --git a/debian/_base/applications/kpicosim/debian/kpicosim-trinity.links b/debian/_base/applications/development/kpicosim/debian/kpicosim-trinity.links
similarity index 100%
rename from debian/_base/applications/kpicosim/debian/kpicosim-trinity.links
rename to debian/_base/applications/development/kpicosim/debian/kpicosim-trinity.links
diff --git a/debian/_base/applications/kpicosim/debian/kpicosim-trinity.menu b/debian/_base/applications/development/kpicosim/debian/kpicosim-trinity.menu
similarity index 100%
rename from debian/_base/applications/kpicosim/debian/kpicosim-trinity.menu
rename to debian/_base/applications/development/kpicosim/debian/kpicosim-trinity.menu
diff --git a/debian/_base/applications/codeine/debian/rules b/debian/_base/applications/development/kpicosim/debian/rules
similarity index 100%
rename from debian/_base/applications/codeine/debian/rules
rename to debian/_base/applications/development/kpicosim/debian/rules
diff --git a/debian/_base/applications/basket/debian/source/format b/debian/_base/applications/development/kpicosim/debian/source/format
similarity index 100%
rename from debian/_base/applications/basket/debian/source/format
rename to debian/_base/applications/development/kpicosim/debian/source/format
diff --git a/debian/_base/applications/basket/debian/source/options b/debian/_base/applications/development/kpicosim/debian/source/options
similarity index 100%
rename from debian/_base/applications/basket/debian/source/options
rename to debian/_base/applications/development/kpicosim/debian/source/options
diff --git a/debian/_base/applications/bibletime/debian/cdbs/debian-tde.mk b/debian/_base/applications/development/kscope/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/bibletime/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/development/kscope/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/bibletime/debian/cdbs/versions.pl b/debian/_base/applications/development/kscope/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/bibletime/debian/cdbs/versions.pl
rename to debian/_base/applications/development/kscope/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kscope/debian/changelog b/debian/_base/applications/development/kscope/debian/changelog
similarity index 100%
rename from debian/_base/applications/kscope/debian/changelog
rename to debian/_base/applications/development/kscope/debian/changelog
diff --git a/debian/_base/applications/bibletime/debian/compat b/debian/_base/applications/development/kscope/debian/compat
similarity index 100%
rename from debian/_base/applications/bibletime/debian/compat
rename to debian/_base/applications/development/kscope/debian/compat
diff --git a/debian/_base/applications/kscope/debian/control b/debian/_base/applications/development/kscope/debian/control
similarity index 100%
rename from debian/_base/applications/kscope/debian/control
rename to debian/_base/applications/development/kscope/debian/control
diff --git a/debian/_base/applications/kscope/debian/copyright b/debian/_base/applications/development/kscope/debian/copyright
similarity index 100%
rename from debian/_base/applications/kscope/debian/copyright
rename to debian/_base/applications/development/kscope/debian/copyright
diff --git a/debian/_base/applications/kscope/debian/docs b/debian/_base/applications/development/kscope/debian/docs
similarity index 100%
rename from debian/_base/applications/kscope/debian/docs
rename to debian/_base/applications/development/kscope/debian/docs
diff --git a/debian/_base/applications/kscope/debian/patches/04_am_maintainer_mode.diff b/debian/_base/applications/development/kscope/debian/patches/04_am_maintainer_mode.diff
similarity index 100%
rename from debian/_base/applications/kscope/debian/patches/04_am_maintainer_mode.diff
rename to debian/_base/applications/development/kscope/debian/patches/04_am_maintainer_mode.diff
diff --git a/debian/_base/applications/kscope/debian/patches/06_disable_no_undefined.diff b/debian/_base/applications/development/kscope/debian/patches/06_disable_no_undefined.diff
similarity index 100%
rename from debian/_base/applications/kscope/debian/patches/06_disable_no_undefined.diff
rename to debian/_base/applications/development/kscope/debian/patches/06_disable_no_undefined.diff
diff --git a/debian/_base/applications/kscope/debian/patches/series b/debian/_base/applications/development/kscope/debian/patches/series
similarity index 100%
rename from debian/_base/applications/kscope/debian/patches/series
rename to debian/_base/applications/development/kscope/debian/patches/series
diff --git a/debian/_base/applications/gwenview-i18n/debian/rules b/debian/_base/applications/development/kscope/debian/rules
similarity index 100%
rename from debian/_base/applications/gwenview-i18n/debian/rules
rename to debian/_base/applications/development/kscope/debian/rules
diff --git a/debian/_base/applications/bibletime/debian/source/format b/debian/_base/applications/development/kscope/debian/source/format
similarity index 100%
rename from debian/_base/applications/bibletime/debian/source/format
rename to debian/_base/applications/development/kscope/debian/source/format
diff --git a/debian/_base/applications/bibletime/debian/source/options b/debian/_base/applications/development/kscope/debian/source/options
similarity index 100%
rename from debian/_base/applications/bibletime/debian/source/options
rename to debian/_base/applications/development/kscope/debian/source/options
diff --git a/debian/_base/applications/codeine/debian/cdbs/debian-tde.mk b/debian/_base/applications/development/ktechlab/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/codeine/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/development/ktechlab/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/codeine/debian/cdbs/versions.pl b/debian/_base/applications/development/ktechlab/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/codeine/debian/cdbs/versions.pl
rename to debian/_base/applications/development/ktechlab/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/ktechlab/debian/changelog b/debian/_base/applications/development/ktechlab/debian/changelog
similarity index 100%
rename from debian/_base/applications/ktechlab/debian/changelog
rename to debian/_base/applications/development/ktechlab/debian/changelog
diff --git a/debian/_base/applications/codeine/debian/compat b/debian/_base/applications/development/ktechlab/debian/compat
similarity index 100%
rename from debian/_base/applications/codeine/debian/compat
rename to debian/_base/applications/development/ktechlab/debian/compat
diff --git a/debian/_base/applications/ktechlab/debian/control b/debian/_base/applications/development/ktechlab/debian/control
similarity index 100%
rename from debian/_base/applications/ktechlab/debian/control
rename to debian/_base/applications/development/ktechlab/debian/control
diff --git a/debian/_base/applications/ktechlab/debian/copyright b/debian/_base/applications/development/ktechlab/debian/copyright
similarity index 100%
rename from debian/_base/applications/ktechlab/debian/copyright
rename to debian/_base/applications/development/ktechlab/debian/copyright
diff --git a/debian/_base/applications/kile/debian/docs b/debian/_base/applications/development/ktechlab/debian/docs
similarity index 100%
rename from debian/_base/applications/kile/debian/docs
rename to debian/_base/applications/development/ktechlab/debian/docs
diff --git a/debian/_base/applications/ktechlab/debian/install b/debian/_base/applications/development/ktechlab/debian/install
similarity index 100%
rename from debian/_base/applications/ktechlab/debian/install
rename to debian/_base/applications/development/ktechlab/debian/install
diff --git a/debian/_base/applications/ktechlab/debian/menu b/debian/_base/applications/development/ktechlab/debian/menu
similarity index 100%
rename from debian/_base/applications/ktechlab/debian/menu
rename to debian/_base/applications/development/ktechlab/debian/menu
diff --git a/debian/_base/applications/kchmviewer/debian/patches/.gitignore b/debian/_base/applications/development/ktechlab/debian/patches/.gitignore
similarity index 100%
rename from debian/_base/applications/kchmviewer/debian/patches/.gitignore
rename to debian/_base/applications/development/ktechlab/debian/patches/.gitignore
diff --git a/debian/_base/applications/ktechlab/debian/rules b/debian/_base/applications/development/ktechlab/debian/rules
similarity index 100%
rename from debian/_base/applications/ktechlab/debian/rules
rename to debian/_base/applications/development/ktechlab/debian/rules
diff --git a/debian/_base/applications/codeine/debian/source/format b/debian/_base/applications/development/ktechlab/debian/source/format
similarity index 100%
rename from debian/_base/applications/codeine/debian/source/format
rename to debian/_base/applications/development/ktechlab/debian/source/format
diff --git a/debian/_base/applications/codeine/debian/source/options b/debian/_base/applications/development/ktechlab/debian/source/options
similarity index 100%
rename from debian/_base/applications/codeine/debian/source/options
rename to debian/_base/applications/development/ktechlab/debian/source/options
diff --git a/debian/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk b/debian/_base/applications/development/kxmleditor/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/development/kxmleditor/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl b/debian/_base/applications/development/kxmleditor/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl
rename to debian/_base/applications/development/kxmleditor/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kxmleditor/debian/changelog b/debian/_base/applications/development/kxmleditor/debian/changelog
similarity index 100%
rename from debian/_base/applications/kxmleditor/debian/changelog
rename to debian/_base/applications/development/kxmleditor/debian/changelog
diff --git a/debian/_base/applications/compizconfig-backend-tdeconfig/debian/compat b/debian/_base/applications/development/kxmleditor/debian/compat
similarity index 100%
rename from debian/_base/applications/compizconfig-backend-tdeconfig/debian/compat
rename to debian/_base/applications/development/kxmleditor/debian/compat
diff --git a/debian/_base/applications/kxmleditor/debian/control b/debian/_base/applications/development/kxmleditor/debian/control
similarity index 100%
rename from debian/_base/applications/kxmleditor/debian/control
rename to debian/_base/applications/development/kxmleditor/debian/control
diff --git a/debian/_base/applications/kxmleditor/debian/copyright b/debian/_base/applications/development/kxmleditor/debian/copyright
similarity index 100%
rename from debian/_base/applications/kxmleditor/debian/copyright
rename to debian/_base/applications/development/kxmleditor/debian/copyright
diff --git a/debian/_base/applications/kasablanca/debian/docs b/debian/_base/applications/development/kxmleditor/debian/docs
similarity index 100%
rename from debian/_base/applications/kasablanca/debian/docs
rename to debian/_base/applications/development/kxmleditor/debian/docs
diff --git a/debian/_base/applications/kxmleditor/debian/menu b/debian/_base/applications/development/kxmleditor/debian/menu
similarity index 100%
rename from debian/_base/applications/kxmleditor/debian/menu
rename to debian/_base/applications/development/kxmleditor/debian/menu
diff --git a/debian/_base/applications/codeine/debian/patches/series b/debian/_base/applications/development/kxmleditor/debian/patches/series
similarity index 100%
rename from debian/_base/applications/codeine/debian/patches/series
rename to debian/_base/applications/development/kxmleditor/debian/patches/series
diff --git a/debian/_base/applications/compizconfig-backend-tdeconfig/debian/rules b/debian/_base/applications/development/kxmleditor/debian/rules
similarity index 100%
rename from debian/_base/applications/compizconfig-backend-tdeconfig/debian/rules
rename to debian/_base/applications/development/kxmleditor/debian/rules
diff --git a/debian/_base/applications/compizconfig-backend-tdeconfig/debian/source/format b/debian/_base/applications/development/kxmleditor/debian/source/format
similarity index 100%
rename from debian/_base/applications/compizconfig-backend-tdeconfig/debian/source/format
rename to debian/_base/applications/development/kxmleditor/debian/source/format
diff --git a/debian/_base/applications/compizconfig-backend-tdeconfig/debian/source/options b/debian/_base/applications/development/kxmleditor/debian/source/options
similarity index 100%
rename from debian/_base/applications/compizconfig-backend-tdeconfig/debian/source/options
rename to debian/_base/applications/development/kxmleditor/debian/source/options
diff --git a/debian/_base/applications/digikam/debian/cdbs/debian-tde.mk b/debian/_base/applications/development/piklab/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/digikam/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/development/piklab/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/digikam/debian/cdbs/versions.pl b/debian/_base/applications/development/piklab/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/digikam/debian/cdbs/versions.pl
rename to debian/_base/applications/development/piklab/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/piklab/debian/changelog b/debian/_base/applications/development/piklab/debian/changelog
similarity index 100%
rename from debian/_base/applications/piklab/debian/changelog
rename to debian/_base/applications/development/piklab/debian/changelog
diff --git a/debian/_base/applications/desktop-effects-tde/debian/compat b/debian/_base/applications/development/piklab/debian/compat
similarity index 100%
rename from debian/_base/applications/desktop-effects-tde/debian/compat
rename to debian/_base/applications/development/piklab/debian/compat
diff --git a/debian/_base/applications/piklab/debian/control b/debian/_base/applications/development/piklab/debian/control
similarity index 100%
rename from debian/_base/applications/piklab/debian/control
rename to debian/_base/applications/development/piklab/debian/control
diff --git a/debian/_base/applications/piklab/debian/copyright b/debian/_base/applications/development/piklab/debian/copyright
similarity index 100%
rename from debian/_base/applications/piklab/debian/copyright
rename to debian/_base/applications/development/piklab/debian/copyright
diff --git a/debian/_base/applications/kiosktool/debian/docs b/debian/_base/applications/development/piklab/debian/docs
similarity index 100%
rename from debian/_base/applications/kiosktool/debian/docs
rename to debian/_base/applications/development/piklab/debian/docs
diff --git a/debian/_base/applications/piklab/debian/install b/debian/_base/applications/development/piklab/debian/install
similarity index 100%
rename from debian/_base/applications/piklab/debian/install
rename to debian/_base/applications/development/piklab/debian/install
diff --git a/debian/_base/applications/piklab/debian/menu b/debian/_base/applications/development/piklab/debian/menu
similarity index 100%
rename from debian/_base/applications/piklab/debian/menu
rename to debian/_base/applications/development/piklab/debian/menu
diff --git a/debian/_base/applications/abakus/debian/patches/series b/debian/_base/applications/development/piklab/debian/patches/series
similarity index 100%
rename from debian/_base/applications/abakus/debian/patches/series
rename to debian/_base/applications/development/piklab/debian/patches/series
diff --git a/debian/_base/applications/piklab/debian/piklab.desktop b/debian/_base/applications/development/piklab/debian/piklab.desktop
similarity index 100%
rename from debian/_base/applications/piklab/debian/piklab.desktop
rename to debian/_base/applications/development/piklab/debian/piklab.desktop
diff --git a/debian/_base/applications/piklab/debian/piklab.sng b/debian/_base/applications/development/piklab/debian/piklab.sng
similarity index 100%
rename from debian/_base/applications/piklab/debian/piklab.sng
rename to debian/_base/applications/development/piklab/debian/piklab.sng
diff --git a/debian/_base/applications/piklab/debian/piklab.xpm b/debian/_base/applications/development/piklab/debian/piklab.xpm
similarity index 100%
rename from debian/_base/applications/piklab/debian/piklab.xpm
rename to debian/_base/applications/development/piklab/debian/piklab.xpm
diff --git a/debian/_base/applications/piklab/debian/piklab48.xpm b/debian/_base/applications/development/piklab/debian/piklab48.xpm
similarity index 100%
rename from debian/_base/applications/piklab/debian/piklab48.xpm
rename to debian/_base/applications/development/piklab/debian/piklab48.xpm
diff --git a/debian/_base/applications/piklab/debian/rules b/debian/_base/applications/development/piklab/debian/rules
similarity index 100%
rename from debian/_base/applications/piklab/debian/rules
rename to debian/_base/applications/development/piklab/debian/rules
diff --git a/debian/_base/applications/desktop-effects-tde/debian/source/format b/debian/_base/applications/development/piklab/debian/source/format
similarity index 100%
rename from debian/_base/applications/desktop-effects-tde/debian/source/format
rename to debian/_base/applications/development/piklab/debian/source/format
diff --git a/debian/_base/applications/desktop-effects-tde/debian/source/options b/debian/_base/applications/development/piklab/debian/source/options
similarity index 100%
rename from debian/_base/applications/desktop-effects-tde/debian/source/options
rename to debian/_base/applications/development/piklab/debian/source/options
diff --git a/debian/_base/applications/dolphin/debian/cdbs/debian-tde.mk b/debian/_base/applications/development/tdesvn/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/dolphin/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/development/tdesvn/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/dolphin/debian/cdbs/versions.pl b/debian/_base/applications/development/tdesvn/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/dolphin/debian/cdbs/versions.pl
rename to debian/_base/applications/development/tdesvn/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/tdesvn/debian/changelog b/debian/_base/applications/development/tdesvn/debian/changelog
similarity index 100%
rename from debian/_base/applications/tdesvn/debian/changelog
rename to debian/_base/applications/development/tdesvn/debian/changelog
diff --git a/debian/_base/applications/digikam/debian/compat b/debian/_base/applications/development/tdesvn/debian/compat
similarity index 100%
rename from debian/_base/applications/digikam/debian/compat
rename to debian/_base/applications/development/tdesvn/debian/compat
diff --git a/debian/_base/applications/tdesvn/debian/control b/debian/_base/applications/development/tdesvn/debian/control
similarity index 100%
rename from debian/_base/applications/tdesvn/debian/control
rename to debian/_base/applications/development/tdesvn/debian/control
diff --git a/debian/_base/applications/tdesvn/debian/copyright b/debian/_base/applications/development/tdesvn/debian/copyright
similarity index 100%
rename from debian/_base/applications/tdesvn/debian/copyright
rename to debian/_base/applications/development/tdesvn/debian/copyright
diff --git a/debian/_base/applications/kbarcode/debian/docs b/debian/_base/applications/development/tdesvn/debian/docs
similarity index 100%
rename from debian/_base/applications/kbarcode/debian/docs
rename to debian/_base/applications/development/tdesvn/debian/docs
diff --git a/debian/_base/applications/tdesvn/debian/icons/tdesvn.xpm b/debian/_base/applications/development/tdesvn/debian/icons/tdesvn.xpm
similarity index 100%
rename from debian/_base/applications/tdesvn/debian/icons/tdesvn.xpm
rename to debian/_base/applications/development/tdesvn/debian/icons/tdesvn.xpm
diff --git a/debian/_base/applications/tdesvn/debian/libsvnqt-trinity-dev.install b/debian/_base/applications/development/tdesvn/debian/libsvnqt-trinity-dev.install
similarity index 100%
rename from debian/_base/applications/tdesvn/debian/libsvnqt-trinity-dev.install
rename to debian/_base/applications/development/tdesvn/debian/libsvnqt-trinity-dev.install
diff --git a/debian/_base/applications/tdesvn/debian/libsvnqt4-trinity.install b/debian/_base/applications/development/tdesvn/debian/libsvnqt4-trinity.install
similarity index 100%
rename from debian/_base/applications/tdesvn/debian/libsvnqt4-trinity.install
rename to debian/_base/applications/development/tdesvn/debian/libsvnqt4-trinity.install
diff --git a/debian/_base/applications/tdesvn/debian/man/tdesvn.1 b/debian/_base/applications/development/tdesvn/debian/man/tdesvn.1
similarity index 100%
rename from debian/_base/applications/tdesvn/debian/man/tdesvn.1
rename to debian/_base/applications/development/tdesvn/debian/man/tdesvn.1
diff --git a/debian/_base/applications/tdesvn/debian/man/tdesvnaskpass.1 b/debian/_base/applications/development/tdesvn/debian/man/tdesvnaskpass.1
similarity index 100%
rename from debian/_base/applications/tdesvn/debian/man/tdesvnaskpass.1
rename to debian/_base/applications/development/tdesvn/debian/man/tdesvnaskpass.1
diff --git a/debian/_base/applications/amarok/debian/patches/series b/debian/_base/applications/development/tdesvn/debian/patches/series
similarity index 100%
rename from debian/_base/applications/amarok/debian/patches/series
rename to debian/_base/applications/development/tdesvn/debian/patches/series
diff --git a/debian/_base/applications/tdesvn/debian/rules b/debian/_base/applications/development/tdesvn/debian/rules
similarity index 100%
rename from debian/_base/applications/tdesvn/debian/rules
rename to debian/_base/applications/development/tdesvn/debian/rules
diff --git a/debian/_base/applications/digikam/debian/source/format b/debian/_base/applications/development/tdesvn/debian/source/format
similarity index 100%
rename from debian/_base/applications/digikam/debian/source/format
rename to debian/_base/applications/development/tdesvn/debian/source/format
diff --git a/debian/_base/applications/digikam/debian/source/options b/debian/_base/applications/development/tdesvn/debian/source/options
similarity index 100%
rename from debian/_base/applications/digikam/debian/source/options
rename to debian/_base/applications/development/tdesvn/debian/source/options
diff --git a/debian/_base/applications/tdesvn/debian/tdesvn-tdeio-plugins-trinity.install b/debian/_base/applications/development/tdesvn/debian/tdesvn-tdeio-plugins-trinity.install
similarity index 100%
rename from debian/_base/applications/tdesvn/debian/tdesvn-tdeio-plugins-trinity.install
rename to debian/_base/applications/development/tdesvn/debian/tdesvn-tdeio-plugins-trinity.install
diff --git a/debian/_base/applications/tdesvn/debian/tdesvn-trinity.install b/debian/_base/applications/development/tdesvn/debian/tdesvn-trinity.install
similarity index 100%
rename from debian/_base/applications/tdesvn/debian/tdesvn-trinity.install
rename to debian/_base/applications/development/tdesvn/debian/tdesvn-trinity.install
diff --git a/debian/_base/applications/tdesvn/debian/tdesvn-trinity.manpages b/debian/_base/applications/development/tdesvn/debian/tdesvn-trinity.manpages
similarity index 100%
rename from debian/_base/applications/tdesvn/debian/tdesvn-trinity.manpages
rename to debian/_base/applications/development/tdesvn/debian/tdesvn-trinity.manpages
diff --git a/debian/_base/applications/tdesvn/debian/tdesvn-trinity.menu b/debian/_base/applications/development/tdesvn/debian/tdesvn-trinity.menu
similarity index 100%
rename from debian/_base/applications/tdesvn/debian/tdesvn-trinity.menu
rename to debian/_base/applications/development/tdesvn/debian/tdesvn-trinity.menu
diff --git a/debian/_base/applications/tdesvn/debian/watch b/debian/_base/applications/development/tdesvn/debian/watch
similarity index 100%
rename from debian/_base/applications/tdesvn/debian/watch
rename to debian/_base/applications/development/tdesvn/debian/watch
diff --git a/debian/_base/applications/filelight/debian/cdbs/debian-tde.mk b/debian/_base/applications/games/knights/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/filelight/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/games/knights/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/filelight/debian/cdbs/versions.pl b/debian/_base/applications/games/knights/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/filelight/debian/cdbs/versions.pl
rename to debian/_base/applications/games/knights/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/knights/debian/changelog b/debian/_base/applications/games/knights/debian/changelog
similarity index 100%
rename from debian/_base/applications/knights/debian/changelog
rename to debian/_base/applications/games/knights/debian/changelog
diff --git a/debian/_base/applications/dolphin/debian/compat b/debian/_base/applications/games/knights/debian/compat
similarity index 100%
rename from debian/_base/applications/dolphin/debian/compat
rename to debian/_base/applications/games/knights/debian/compat
diff --git a/debian/_base/applications/knights/debian/control b/debian/_base/applications/games/knights/debian/control
similarity index 100%
rename from debian/_base/applications/knights/debian/control
rename to debian/_base/applications/games/knights/debian/control
diff --git a/debian/_base/applications/knights/debian/copyright b/debian/_base/applications/games/knights/debian/copyright
similarity index 100%
rename from debian/_base/applications/knights/debian/copyright
rename to debian/_base/applications/games/knights/debian/copyright
diff --git a/debian/_base/applications/kmyfirewall/debian/docs b/debian/_base/applications/games/knights/debian/docs
similarity index 100%
rename from debian/_base/applications/kmyfirewall/debian/docs
rename to debian/_base/applications/games/knights/debian/docs
diff --git a/debian/_base/applications/knights/debian/knights-themepack-trinity.install b/debian/_base/applications/games/knights/debian/knights-themepack-trinity.install
similarity index 100%
rename from debian/_base/applications/knights/debian/knights-themepack-trinity.install
rename to debian/_base/applications/games/knights/debian/knights-themepack-trinity.install
diff --git a/debian/_base/applications/knights/debian/knights-trinity.install b/debian/_base/applications/games/knights/debian/knights-trinity.install
similarity index 100%
rename from debian/_base/applications/knights/debian/knights-trinity.install
rename to debian/_base/applications/games/knights/debian/knights-trinity.install
diff --git a/debian/_base/applications/knights/debian/knights.xpm b/debian/_base/applications/games/knights/debian/knights.xpm
similarity index 100%
rename from debian/_base/applications/knights/debian/knights.xpm
rename to debian/_base/applications/games/knights/debian/knights.xpm
diff --git a/debian/_base/applications/knights/debian/menu b/debian/_base/applications/games/knights/debian/menu
similarity index 100%
rename from debian/_base/applications/knights/debian/menu
rename to debian/_base/applications/games/knights/debian/menu
diff --git a/debian/_base/applications/kdiff3/debian/patches/.gitignore b/debian/_base/applications/games/knights/debian/patches/.gitignore
similarity index 100%
rename from debian/_base/applications/kdiff3/debian/patches/.gitignore
rename to debian/_base/applications/games/knights/debian/patches/.gitignore
diff --git a/debian/_base/applications/knights/debian/rules b/debian/_base/applications/games/knights/debian/rules
similarity index 100%
rename from debian/_base/applications/knights/debian/rules
rename to debian/_base/applications/games/knights/debian/rules
diff --git a/debian/_base/applications/dolphin/debian/source/format b/debian/_base/applications/games/knights/debian/source/format
similarity index 100%
rename from debian/_base/applications/dolphin/debian/source/format
rename to debian/_base/applications/games/knights/debian/source/format
diff --git a/debian/_base/applications/dolphin/debian/source/options b/debian/_base/applications/games/knights/debian/source/options
similarity index 100%
rename from debian/_base/applications/dolphin/debian/source/options
rename to debian/_base/applications/games/knights/debian/source/options
diff --git a/debian/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk b/debian/_base/applications/games/tdepacman/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/games/tdepacman/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/gtk-qt-engine/debian/cdbs/versions.pl b/debian/_base/applications/games/tdepacman/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/gtk-qt-engine/debian/cdbs/versions.pl
rename to debian/_base/applications/games/tdepacman/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/tdepacman/debian/changelog b/debian/_base/applications/games/tdepacman/debian/changelog
similarity index 100%
rename from debian/_base/applications/tdepacman/debian/changelog
rename to debian/_base/applications/games/tdepacman/debian/changelog
diff --git a/debian/_base/applications/filelight/debian/compat b/debian/_base/applications/games/tdepacman/debian/compat
similarity index 100%
rename from debian/_base/applications/filelight/debian/compat
rename to debian/_base/applications/games/tdepacman/debian/compat
diff --git a/debian/_base/applications/tdepacman/debian/control b/debian/_base/applications/games/tdepacman/debian/control
similarity index 100%
rename from debian/_base/applications/tdepacman/debian/control
rename to debian/_base/applications/games/tdepacman/debian/control
diff --git a/debian/_base/applications/tdepacman/debian/copyright b/debian/_base/applications/games/tdepacman/debian/copyright
similarity index 100%
rename from debian/_base/applications/tdepacman/debian/copyright
rename to debian/_base/applications/games/tdepacman/debian/copyright
diff --git a/debian/_base/applications/kcpuload/debian/docs b/debian/_base/applications/games/tdepacman/debian/docs
similarity index 100%
rename from debian/_base/applications/kcpuload/debian/docs
rename to debian/_base/applications/games/tdepacman/debian/docs
diff --git a/debian/_base/applications/basket/debian/patches/series b/debian/_base/applications/games/tdepacman/debian/patches/series
similarity index 100%
rename from debian/_base/applications/basket/debian/patches/series
rename to debian/_base/applications/games/tdepacman/debian/patches/series
diff --git a/debian/_base/applications/kasablanca/debian/rules b/debian/_base/applications/games/tdepacman/debian/rules
similarity index 100%
rename from debian/_base/applications/kasablanca/debian/rules
rename to debian/_base/applications/games/tdepacman/debian/rules
diff --git a/debian/_base/applications/filelight/debian/source/format b/debian/_base/applications/games/tdepacman/debian/source/format
similarity index 100%
rename from debian/_base/applications/filelight/debian/source/format
rename to debian/_base/applications/games/tdepacman/debian/source/format
diff --git a/debian/_base/applications/filelight/debian/source/options b/debian/_base/applications/games/tdepacman/debian/source/options
similarity index 100%
rename from debian/_base/applications/filelight/debian/source/options
rename to debian/_base/applications/games/tdepacman/debian/source/options
diff --git a/debian/_base/applications/tdepacman/debian/tdepacman-trinity.menu b/debian/_base/applications/games/tdepacman/debian/tdepacman-trinity.menu
similarity index 100%
rename from debian/_base/applications/tdepacman/debian/tdepacman-trinity.menu
rename to debian/_base/applications/games/tdepacman/debian/tdepacman-trinity.menu
diff --git a/debian/_base/applications/digikam/debian/NEWS b/debian/_base/applications/graphics/digikam/debian/NEWS
similarity index 100%
rename from debian/_base/applications/digikam/debian/NEWS
rename to debian/_base/applications/graphics/digikam/debian/NEWS
diff --git a/debian/_base/applications/digikam/debian/README.Debian b/debian/_base/applications/graphics/digikam/debian/README.Debian
similarity index 100%
rename from debian/_base/applications/digikam/debian/README.Debian
rename to debian/_base/applications/graphics/digikam/debian/README.Debian
diff --git a/debian/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk b/debian/_base/applications/graphics/digikam/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/graphics/digikam/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/gwenview-i18n/debian/cdbs/versions.pl b/debian/_base/applications/graphics/digikam/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/gwenview-i18n/debian/cdbs/versions.pl
rename to debian/_base/applications/graphics/digikam/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/digikam/debian/changelog b/debian/_base/applications/graphics/digikam/debian/changelog
similarity index 100%
rename from debian/_base/applications/digikam/debian/changelog
rename to debian/_base/applications/graphics/digikam/debian/changelog
diff --git a/debian/_base/applications/digikam/debian/clean b/debian/_base/applications/graphics/digikam/debian/clean
similarity index 100%
rename from debian/_base/applications/digikam/debian/clean
rename to debian/_base/applications/graphics/digikam/debian/clean
diff --git a/debian/_base/applications/fusion-icon/debian/compat b/debian/_base/applications/graphics/digikam/debian/compat
similarity index 100%
rename from debian/_base/applications/fusion-icon/debian/compat
rename to debian/_base/applications/graphics/digikam/debian/compat
diff --git a/debian/_base/applications/digikam/debian/control b/debian/_base/applications/graphics/digikam/debian/control
similarity index 100%
rename from debian/_base/applications/digikam/debian/control
rename to debian/_base/applications/graphics/digikam/debian/control
diff --git a/debian/_base/applications/digikam/debian/copyright b/debian/_base/applications/graphics/digikam/debian/copyright
similarity index 100%
rename from debian/_base/applications/digikam/debian/copyright
rename to debian/_base/applications/graphics/digikam/debian/copyright
diff --git a/debian/_base/applications/digikam/debian/digikam-trinity-doc.install b/debian/_base/applications/graphics/digikam/debian/digikam-trinity-doc.install
similarity index 100%
rename from debian/_base/applications/digikam/debian/digikam-trinity-doc.install
rename to debian/_base/applications/graphics/digikam/debian/digikam-trinity-doc.install
diff --git a/debian/_base/applications/digikam/debian/digikam-trinity.install b/debian/_base/applications/graphics/digikam/debian/digikam-trinity.install
similarity index 100%
rename from debian/_base/applications/digikam/debian/digikam-trinity.install
rename to debian/_base/applications/graphics/digikam/debian/digikam-trinity.install
diff --git a/debian/_base/applications/digikam/debian/digikam-trinity.lintian-overrides b/debian/_base/applications/graphics/digikam/debian/digikam-trinity.lintian-overrides
similarity index 100%
rename from debian/_base/applications/digikam/debian/digikam-trinity.lintian-overrides
rename to debian/_base/applications/graphics/digikam/debian/digikam-trinity.lintian-overrides
diff --git a/debian/_base/applications/digikam/debian/digikam-trinity.manpages b/debian/_base/applications/graphics/digikam/debian/digikam-trinity.manpages
similarity index 100%
rename from debian/_base/applications/digikam/debian/digikam-trinity.manpages
rename to debian/_base/applications/graphics/digikam/debian/digikam-trinity.manpages
diff --git a/debian/_base/applications/digikam/debian/digikam-trinity.menu b/debian/_base/applications/graphics/digikam/debian/digikam-trinity.menu
similarity index 100%
rename from debian/_base/applications/digikam/debian/digikam-trinity.menu
rename to debian/_base/applications/graphics/digikam/debian/digikam-trinity.menu
diff --git a/debian/_base/applications/digikam/debian/digikam.manpage b/debian/_base/applications/graphics/digikam/debian/digikam.manpage
similarity index 100%
rename from debian/_base/applications/digikam/debian/digikam.manpage
rename to debian/_base/applications/graphics/digikam/debian/digikam.manpage
diff --git a/debian/_base/applications/bibletime/debian/patches/series b/debian/_base/applications/graphics/digikam/debian/patches/series
similarity index 100%
rename from debian/_base/applications/bibletime/debian/patches/series
rename to debian/_base/applications/graphics/digikam/debian/patches/series
diff --git a/debian/_base/applications/digikam/debian/rules b/debian/_base/applications/graphics/digikam/debian/rules
similarity index 100%
rename from debian/_base/applications/digikam/debian/rules
rename to debian/_base/applications/graphics/digikam/debian/rules
diff --git a/debian/_base/applications/digikam/debian/showfoto-trinity.install b/debian/_base/applications/graphics/digikam/debian/showfoto-trinity.install
similarity index 100%
rename from debian/_base/applications/digikam/debian/showfoto-trinity.install
rename to debian/_base/applications/graphics/digikam/debian/showfoto-trinity.install
diff --git a/debian/_base/applications/digikam/debian/showfoto-trinity.manpage b/debian/_base/applications/graphics/digikam/debian/showfoto-trinity.manpage
similarity index 100%
rename from debian/_base/applications/digikam/debian/showfoto-trinity.manpage
rename to debian/_base/applications/graphics/digikam/debian/showfoto-trinity.manpage
diff --git a/debian/_base/applications/digikam/debian/showfoto-trinity.manpages b/debian/_base/applications/graphics/digikam/debian/showfoto-trinity.manpages
similarity index 100%
rename from debian/_base/applications/digikam/debian/showfoto-trinity.manpages
rename to debian/_base/applications/graphics/digikam/debian/showfoto-trinity.manpages
diff --git a/debian/_base/applications/digikam/debian/showfoto-trinity.menu b/debian/_base/applications/graphics/digikam/debian/showfoto-trinity.menu
similarity index 100%
rename from debian/_base/applications/digikam/debian/showfoto-trinity.menu
rename to debian/_base/applications/graphics/digikam/debian/showfoto-trinity.menu
diff --git a/debian/_base/applications/fusion-icon/debian/source/format b/debian/_base/applications/graphics/digikam/debian/source/format
similarity index 100%
rename from debian/_base/applications/fusion-icon/debian/source/format
rename to debian/_base/applications/graphics/digikam/debian/source/format
diff --git a/debian/_base/applications/fusion-icon/debian/source/options b/debian/_base/applications/graphics/digikam/debian/source/options
similarity index 100%
rename from debian/_base/applications/fusion-icon/debian/source/options
rename to debian/_base/applications/graphics/digikam/debian/source/options
diff --git a/debian/_base/applications/digikam/debian/watch b/debian/_base/applications/graphics/digikam/debian/watch
similarity index 100%
rename from debian/_base/applications/digikam/debian/watch
rename to debian/_base/applications/graphics/digikam/debian/watch
diff --git a/debian/_base/applications/digikam/debian/xpm.d/digikam-16.xpm b/debian/_base/applications/graphics/digikam/debian/xpm.d/digikam-16.xpm
similarity index 100%
rename from debian/_base/applications/digikam/debian/xpm.d/digikam-16.xpm
rename to debian/_base/applications/graphics/digikam/debian/xpm.d/digikam-16.xpm
diff --git a/debian/_base/applications/digikam/debian/xpm.d/digikam.xpm b/debian/_base/applications/graphics/digikam/debian/xpm.d/digikam.xpm
similarity index 100%
rename from debian/_base/applications/digikam/debian/xpm.d/digikam.xpm
rename to debian/_base/applications/graphics/digikam/debian/xpm.d/digikam.xpm
diff --git a/debian/_base/applications/digikam/debian/xpm.d/showfoto-16.xpm b/debian/_base/applications/graphics/digikam/debian/xpm.d/showfoto-16.xpm
similarity index 100%
rename from debian/_base/applications/digikam/debian/xpm.d/showfoto-16.xpm
rename to debian/_base/applications/graphics/digikam/debian/xpm.d/showfoto-16.xpm
diff --git a/debian/_base/applications/digikam/debian/xpm.d/showfoto.xpm b/debian/_base/applications/graphics/digikam/debian/xpm.d/showfoto.xpm
similarity index 100%
rename from debian/_base/applications/digikam/debian/xpm.d/showfoto.xpm
rename to debian/_base/applications/graphics/digikam/debian/xpm.d/showfoto.xpm
diff --git a/debian/_base/applications/gwenview/debian/cdbs/debian-tde.mk b/debian/_base/applications/graphics/gwenview-i18n/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/gwenview/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/graphics/gwenview-i18n/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/gwenview/debian/cdbs/versions.pl b/debian/_base/applications/graphics/gwenview-i18n/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/gwenview/debian/cdbs/versions.pl
rename to debian/_base/applications/graphics/gwenview-i18n/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/gwenview-i18n/debian/changelog b/debian/_base/applications/graphics/gwenview-i18n/debian/changelog
similarity index 100%
rename from debian/_base/applications/gwenview-i18n/debian/changelog
rename to debian/_base/applications/graphics/gwenview-i18n/debian/changelog
diff --git a/debian/_base/applications/gtk-qt-engine/debian/compat b/debian/_base/applications/graphics/gwenview-i18n/debian/compat
similarity index 100%
rename from debian/_base/applications/gtk-qt-engine/debian/compat
rename to debian/_base/applications/graphics/gwenview-i18n/debian/compat
diff --git a/debian/_base/applications/gwenview-i18n/debian/control b/debian/_base/applications/graphics/gwenview-i18n/debian/control
similarity index 100%
rename from debian/_base/applications/gwenview-i18n/debian/control
rename to debian/_base/applications/graphics/gwenview-i18n/debian/control
diff --git a/debian/_base/applications/gwenview-i18n/debian/copyright b/debian/_base/applications/graphics/gwenview-i18n/debian/copyright
similarity index 100%
rename from debian/_base/applications/gwenview-i18n/debian/copyright
rename to debian/_base/applications/graphics/gwenview-i18n/debian/copyright
diff --git a/debian/_base/applications/compizconfig-backend-tdeconfig/debian/patches/series b/debian/_base/applications/graphics/gwenview-i18n/debian/patches/series
similarity index 100%
rename from debian/_base/applications/compizconfig-backend-tdeconfig/debian/patches/series
rename to debian/_base/applications/graphics/gwenview-i18n/debian/patches/series
diff --git a/debian/_base/applications/kaffeine/debian/rules b/debian/_base/applications/graphics/gwenview-i18n/debian/rules
similarity index 100%
rename from debian/_base/applications/kaffeine/debian/rules
rename to debian/_base/applications/graphics/gwenview-i18n/debian/rules
diff --git a/debian/_base/applications/gtk-qt-engine/debian/source/format b/debian/_base/applications/graphics/gwenview-i18n/debian/source/format
similarity index 100%
rename from debian/_base/applications/gtk-qt-engine/debian/source/format
rename to debian/_base/applications/graphics/gwenview-i18n/debian/source/format
diff --git a/debian/_base/applications/gtk-qt-engine/debian/source/options b/debian/_base/applications/graphics/gwenview-i18n/debian/source/options
similarity index 100%
rename from debian/_base/applications/gtk-qt-engine/debian/source/options
rename to debian/_base/applications/graphics/gwenview-i18n/debian/source/options
diff --git a/debian/_base/applications/k3b/debian/cdbs/debian-tde.mk b/debian/_base/applications/graphics/gwenview/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/k3b/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/graphics/gwenview/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/k3b/debian/cdbs/versions.pl b/debian/_base/applications/graphics/gwenview/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/k3b/debian/cdbs/versions.pl
rename to debian/_base/applications/graphics/gwenview/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/gwenview/debian/changelog b/debian/_base/applications/graphics/gwenview/debian/changelog
similarity index 100%
rename from debian/_base/applications/gwenview/debian/changelog
rename to debian/_base/applications/graphics/gwenview/debian/changelog
diff --git a/debian/_base/applications/gtk3-tqt-engine/debian/compat b/debian/_base/applications/graphics/gwenview/debian/compat
similarity index 100%
rename from debian/_base/applications/gtk3-tqt-engine/debian/compat
rename to debian/_base/applications/graphics/gwenview/debian/compat
diff --git a/debian/_base/applications/gwenview/debian/control b/debian/_base/applications/graphics/gwenview/debian/control
similarity index 100%
rename from debian/_base/applications/gwenview/debian/control
rename to debian/_base/applications/graphics/gwenview/debian/control
diff --git a/debian/_base/applications/gwenview/debian/copyright b/debian/_base/applications/graphics/gwenview/debian/copyright
similarity index 100%
rename from debian/_base/applications/gwenview/debian/copyright
rename to debian/_base/applications/graphics/gwenview/debian/copyright
diff --git a/debian/_base/applications/gwenview/debian/gwenview-trinity.doc-base b/debian/_base/applications/graphics/gwenview/debian/gwenview-trinity.doc-base
similarity index 100%
rename from debian/_base/applications/gwenview/debian/gwenview-trinity.doc-base
rename to debian/_base/applications/graphics/gwenview/debian/gwenview-trinity.doc-base
diff --git a/debian/_base/applications/gwenview/debian/gwenview.lintian b/debian/_base/applications/graphics/gwenview/debian/gwenview.lintian
similarity index 100%
rename from debian/_base/applications/gwenview/debian/gwenview.lintian
rename to debian/_base/applications/graphics/gwenview/debian/gwenview.lintian
diff --git a/debian/_base/applications/gwenview/debian/gwenview.xpm b/debian/_base/applications/graphics/gwenview/debian/gwenview.xpm
similarity index 100%
rename from debian/_base/applications/gwenview/debian/gwenview.xpm
rename to debian/_base/applications/graphics/gwenview/debian/gwenview.xpm
diff --git a/debian/_base/applications/gwenview/debian/menu b/debian/_base/applications/graphics/gwenview/debian/menu
similarity index 100%
rename from debian/_base/applications/gwenview/debian/menu
rename to debian/_base/applications/graphics/gwenview/debian/menu
diff --git a/debian/_base/applications/digikam/debian/patches/series b/debian/_base/applications/graphics/gwenview/debian/patches/series
similarity index 100%
rename from debian/_base/applications/digikam/debian/patches/series
rename to debian/_base/applications/graphics/gwenview/debian/patches/series
diff --git a/debian/_base/applications/gwenview/debian/rules b/debian/_base/applications/graphics/gwenview/debian/rules
similarity index 100%
rename from debian/_base/applications/gwenview/debian/rules
rename to debian/_base/applications/graphics/gwenview/debian/rules
diff --git a/debian/_base/applications/gtk3-tqt-engine/debian/source/format b/debian/_base/applications/graphics/gwenview/debian/source/format
similarity index 100%
rename from debian/_base/applications/gtk3-tqt-engine/debian/source/format
rename to debian/_base/applications/graphics/gwenview/debian/source/format
diff --git a/debian/_base/applications/gtk3-tqt-engine/debian/source/options b/debian/_base/applications/graphics/gwenview/debian/source/options
similarity index 100%
rename from debian/_base/applications/gtk3-tqt-engine/debian/source/options
rename to debian/_base/applications/graphics/gwenview/debian/source/options
diff --git a/debian/_base/applications/ksquirrel/debian/README.debian b/debian/_base/applications/graphics/ksquirrel/debian/README.debian
similarity index 100%
rename from debian/_base/applications/ksquirrel/debian/README.debian
rename to debian/_base/applications/graphics/ksquirrel/debian/README.debian
diff --git a/debian/_base/applications/ksquirrel/debian/changelog b/debian/_base/applications/graphics/ksquirrel/debian/changelog
similarity index 100%
rename from debian/_base/applications/ksquirrel/debian/changelog
rename to debian/_base/applications/graphics/ksquirrel/debian/changelog
diff --git a/debian/_base/applications/gwenview-i18n/debian/compat b/debian/_base/applications/graphics/ksquirrel/debian/compat
similarity index 100%
rename from debian/_base/applications/gwenview-i18n/debian/compat
rename to debian/_base/applications/graphics/ksquirrel/debian/compat
diff --git a/debian/_base/applications/ksquirrel/debian/control b/debian/_base/applications/graphics/ksquirrel/debian/control
similarity index 100%
rename from debian/_base/applications/ksquirrel/debian/control
rename to debian/_base/applications/graphics/ksquirrel/debian/control
diff --git a/debian/_base/applications/ksquirrel/debian/copyright b/debian/_base/applications/graphics/ksquirrel/debian/copyright
similarity index 100%
rename from debian/_base/applications/ksquirrel/debian/copyright
rename to debian/_base/applications/graphics/ksquirrel/debian/copyright
diff --git a/debian/_base/applications/knights/debian/docs b/debian/_base/applications/graphics/ksquirrel/debian/docs
similarity index 100%
rename from debian/_base/applications/knights/debian/docs
rename to debian/_base/applications/graphics/ksquirrel/debian/docs
diff --git a/debian/_base/applications/ksquirrel/debian/ksquirrel-libs-configurator.1 b/debian/_base/applications/graphics/ksquirrel/debian/ksquirrel-libs-configurator.1
similarity index 100%
rename from debian/_base/applications/ksquirrel/debian/ksquirrel-libs-configurator.1
rename to debian/_base/applications/graphics/ksquirrel/debian/ksquirrel-libs-configurator.1
diff --git a/debian/_base/applications/kile/debian/patches/.gitignore b/debian/_base/applications/graphics/ksquirrel/debian/patches/.gitignore
similarity index 100%
rename from debian/_base/applications/kile/debian/patches/.gitignore
rename to debian/_base/applications/graphics/ksquirrel/debian/patches/.gitignore
diff --git a/debian/_base/applications/ksquirrel/debian/rules b/debian/_base/applications/graphics/ksquirrel/debian/rules
similarity index 100%
rename from debian/_base/applications/ksquirrel/debian/rules
rename to debian/_base/applications/graphics/ksquirrel/debian/rules
diff --git a/debian/_base/applications/gwenview-i18n/debian/source/format b/debian/_base/applications/graphics/ksquirrel/debian/source/format
similarity index 100%
rename from debian/_base/applications/gwenview-i18n/debian/source/format
rename to debian/_base/applications/graphics/ksquirrel/debian/source/format
diff --git a/debian/_base/applications/gwenview-i18n/debian/source/options b/debian/_base/applications/graphics/ksquirrel/debian/source/options
similarity index 100%
rename from debian/_base/applications/gwenview-i18n/debian/source/options
rename to debian/_base/applications/graphics/ksquirrel/debian/source/options
diff --git a/debian/_base/applications/ksquirrel/debian/watch b/debian/_base/applications/graphics/ksquirrel/debian/watch
similarity index 100%
rename from debian/_base/applications/ksquirrel/debian/watch
rename to debian/_base/applications/graphics/ksquirrel/debian/watch
diff --git a/debian/_base/applications/k9copy/debian/cdbs/debian-tde.mk b/debian/_base/applications/graphics/potracegui/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/k9copy/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/graphics/potracegui/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/k9copy/debian/cdbs/versions.pl b/debian/_base/applications/graphics/potracegui/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/k9copy/debian/cdbs/versions.pl
rename to debian/_base/applications/graphics/potracegui/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/potracegui/debian/changelog b/debian/_base/applications/graphics/potracegui/debian/changelog
similarity index 100%
rename from debian/_base/applications/potracegui/debian/changelog
rename to debian/_base/applications/graphics/potracegui/debian/changelog
diff --git a/debian/_base/applications/gwenview/debian/compat b/debian/_base/applications/graphics/potracegui/debian/compat
similarity index 100%
rename from debian/_base/applications/gwenview/debian/compat
rename to debian/_base/applications/graphics/potracegui/debian/compat
diff --git a/debian/_base/applications/potracegui/debian/control b/debian/_base/applications/graphics/potracegui/debian/control
similarity index 100%
rename from debian/_base/applications/potracegui/debian/control
rename to debian/_base/applications/graphics/potracegui/debian/control
diff --git a/debian/_base/applications/potracegui/debian/copyright b/debian/_base/applications/graphics/potracegui/debian/copyright
similarity index 100%
rename from debian/_base/applications/potracegui/debian/copyright
rename to debian/_base/applications/graphics/potracegui/debian/copyright
diff --git a/debian/_base/applications/potracegui/debian/docs b/debian/_base/applications/graphics/potracegui/debian/docs
similarity index 100%
rename from debian/_base/applications/potracegui/debian/docs
rename to debian/_base/applications/graphics/potracegui/debian/docs
diff --git a/debian/_base/applications/potracegui/debian/potracegui-trinity.menu b/debian/_base/applications/graphics/potracegui/debian/potracegui-trinity.menu
similarity index 100%
rename from debian/_base/applications/potracegui/debian/potracegui-trinity.menu
rename to debian/_base/applications/graphics/potracegui/debian/potracegui-trinity.menu
diff --git a/debian/_base/applications/kbiff/debian/rules b/debian/_base/applications/graphics/potracegui/debian/rules
similarity index 100%
rename from debian/_base/applications/kbiff/debian/rules
rename to debian/_base/applications/graphics/potracegui/debian/rules
diff --git a/debian/_base/applications/gwenview/debian/source/format b/debian/_base/applications/graphics/potracegui/debian/source/format
similarity index 100%
rename from debian/_base/applications/gwenview/debian/source/format
rename to debian/_base/applications/graphics/potracegui/debian/source/format
diff --git a/debian/_base/applications/gwenview/debian/source/options b/debian/_base/applications/graphics/potracegui/debian/source/options
similarity index 100%
rename from debian/_base/applications/gwenview/debian/source/options
rename to debian/_base/applications/graphics/potracegui/debian/source/options
diff --git a/debian/_base/applications/kaffeine-mozilla/debian/cdbs/debian-tde.mk b/debian/_base/applications/internet/kasablanca/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kaffeine-mozilla/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/internet/kasablanca/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kaffeine-mozilla/debian/cdbs/versions.pl b/debian/_base/applications/internet/kasablanca/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kaffeine-mozilla/debian/cdbs/versions.pl
rename to debian/_base/applications/internet/kasablanca/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kasablanca/debian/changelog b/debian/_base/applications/internet/kasablanca/debian/changelog
similarity index 100%
rename from debian/_base/applications/kasablanca/debian/changelog
rename to debian/_base/applications/internet/kasablanca/debian/changelog
diff --git a/debian/_base/applications/k3b-i18n/debian/compat b/debian/_base/applications/internet/kasablanca/debian/compat
similarity index 100%
rename from debian/_base/applications/k3b-i18n/debian/compat
rename to debian/_base/applications/internet/kasablanca/debian/compat
diff --git a/debian/_base/applications/kasablanca/debian/control b/debian/_base/applications/internet/kasablanca/debian/control
similarity index 100%
rename from debian/_base/applications/kasablanca/debian/control
rename to debian/_base/applications/internet/kasablanca/debian/control
diff --git a/debian/_base/applications/kasablanca/debian/copyright b/debian/_base/applications/internet/kasablanca/debian/copyright
similarity index 100%
rename from debian/_base/applications/kasablanca/debian/copyright
rename to debian/_base/applications/internet/kasablanca/debian/copyright
diff --git a/debian/_base/applications/keep/debian/docs b/debian/_base/applications/internet/kasablanca/debian/docs
similarity index 100%
rename from debian/_base/applications/keep/debian/docs
rename to debian/_base/applications/internet/kasablanca/debian/docs
diff --git a/debian/_base/applications/kasablanca/debian/kasablanca-trinity.menu b/debian/_base/applications/internet/kasablanca/debian/kasablanca-trinity.menu
similarity index 100%
rename from debian/_base/applications/kasablanca/debian/kasablanca-trinity.menu
rename to debian/_base/applications/internet/kasablanca/debian/kasablanca-trinity.menu
diff --git a/debian/_base/applications/dolphin/debian/patches/series b/debian/_base/applications/internet/kasablanca/debian/patches/series
similarity index 100%
rename from debian/_base/applications/dolphin/debian/patches/series
rename to debian/_base/applications/internet/kasablanca/debian/patches/series
diff --git a/debian/_base/applications/kbarcode/debian/rules b/debian/_base/applications/internet/kasablanca/debian/rules
similarity index 100%
rename from debian/_base/applications/kbarcode/debian/rules
rename to debian/_base/applications/internet/kasablanca/debian/rules
diff --git a/debian/_base/applications/k3b-i18n/debian/source/format b/debian/_base/applications/internet/kasablanca/debian/source/format
similarity index 100%
rename from debian/_base/applications/k3b-i18n/debian/source/format
rename to debian/_base/applications/internet/kasablanca/debian/source/format
diff --git a/debian/_base/applications/k3b-i18n/debian/source/options b/debian/_base/applications/internet/kasablanca/debian/source/options
similarity index 100%
rename from debian/_base/applications/k3b-i18n/debian/source/options
rename to debian/_base/applications/internet/kasablanca/debian/source/options
diff --git a/debian/_base/applications/kaffeine/debian/cdbs/debian-tde.mk b/debian/_base/applications/internet/kbiff/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kaffeine/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/internet/kbiff/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kaffeine/debian/cdbs/versions.pl b/debian/_base/applications/internet/kbiff/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kaffeine/debian/cdbs/versions.pl
rename to debian/_base/applications/internet/kbiff/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kbiff/debian/changelog b/debian/_base/applications/internet/kbiff/debian/changelog
similarity index 100%
rename from debian/_base/applications/kbiff/debian/changelog
rename to debian/_base/applications/internet/kbiff/debian/changelog
diff --git a/debian/_base/applications/k3b/debian/compat b/debian/_base/applications/internet/kbiff/debian/compat
similarity index 100%
rename from debian/_base/applications/k3b/debian/compat
rename to debian/_base/applications/internet/kbiff/debian/compat
diff --git a/debian/_base/applications/kbiff/debian/control b/debian/_base/applications/internet/kbiff/debian/control
similarity index 100%
rename from debian/_base/applications/kbiff/debian/control
rename to debian/_base/applications/internet/kbiff/debian/control
diff --git a/debian/_base/applications/kbiff/debian/copyright b/debian/_base/applications/internet/kbiff/debian/copyright
similarity index 100%
rename from debian/_base/applications/kbiff/debian/copyright
rename to debian/_base/applications/internet/kbiff/debian/copyright
diff --git a/debian/_base/applications/basket/debian/dirs b/debian/_base/applications/internet/kbiff/debian/dirs
similarity index 100%
rename from debian/_base/applications/basket/debian/dirs
rename to debian/_base/applications/internet/kbiff/debian/dirs
diff --git a/debian/_base/applications/basket/debian/docs b/debian/_base/applications/internet/kbiff/debian/docs
similarity index 100%
rename from debian/_base/applications/basket/debian/docs
rename to debian/_base/applications/internet/kbiff/debian/docs
diff --git a/debian/_base/applications/kbiff/debian/menu b/debian/_base/applications/internet/kbiff/debian/menu
similarity index 100%
rename from debian/_base/applications/kbiff/debian/menu
rename to debian/_base/applications/internet/kbiff/debian/menu
diff --git a/debian/_base/applications/kbookreader/debian/rules b/debian/_base/applications/internet/kbiff/debian/rules
similarity index 100%
rename from debian/_base/applications/kbookreader/debian/rules
rename to debian/_base/applications/internet/kbiff/debian/rules
diff --git a/debian/_base/applications/k3b/debian/source/format b/debian/_base/applications/internet/kbiff/debian/source/format
similarity index 100%
rename from debian/_base/applications/k3b/debian/source/format
rename to debian/_base/applications/internet/kbiff/debian/source/format
diff --git a/debian/_base/applications/k3b/debian/source/options b/debian/_base/applications/internet/kbiff/debian/source/options
similarity index 100%
rename from debian/_base/applications/k3b/debian/source/options
rename to debian/_base/applications/internet/kbiff/debian/source/options
diff --git a/debian/_base/applications/kbarcode/debian/README.Debian b/debian/_base/applications/internet/kftpgrabber/debian/README.Debian
similarity index 100%
rename from debian/_base/applications/kbarcode/debian/README.Debian
rename to debian/_base/applications/internet/kftpgrabber/debian/README.Debian
diff --git a/debian/_base/applications/kasablanca/debian/cdbs/debian-tde.mk b/debian/_base/applications/internet/kftpgrabber/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kasablanca/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/internet/kftpgrabber/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kasablanca/debian/cdbs/versions.pl b/debian/_base/applications/internet/kftpgrabber/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kasablanca/debian/cdbs/versions.pl
rename to debian/_base/applications/internet/kftpgrabber/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kftpgrabber/debian/changelog b/debian/_base/applications/internet/kftpgrabber/debian/changelog
similarity index 100%
rename from debian/_base/applications/kftpgrabber/debian/changelog
rename to debian/_base/applications/internet/kftpgrabber/debian/changelog
diff --git a/debian/_base/applications/kaffeine-mozilla/debian/compat b/debian/_base/applications/internet/kftpgrabber/debian/compat
similarity index 100%
rename from debian/_base/applications/kaffeine-mozilla/debian/compat
rename to debian/_base/applications/internet/kftpgrabber/debian/compat
diff --git a/debian/_base/applications/kftpgrabber/debian/control b/debian/_base/applications/internet/kftpgrabber/debian/control
similarity index 100%
rename from debian/_base/applications/kftpgrabber/debian/control
rename to debian/_base/applications/internet/kftpgrabber/debian/control
diff --git a/debian/_base/applications/kftpgrabber/debian/copyright b/debian/_base/applications/internet/kftpgrabber/debian/copyright
similarity index 100%
rename from debian/_base/applications/kftpgrabber/debian/copyright
rename to debian/_base/applications/internet/kftpgrabber/debian/copyright
diff --git a/debian/_base/applications/kftpgrabber/debian/docs b/debian/_base/applications/internet/kftpgrabber/debian/docs
similarity index 100%
rename from debian/_base/applications/kftpgrabber/debian/docs
rename to debian/_base/applications/internet/kftpgrabber/debian/docs
diff --git a/debian/_base/applications/kftpgrabber/debian/kftpgrabber-trinity.lintian-overrides b/debian/_base/applications/internet/kftpgrabber/debian/kftpgrabber-trinity.lintian-overrides
similarity index 100%
rename from debian/_base/applications/kftpgrabber/debian/kftpgrabber-trinity.lintian-overrides
rename to debian/_base/applications/internet/kftpgrabber/debian/kftpgrabber-trinity.lintian-overrides
diff --git a/debian/_base/applications/kftpgrabber/debian/kftpgrabber.xml b/debian/_base/applications/internet/kftpgrabber/debian/kftpgrabber.xml
similarity index 100%
rename from debian/_base/applications/kftpgrabber/debian/kftpgrabber.xml
rename to debian/_base/applications/internet/kftpgrabber/debian/kftpgrabber.xml
diff --git a/debian/_base/applications/kftpgrabber/debian/manpages b/debian/_base/applications/internet/kftpgrabber/debian/manpages
similarity index 100%
rename from debian/_base/applications/kftpgrabber/debian/manpages
rename to debian/_base/applications/internet/kftpgrabber/debian/manpages
diff --git a/debian/_base/applications/kftpgrabber/debian/menu b/debian/_base/applications/internet/kftpgrabber/debian/menu
similarity index 100%
rename from debian/_base/applications/kftpgrabber/debian/menu
rename to debian/_base/applications/internet/kftpgrabber/debian/menu
diff --git a/debian/_base/applications/filelight/debian/patches/series b/debian/_base/applications/internet/kftpgrabber/debian/patches/series
similarity index 100%
rename from debian/_base/applications/filelight/debian/patches/series
rename to debian/_base/applications/internet/kftpgrabber/debian/patches/series
diff --git a/debian/_base/applications/kftpgrabber/debian/rules b/debian/_base/applications/internet/kftpgrabber/debian/rules
similarity index 100%
rename from debian/_base/applications/kftpgrabber/debian/rules
rename to debian/_base/applications/internet/kftpgrabber/debian/rules
diff --git a/debian/_base/applications/k9copy/debian/source/format b/debian/_base/applications/internet/kftpgrabber/debian/source/format
similarity index 100%
rename from debian/_base/applications/k9copy/debian/source/format
rename to debian/_base/applications/internet/kftpgrabber/debian/source/format
diff --git a/debian/_base/applications/k9copy/debian/source/options b/debian/_base/applications/internet/kftpgrabber/debian/source/options
similarity index 100%
rename from debian/_base/applications/k9copy/debian/source/options
rename to debian/_base/applications/internet/kftpgrabber/debian/source/options
diff --git a/debian/_base/applications/kftpgrabber/debian/watch b/debian/_base/applications/internet/kftpgrabber/debian/watch
similarity index 100%
rename from debian/_base/applications/kftpgrabber/debian/watch
rename to debian/_base/applications/internet/kftpgrabber/debian/watch
diff --git a/debian/_base/applications/katapult/debian/cdbs/debian-tde.mk b/debian/_base/applications/internet/knmap/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/katapult/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/internet/knmap/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/katapult/debian/cdbs/versions.pl b/debian/_base/applications/internet/knmap/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/katapult/debian/cdbs/versions.pl
rename to debian/_base/applications/internet/knmap/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/knmap/debian/changelog b/debian/_base/applications/internet/knmap/debian/changelog
similarity index 100%
rename from debian/_base/applications/knmap/debian/changelog
rename to debian/_base/applications/internet/knmap/debian/changelog
diff --git a/debian/_base/applications/kaffeine/debian/compat b/debian/_base/applications/internet/knmap/debian/compat
similarity index 100%
rename from debian/_base/applications/kaffeine/debian/compat
rename to debian/_base/applications/internet/knmap/debian/compat
diff --git a/debian/_base/applications/knmap/debian/control b/debian/_base/applications/internet/knmap/debian/control
similarity index 100%
rename from debian/_base/applications/knmap/debian/control
rename to debian/_base/applications/internet/knmap/debian/control
diff --git a/debian/_base/applications/knmap/debian/copyright b/debian/_base/applications/internet/knmap/debian/copyright
similarity index 100%
rename from debian/_base/applications/knmap/debian/copyright
rename to debian/_base/applications/internet/knmap/debian/copyright
diff --git a/debian/_base/applications/kbiff/debian/docs b/debian/_base/applications/internet/knmap/debian/docs
similarity index 100%
rename from debian/_base/applications/kbiff/debian/docs
rename to debian/_base/applications/internet/knmap/debian/docs
diff --git a/debian/_base/applications/fusion-icon/debian/patches/series b/debian/_base/applications/internet/knmap/debian/patches/series
similarity index 100%
rename from debian/_base/applications/fusion-icon/debian/patches/series
rename to debian/_base/applications/internet/knmap/debian/patches/series
diff --git a/debian/_base/applications/kcmautostart/debian/rules b/debian/_base/applications/internet/knmap/debian/rules
similarity index 100%
rename from debian/_base/applications/kcmautostart/debian/rules
rename to debian/_base/applications/internet/knmap/debian/rules
diff --git a/debian/_base/applications/kaffeine-mozilla/debian/source/format b/debian/_base/applications/internet/knmap/debian/source/format
similarity index 100%
rename from debian/_base/applications/kaffeine-mozilla/debian/source/format
rename to debian/_base/applications/internet/knmap/debian/source/format
diff --git a/debian/_base/applications/kaffeine-mozilla/debian/source/options b/debian/_base/applications/internet/knmap/debian/source/options
similarity index 100%
rename from debian/_base/applications/kaffeine-mozilla/debian/source/options
rename to debian/_base/applications/internet/knmap/debian/source/options
diff --git a/debian/_base/applications/kbarcode/debian/cdbs/debian-tde.mk b/debian/_base/applications/internet/konversation/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kbarcode/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/internet/konversation/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kbarcode/debian/cdbs/versions.pl b/debian/_base/applications/internet/konversation/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kbarcode/debian/cdbs/versions.pl
rename to debian/_base/applications/internet/konversation/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/konversation/debian/changelog b/debian/_base/applications/internet/konversation/debian/changelog
similarity index 100%
rename from debian/_base/applications/konversation/debian/changelog
rename to debian/_base/applications/internet/konversation/debian/changelog
diff --git a/debian/_base/applications/kasablanca/debian/compat b/debian/_base/applications/internet/konversation/debian/compat
similarity index 100%
rename from debian/_base/applications/kasablanca/debian/compat
rename to debian/_base/applications/internet/konversation/debian/compat
diff --git a/debian/_base/applications/konversation/debian/control b/debian/_base/applications/internet/konversation/debian/control
similarity index 100%
rename from debian/_base/applications/konversation/debian/control
rename to debian/_base/applications/internet/konversation/debian/control
diff --git a/debian/_base/applications/konversation/debian/copyright b/debian/_base/applications/internet/konversation/debian/copyright
similarity index 100%
rename from debian/_base/applications/konversation/debian/copyright
rename to debian/_base/applications/internet/konversation/debian/copyright
diff --git a/debian/_base/applications/konversation/debian/konversation-trinity.docs b/debian/_base/applications/internet/konversation/debian/konversation-trinity.docs
similarity index 100%
rename from debian/_base/applications/konversation/debian/konversation-trinity.docs
rename to debian/_base/applications/internet/konversation/debian/konversation-trinity.docs
diff --git a/debian/_base/applications/konversation/debian/konversation-trinity.install b/debian/_base/applications/internet/konversation/debian/konversation-trinity.install
similarity index 100%
rename from debian/_base/applications/konversation/debian/konversation-trinity.install
rename to debian/_base/applications/internet/konversation/debian/konversation-trinity.install
diff --git a/debian/_base/applications/konversation/debian/konversation-trinity.manpages b/debian/_base/applications/internet/konversation/debian/konversation-trinity.manpages
similarity index 100%
rename from debian/_base/applications/konversation/debian/konversation-trinity.manpages
rename to debian/_base/applications/internet/konversation/debian/konversation-trinity.manpages
diff --git a/debian/_base/applications/konversation/debian/konversation-trinity.menu b/debian/_base/applications/internet/konversation/debian/konversation-trinity.menu
similarity index 100%
rename from debian/_base/applications/konversation/debian/konversation-trinity.menu
rename to debian/_base/applications/internet/konversation/debian/konversation-trinity.menu
diff --git a/debian/_base/applications/konversation/debian/konversation16x16.xpm b/debian/_base/applications/internet/konversation/debian/konversation16x16.xpm
similarity index 100%
rename from debian/_base/applications/konversation/debian/konversation16x16.xpm
rename to debian/_base/applications/internet/konversation/debian/konversation16x16.xpm
diff --git a/debian/_base/applications/konversation/debian/konversation32x32.xpm b/debian/_base/applications/internet/konversation/debian/konversation32x32.xpm
similarity index 100%
rename from debian/_base/applications/konversation/debian/konversation32x32.xpm
rename to debian/_base/applications/internet/konversation/debian/konversation32x32.xpm
diff --git a/debian/_base/applications/konversation/debian/man/konversation.1.docbook b/debian/_base/applications/internet/konversation/debian/man/konversation.1.docbook
similarity index 100%
rename from debian/_base/applications/konversation/debian/man/konversation.1.docbook
rename to debian/_base/applications/internet/konversation/debian/man/konversation.1.docbook
diff --git a/debian/_base/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook b/debian/_base/applications/internet/konversation/debian/man/konversationircprotocolhandler.1.docbook
similarity index 100%
rename from debian/_base/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook
rename to debian/_base/applications/internet/konversation/debian/man/konversationircprotocolhandler.1.docbook
diff --git a/debian/_base/applications/knights/debian/patches/.gitignore b/debian/_base/applications/internet/konversation/debian/patches/.gitignore
similarity index 100%
rename from debian/_base/applications/knights/debian/patches/.gitignore
rename to debian/_base/applications/internet/konversation/debian/patches/.gitignore
diff --git a/debian/_base/applications/konversation/debian/rules b/debian/_base/applications/internet/konversation/debian/rules
similarity index 100%
rename from debian/_base/applications/konversation/debian/rules
rename to debian/_base/applications/internet/konversation/debian/rules
diff --git a/debian/_base/applications/kaffeine/debian/source/format b/debian/_base/applications/internet/konversation/debian/source/format
similarity index 100%
rename from debian/_base/applications/kaffeine/debian/source/format
rename to debian/_base/applications/internet/konversation/debian/source/format
diff --git a/debian/_base/applications/kaffeine/debian/source/options b/debian/_base/applications/internet/konversation/debian/source/options
similarity index 100%
rename from debian/_base/applications/kaffeine/debian/source/options
rename to debian/_base/applications/internet/konversation/debian/source/options
diff --git a/debian/_base/applications/kbfx/debian/cdbs/debian-tde.mk b/debian/_base/applications/internet/kopete-otr/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kbfx/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/internet/kopete-otr/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kbfx/debian/cdbs/versions.pl b/debian/_base/applications/internet/kopete-otr/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kbfx/debian/cdbs/versions.pl
rename to debian/_base/applications/internet/kopete-otr/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kopete-otr/debian/changelog b/debian/_base/applications/internet/kopete-otr/debian/changelog
similarity index 100%
rename from debian/_base/applications/kopete-otr/debian/changelog
rename to debian/_base/applications/internet/kopete-otr/debian/changelog
diff --git a/debian/_base/applications/katapult/debian/compat b/debian/_base/applications/internet/kopete-otr/debian/compat
similarity index 100%
rename from debian/_base/applications/katapult/debian/compat
rename to debian/_base/applications/internet/kopete-otr/debian/compat
diff --git a/debian/_base/applications/kopete-otr/debian/control b/debian/_base/applications/internet/kopete-otr/debian/control
similarity index 100%
rename from debian/_base/applications/kopete-otr/debian/control
rename to debian/_base/applications/internet/kopete-otr/debian/control
diff --git a/debian/_base/applications/kopete-otr/debian/copyright b/debian/_base/applications/internet/kopete-otr/debian/copyright
similarity index 100%
rename from debian/_base/applications/kopete-otr/debian/copyright
rename to debian/_base/applications/internet/kopete-otr/debian/copyright
diff --git a/debian/_base/applications/kcmldap/debian/rules b/debian/_base/applications/internet/kopete-otr/debian/rules
similarity index 100%
rename from debian/_base/applications/kcmldap/debian/rules
rename to debian/_base/applications/internet/kopete-otr/debian/rules
diff --git a/debian/_base/applications/kasablanca/debian/source/format b/debian/_base/applications/internet/kopete-otr/debian/source/format
similarity index 100%
rename from debian/_base/applications/kasablanca/debian/source/format
rename to debian/_base/applications/internet/kopete-otr/debian/source/format
diff --git a/debian/_base/applications/kasablanca/debian/source/options b/debian/_base/applications/internet/kopete-otr/debian/source/options
similarity index 100%
rename from debian/_base/applications/kasablanca/debian/source/options
rename to debian/_base/applications/internet/kopete-otr/debian/source/options
diff --git a/debian/_base/applications/kbibtex/debian/cdbs/debian-tde.mk b/debian/_base/applications/internet/kshowmail/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kbibtex/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/internet/kshowmail/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kbibtex/debian/cdbs/versions.pl b/debian/_base/applications/internet/kshowmail/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kbibtex/debian/cdbs/versions.pl
rename to debian/_base/applications/internet/kshowmail/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kshowmail/debian/changelog b/debian/_base/applications/internet/kshowmail/debian/changelog
similarity index 100%
rename from debian/_base/applications/kshowmail/debian/changelog
rename to debian/_base/applications/internet/kshowmail/debian/changelog
diff --git a/debian/_base/applications/kbarcode/debian/compat b/debian/_base/applications/internet/kshowmail/debian/compat
similarity index 100%
rename from debian/_base/applications/kbarcode/debian/compat
rename to debian/_base/applications/internet/kshowmail/debian/compat
diff --git a/debian/_base/applications/kshowmail/debian/control b/debian/_base/applications/internet/kshowmail/debian/control
similarity index 100%
rename from debian/_base/applications/kshowmail/debian/control
rename to debian/_base/applications/internet/kshowmail/debian/control
diff --git a/debian/_base/applications/kshowmail/debian/copyright b/debian/_base/applications/internet/kshowmail/debian/copyright
similarity index 100%
rename from debian/_base/applications/kshowmail/debian/copyright
rename to debian/_base/applications/internet/kshowmail/debian/copyright
diff --git a/debian/_base/applications/keximdb/debian/docs b/debian/_base/applications/internet/kshowmail/debian/docs
similarity index 100%
rename from debian/_base/applications/keximdb/debian/docs
rename to debian/_base/applications/internet/kshowmail/debian/docs
diff --git a/debian/_base/applications/kshowmail/debian/menu b/debian/_base/applications/internet/kshowmail/debian/menu
similarity index 100%
rename from debian/_base/applications/kshowmail/debian/menu
rename to debian/_base/applications/internet/kshowmail/debian/menu
diff --git a/debian/_base/applications/kbibtex/debian/rules b/debian/_base/applications/internet/kshowmail/debian/rules
similarity index 100%
rename from debian/_base/applications/kbibtex/debian/rules
rename to debian/_base/applications/internet/kshowmail/debian/rules
diff --git a/debian/_base/applications/katapult/debian/source/format b/debian/_base/applications/internet/kshowmail/debian/source/format
similarity index 100%
rename from debian/_base/applications/katapult/debian/source/format
rename to debian/_base/applications/internet/kshowmail/debian/source/format
diff --git a/debian/_base/applications/katapult/debian/source/options b/debian/_base/applications/internet/kshowmail/debian/source/options
similarity index 100%
rename from debian/_base/applications/katapult/debian/source/options
rename to debian/_base/applications/internet/kshowmail/debian/source/options
diff --git a/debian/_base/applications/kbiff/debian/cdbs/debian-tde.mk b/debian/_base/applications/internet/kstreamripper/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kbiff/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/internet/kstreamripper/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kbiff/debian/cdbs/versions.pl b/debian/_base/applications/internet/kstreamripper/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kbiff/debian/cdbs/versions.pl
rename to debian/_base/applications/internet/kstreamripper/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kstreamripper/debian/changelog b/debian/_base/applications/internet/kstreamripper/debian/changelog
similarity index 100%
rename from debian/_base/applications/kstreamripper/debian/changelog
rename to debian/_base/applications/internet/kstreamripper/debian/changelog
diff --git a/debian/_base/applications/kbfx/debian/compat b/debian/_base/applications/internet/kstreamripper/debian/compat
similarity index 100%
rename from debian/_base/applications/kbfx/debian/compat
rename to debian/_base/applications/internet/kstreamripper/debian/compat
diff --git a/debian/_base/applications/kstreamripper/debian/control b/debian/_base/applications/internet/kstreamripper/debian/control
similarity index 100%
rename from debian/_base/applications/kstreamripper/debian/control
rename to debian/_base/applications/internet/kstreamripper/debian/control
diff --git a/debian/_base/applications/kstreamripper/debian/copyright b/debian/_base/applications/internet/kstreamripper/debian/copyright
similarity index 100%
rename from debian/_base/applications/kstreamripper/debian/copyright
rename to debian/_base/applications/internet/kstreamripper/debian/copyright
diff --git a/debian/_base/applications/kstreamripper/debian/dirs b/debian/_base/applications/internet/kstreamripper/debian/dirs
similarity index 100%
rename from debian/_base/applications/kstreamripper/debian/dirs
rename to debian/_base/applications/internet/kstreamripper/debian/dirs
diff --git a/debian/_base/applications/klamav/debian/docs b/debian/_base/applications/internet/kstreamripper/debian/docs
similarity index 100%
rename from debian/_base/applications/klamav/debian/docs
rename to debian/_base/applications/internet/kstreamripper/debian/docs
diff --git a/debian/_base/applications/kstreamripper/debian/kstreamripper-trinity.menu b/debian/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.menu
similarity index 100%
rename from debian/_base/applications/kstreamripper/debian/kstreamripper-trinity.menu
rename to debian/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.menu
diff --git a/debian/_base/applications/kstreamripper/debian/kstreamripper-trinity.postinst b/debian/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postinst
similarity index 100%
rename from debian/_base/applications/kstreamripper/debian/kstreamripper-trinity.postinst
rename to debian/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postinst
diff --git a/debian/_base/applications/kstreamripper/debian/kstreamripper-trinity.postrm b/debian/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postrm
similarity index 100%
rename from debian/_base/applications/kstreamripper/debian/kstreamripper-trinity.postrm
rename to debian/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postrm
diff --git a/debian/_base/applications/kstreamripper/debian/kstreamripper.1 b/debian/_base/applications/internet/kstreamripper/debian/kstreamripper.1
similarity index 100%
rename from debian/_base/applications/kstreamripper/debian/kstreamripper.1
rename to debian/_base/applications/internet/kstreamripper/debian/kstreamripper.1
diff --git a/debian/_base/applications/konversation/debian/patches/.gitignore b/debian/_base/applications/internet/kstreamripper/debian/patches/.gitignore
similarity index 100%
rename from debian/_base/applications/konversation/debian/patches/.gitignore
rename to debian/_base/applications/internet/kstreamripper/debian/patches/.gitignore
diff --git a/debian/_base/applications/kdiff3/debian/rules b/debian/_base/applications/internet/kstreamripper/debian/rules
similarity index 100%
rename from debian/_base/applications/kdiff3/debian/rules
rename to debian/_base/applications/internet/kstreamripper/debian/rules
diff --git a/debian/_base/applications/kbarcode/debian/source/format b/debian/_base/applications/internet/kstreamripper/debian/source/format
similarity index 100%
rename from debian/_base/applications/kbarcode/debian/source/format
rename to debian/_base/applications/internet/kstreamripper/debian/source/format
diff --git a/debian/_base/applications/kbarcode/debian/source/options b/debian/_base/applications/internet/kstreamripper/debian/source/options
similarity index 100%
rename from debian/_base/applications/kbarcode/debian/source/options
rename to debian/_base/applications/internet/kstreamripper/debian/source/options
diff --git a/debian/_base/applications/ktorrent/debian/README.Debian b/debian/_base/applications/internet/ktorrent/debian/README.Debian
similarity index 100%
rename from debian/_base/applications/ktorrent/debian/README.Debian
rename to debian/_base/applications/internet/ktorrent/debian/README.Debian
diff --git a/debian/_base/applications/kbookreader/debian/cdbs/debian-tde.mk b/debian/_base/applications/internet/ktorrent/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kbookreader/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/internet/ktorrent/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kbookreader/debian/cdbs/versions.pl b/debian/_base/applications/internet/ktorrent/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kbookreader/debian/cdbs/versions.pl
rename to debian/_base/applications/internet/ktorrent/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/ktorrent/debian/changelog b/debian/_base/applications/internet/ktorrent/debian/changelog
similarity index 100%
rename from debian/_base/applications/ktorrent/debian/changelog
rename to debian/_base/applications/internet/ktorrent/debian/changelog
diff --git a/debian/_base/applications/kbibtex/debian/compat b/debian/_base/applications/internet/ktorrent/debian/compat
similarity index 100%
rename from debian/_base/applications/kbibtex/debian/compat
rename to debian/_base/applications/internet/ktorrent/debian/compat
diff --git a/debian/_base/applications/ktorrent/debian/control b/debian/_base/applications/internet/ktorrent/debian/control
similarity index 100%
rename from debian/_base/applications/ktorrent/debian/control
rename to debian/_base/applications/internet/ktorrent/debian/control
diff --git a/debian/_base/applications/ktorrent/debian/copyright b/debian/_base/applications/internet/ktorrent/debian/copyright
similarity index 100%
rename from debian/_base/applications/ktorrent/debian/copyright
rename to debian/_base/applications/internet/ktorrent/debian/copyright
diff --git a/debian/_base/applications/ktorrent/debian/ktorrent.1.docbook b/debian/_base/applications/internet/ktorrent/debian/ktorrent.1.docbook
similarity index 100%
rename from debian/_base/applications/ktorrent/debian/ktorrent.1.docbook
rename to debian/_base/applications/internet/ktorrent/debian/ktorrent.1.docbook
diff --git a/debian/_base/applications/gtk-qt-engine/debian/patches/series b/debian/_base/applications/internet/ktorrent/debian/patches/series
similarity index 100%
rename from debian/_base/applications/gtk-qt-engine/debian/patches/series
rename to debian/_base/applications/internet/ktorrent/debian/patches/series
diff --git a/debian/_base/applications/ktorrent/debian/rules b/debian/_base/applications/internet/ktorrent/debian/rules
similarity index 100%
rename from debian/_base/applications/ktorrent/debian/rules
rename to debian/_base/applications/internet/ktorrent/debian/rules
diff --git a/debian/_base/applications/kbfx/debian/source/format b/debian/_base/applications/internet/ktorrent/debian/source/format
similarity index 100%
rename from debian/_base/applications/kbfx/debian/source/format
rename to debian/_base/applications/internet/ktorrent/debian/source/format
diff --git a/debian/_base/applications/kbfx/debian/source/options b/debian/_base/applications/internet/ktorrent/debian/source/options
similarity index 100%
rename from debian/_base/applications/kbfx/debian/source/options
rename to debian/_base/applications/internet/ktorrent/debian/source/options
diff --git a/debian/_base/applications/ktorrent/debian/watch b/debian/_base/applications/internet/ktorrent/debian/watch
similarity index 100%
rename from debian/_base/applications/ktorrent/debian/watch
rename to debian/_base/applications/internet/ktorrent/debian/watch
diff --git a/debian/_base/applications/kvirc/debian/changelog b/debian/_base/applications/internet/kvirc/debian/changelog
similarity index 100%
rename from debian/_base/applications/kvirc/debian/changelog
rename to debian/_base/applications/internet/kvirc/debian/changelog
diff --git a/debian/_base/applications/kbiff/debian/compat b/debian/_base/applications/internet/kvirc/debian/compat
similarity index 100%
rename from debian/_base/applications/kbiff/debian/compat
rename to debian/_base/applications/internet/kvirc/debian/compat
diff --git a/debian/_base/applications/kvirc/debian/control b/debian/_base/applications/internet/kvirc/debian/control
similarity index 100%
rename from debian/_base/applications/kvirc/debian/control
rename to debian/_base/applications/internet/kvirc/debian/control
diff --git a/debian/_base/applications/kvirc/debian/copyright b/debian/_base/applications/internet/kvirc/debian/copyright
similarity index 100%
rename from debian/_base/applications/kvirc/debian/copyright
rename to debian/_base/applications/internet/kvirc/debian/copyright
diff --git a/debian/_base/applications/kvirc/debian/kvirc-data-trinity.install b/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install
similarity index 100%
rename from debian/_base/applications/kvirc/debian/kvirc-data-trinity.install
rename to debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install
diff --git a/debian/_base/applications/kvirc/debian/kvirc-data-trinity.links b/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.links
similarity index 100%
rename from debian/_base/applications/kvirc/debian/kvirc-data-trinity.links
rename to debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.links
diff --git a/debian/_base/applications/kvirc/debian/kvirc-data-trinity.postinst b/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.postinst
similarity index 100%
rename from debian/_base/applications/kvirc/debian/kvirc-data-trinity.postinst
rename to debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.postinst
diff --git a/debian/_base/applications/kvirc/debian/kvirc-data-trinity.prerm b/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.prerm
similarity index 100%
rename from debian/_base/applications/kvirc/debian/kvirc-data-trinity.prerm
rename to debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.prerm
diff --git a/debian/_base/applications/kvirc/debian/kvirc-trinity-dev.install b/debian/_base/applications/internet/kvirc/debian/kvirc-trinity-dev.install
similarity index 100%
rename from debian/_base/applications/kvirc/debian/kvirc-trinity-dev.install
rename to debian/_base/applications/internet/kvirc/debian/kvirc-trinity-dev.install
diff --git a/debian/_base/applications/kvirc/debian/kvirc-trinity-dev.links b/debian/_base/applications/internet/kvirc/debian/kvirc-trinity-dev.links
similarity index 100%
rename from debian/_base/applications/kvirc/debian/kvirc-trinity-dev.links
rename to debian/_base/applications/internet/kvirc/debian/kvirc-trinity-dev.links
diff --git a/debian/_base/applications/kvirc/debian/kvirc-trinity.install b/debian/_base/applications/internet/kvirc/debian/kvirc-trinity.install
similarity index 100%
rename from debian/_base/applications/kvirc/debian/kvirc-trinity.install
rename to debian/_base/applications/internet/kvirc/debian/kvirc-trinity.install
diff --git a/debian/_base/applications/kvirc/debian/kvirc-trinity.menu b/debian/_base/applications/internet/kvirc/debian/kvirc-trinity.menu
similarity index 100%
rename from debian/_base/applications/kvirc/debian/kvirc-trinity.menu
rename to debian/_base/applications/internet/kvirc/debian/kvirc-trinity.menu
diff --git a/debian/_base/applications/kvirc/debian/overrides/kvirc-trinity b/debian/_base/applications/internet/kvirc/debian/overrides/kvirc-trinity
similarity index 100%
rename from debian/_base/applications/kvirc/debian/overrides/kvirc-trinity
rename to debian/_base/applications/internet/kvirc/debian/overrides/kvirc-trinity
diff --git a/debian/_base/applications/gtk3-tqt-engine/debian/patches/series b/debian/_base/applications/internet/kvirc/debian/patches/series
similarity index 100%
rename from debian/_base/applications/gtk3-tqt-engine/debian/patches/series
rename to debian/_base/applications/internet/kvirc/debian/patches/series
diff --git a/debian/_base/applications/kvirc/debian/rules b/debian/_base/applications/internet/kvirc/debian/rules
similarity index 100%
rename from debian/_base/applications/kvirc/debian/rules
rename to debian/_base/applications/internet/kvirc/debian/rules
diff --git a/debian/_base/applications/kbibtex/debian/source/format b/debian/_base/applications/internet/kvirc/debian/source/format
similarity index 100%
rename from debian/_base/applications/kbibtex/debian/source/format
rename to debian/_base/applications/internet/kvirc/debian/source/format
diff --git a/debian/_base/applications/kbibtex/debian/source/options b/debian/_base/applications/internet/kvirc/debian/source/options
similarity index 100%
rename from debian/_base/applications/kbibtex/debian/source/options
rename to debian/_base/applications/internet/kvirc/debian/source/options
diff --git a/debian/_base/applications/kvpnc/debian/README.Debian b/debian/_base/applications/internet/kvpnc/debian/README.Debian
similarity index 100%
rename from debian/_base/applications/kvpnc/debian/README.Debian
rename to debian/_base/applications/internet/kvpnc/debian/README.Debian
diff --git a/debian/_base/applications/kchmviewer/debian/cdbs/debian-tde.mk b/debian/_base/applications/internet/kvpnc/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kchmviewer/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/internet/kvpnc/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kchmviewer/debian/cdbs/versions.pl b/debian/_base/applications/internet/kvpnc/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kchmviewer/debian/cdbs/versions.pl
rename to debian/_base/applications/internet/kvpnc/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kvpnc/debian/changelog b/debian/_base/applications/internet/kvpnc/debian/changelog
similarity index 100%
rename from debian/_base/applications/kvpnc/debian/changelog
rename to debian/_base/applications/internet/kvpnc/debian/changelog
diff --git a/debian/_base/applications/kchmviewer/debian/compat b/debian/_base/applications/internet/kvpnc/debian/compat
similarity index 100%
rename from debian/_base/applications/kchmviewer/debian/compat
rename to debian/_base/applications/internet/kvpnc/debian/compat
diff --git a/debian/_base/applications/kvpnc/debian/control b/debian/_base/applications/internet/kvpnc/debian/control
similarity index 100%
rename from debian/_base/applications/kvpnc/debian/control
rename to debian/_base/applications/internet/kvpnc/debian/control
diff --git a/debian/_base/applications/kvpnc/debian/copyright b/debian/_base/applications/internet/kvpnc/debian/copyright
similarity index 100%
rename from debian/_base/applications/kvpnc/debian/copyright
rename to debian/_base/applications/internet/kvpnc/debian/copyright
diff --git a/debian/_base/applications/knetload/debian/docs b/debian/_base/applications/internet/kvpnc/debian/docs
similarity index 100%
rename from debian/_base/applications/knetload/debian/docs
rename to debian/_base/applications/internet/kvpnc/debian/docs
diff --git a/debian/_base/applications/kvpnc/debian/menu b/debian/_base/applications/internet/kvpnc/debian/menu
similarity index 100%
rename from debian/_base/applications/kvpnc/debian/menu
rename to debian/_base/applications/internet/kvpnc/debian/menu
diff --git a/debian/_base/applications/kvpnc/debian/patches/10_su-to-root_usage.diff b/debian/_base/applications/internet/kvpnc/debian/patches/10_su-to-root_usage.diff
similarity index 100%
rename from debian/_base/applications/kvpnc/debian/patches/10_su-to-root_usage.diff
rename to debian/_base/applications/internet/kvpnc/debian/patches/10_su-to-root_usage.diff
diff --git a/debian/_base/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/debian/_base/applications/internet/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
similarity index 100%
rename from debian/_base/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
rename to debian/_base/applications/internet/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
diff --git a/debian/_base/applications/kvpnc/debian/patches/series b/debian/_base/applications/internet/kvpnc/debian/patches/series
similarity index 100%
rename from debian/_base/applications/kvpnc/debian/patches/series
rename to debian/_base/applications/internet/kvpnc/debian/patches/series
diff --git a/debian/_base/applications/kdirstat/debian/rules b/debian/_base/applications/internet/kvpnc/debian/rules
similarity index 100%
rename from debian/_base/applications/kdirstat/debian/rules
rename to debian/_base/applications/internet/kvpnc/debian/rules
diff --git a/debian/_base/applications/kbiff/debian/source/format b/debian/_base/applications/internet/kvpnc/debian/source/format
similarity index 100%
rename from debian/_base/applications/kbiff/debian/source/format
rename to debian/_base/applications/internet/kvpnc/debian/source/format
diff --git a/debian/_base/applications/kbiff/debian/source/options b/debian/_base/applications/internet/kvpnc/debian/source/options
similarity index 100%
rename from debian/_base/applications/kbiff/debian/source/options
rename to debian/_base/applications/internet/kvpnc/debian/source/options
diff --git a/debian/_base/applications/smb4k/debian/README.Debian b/debian/_base/applications/internet/smb4k/debian/README.Debian
similarity index 100%
rename from debian/_base/applications/smb4k/debian/README.Debian
rename to debian/_base/applications/internet/smb4k/debian/README.Debian
diff --git a/debian/_base/applications/kcmautostart/debian/cdbs/debian-tde.mk b/debian/_base/applications/internet/smb4k/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kcmautostart/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/internet/smb4k/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kcmautostart/debian/cdbs/versions.pl b/debian/_base/applications/internet/smb4k/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kcmautostart/debian/cdbs/versions.pl
rename to debian/_base/applications/internet/smb4k/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/smb4k/debian/changelog b/debian/_base/applications/internet/smb4k/debian/changelog
similarity index 100%
rename from debian/_base/applications/smb4k/debian/changelog
rename to debian/_base/applications/internet/smb4k/debian/changelog
diff --git a/debian/_base/applications/kcmautostart/debian/compat b/debian/_base/applications/internet/smb4k/debian/compat
similarity index 100%
rename from debian/_base/applications/kcmautostart/debian/compat
rename to debian/_base/applications/internet/smb4k/debian/compat
diff --git a/debian/_base/applications/smb4k/debian/control b/debian/_base/applications/internet/smb4k/debian/control
similarity index 100%
rename from debian/_base/applications/smb4k/debian/control
rename to debian/_base/applications/internet/smb4k/debian/control
diff --git a/debian/_base/applications/smb4k/debian/copyright b/debian/_base/applications/internet/smb4k/debian/copyright
similarity index 100%
rename from debian/_base/applications/smb4k/debian/copyright
rename to debian/_base/applications/internet/smb4k/debian/copyright
diff --git a/debian/_base/applications/smb4k/debian/docs b/debian/_base/applications/internet/smb4k/debian/docs
similarity index 100%
rename from debian/_base/applications/smb4k/debian/docs
rename to debian/_base/applications/internet/smb4k/debian/docs
diff --git a/debian/_base/applications/smb4k/debian/menu b/debian/_base/applications/internet/smb4k/debian/menu
similarity index 100%
rename from debian/_base/applications/smb4k/debian/menu
rename to debian/_base/applications/internet/smb4k/debian/menu
diff --git a/debian/_base/applications/smb4k/debian/rules b/debian/_base/applications/internet/smb4k/debian/rules
similarity index 100%
rename from debian/_base/applications/smb4k/debian/rules
rename to debian/_base/applications/internet/smb4k/debian/rules
diff --git a/debian/_base/applications/kbookreader/debian/source/format b/debian/_base/applications/internet/smb4k/debian/source/format
similarity index 100%
rename from debian/_base/applications/kbookreader/debian/source/format
rename to debian/_base/applications/internet/smb4k/debian/source/format
diff --git a/debian/_base/applications/kbookreader/debian/source/options b/debian/_base/applications/internet/smb4k/debian/source/options
similarity index 100%
rename from debian/_base/applications/kbookreader/debian/source/options
rename to debian/_base/applications/internet/smb4k/debian/source/options
diff --git a/debian/_base/applications/smb4k/debian/watch b/debian/_base/applications/internet/smb4k/debian/watch
similarity index 100%
rename from debian/_base/applications/smb4k/debian/watch
rename to debian/_base/applications/internet/smb4k/debian/watch
diff --git a/debian/_base/applications/kcmldap/debian/cdbs/debian-tde.mk b/debian/_base/applications/internet/tork/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kcmldap/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/internet/tork/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kcmldap/debian/cdbs/versions.pl b/debian/_base/applications/internet/tork/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kcmldap/debian/cdbs/versions.pl
rename to debian/_base/applications/internet/tork/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/tork/debian/changelog b/debian/_base/applications/internet/tork/debian/changelog
similarity index 100%
rename from debian/_base/applications/tork/debian/changelog
rename to debian/_base/applications/internet/tork/debian/changelog
diff --git a/debian/_base/applications/kcmldap/debian/compat b/debian/_base/applications/internet/tork/debian/compat
similarity index 100%
rename from debian/_base/applications/kcmldap/debian/compat
rename to debian/_base/applications/internet/tork/debian/compat
diff --git a/debian/_base/applications/tork/debian/control b/debian/_base/applications/internet/tork/debian/control
similarity index 100%
rename from debian/_base/applications/tork/debian/control
rename to debian/_base/applications/internet/tork/debian/control
diff --git a/debian/_base/applications/tork/debian/copyright b/debian/_base/applications/internet/tork/debian/copyright
similarity index 100%
rename from debian/_base/applications/tork/debian/copyright
rename to debian/_base/applications/internet/tork/debian/copyright
diff --git a/debian/_base/applications/krename/debian/docs b/debian/_base/applications/internet/tork/debian/docs
similarity index 100%
rename from debian/_base/applications/krename/debian/docs
rename to debian/_base/applications/internet/tork/debian/docs
diff --git a/debian/_base/applications/tork/debian/rules b/debian/_base/applications/internet/tork/debian/rules
similarity index 100%
rename from debian/_base/applications/tork/debian/rules
rename to debian/_base/applications/internet/tork/debian/rules
diff --git a/debian/_base/applications/kchmviewer/debian/source/format b/debian/_base/applications/internet/tork/debian/source/format
similarity index 100%
rename from debian/_base/applications/kchmviewer/debian/source/format
rename to debian/_base/applications/internet/tork/debian/source/format
diff --git a/debian/_base/applications/kchmviewer/debian/source/options b/debian/_base/applications/internet/tork/debian/source/options
similarity index 100%
rename from debian/_base/applications/kchmviewer/debian/source/options
rename to debian/_base/applications/internet/tork/debian/source/options
diff --git a/debian/_base/applications/tork/debian/tork-data-trinity.install b/debian/_base/applications/internet/tork/debian/tork-data-trinity.install
similarity index 100%
rename from debian/_base/applications/tork/debian/tork-data-trinity.install
rename to debian/_base/applications/internet/tork/debian/tork-data-trinity.install
diff --git a/debian/_base/applications/tork/debian/tork-trinity.install b/debian/_base/applications/internet/tork/debian/tork-trinity.install
similarity index 100%
rename from debian/_base/applications/tork/debian/tork-trinity.install
rename to debian/_base/applications/internet/tork/debian/tork-trinity.install
diff --git a/debian/_base/applications/tork/debian/tork-trinity.postinst b/debian/_base/applications/internet/tork/debian/tork-trinity.postinst
similarity index 100%
rename from debian/_base/applications/tork/debian/tork-trinity.postinst
rename to debian/_base/applications/internet/tork/debian/tork-trinity.postinst
diff --git a/debian/_base/applications/tork/debian/tork-trinity.postrm b/debian/_base/applications/internet/tork/debian/tork-trinity.postrm
similarity index 100%
rename from debian/_base/applications/tork/debian/tork-trinity.postrm
rename to debian/_base/applications/internet/tork/debian/tork-trinity.postrm
diff --git a/debian/_base/applications/bibletime/debian/bibletime.xpm b/debian/_base/applications/misc/bibletime/debian/bibletime.xpm
similarity index 100%
rename from debian/_base/applications/bibletime/debian/bibletime.xpm
rename to debian/_base/applications/misc/bibletime/debian/bibletime.xpm
diff --git a/debian/_base/applications/kcmldapcontroller/debian/cdbs/debian-tde.mk b/debian/_base/applications/misc/bibletime/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kcmldapcontroller/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/misc/bibletime/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kcmldapcontroller/debian/cdbs/versions.pl b/debian/_base/applications/misc/bibletime/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kcmldapcontroller/debian/cdbs/versions.pl
rename to debian/_base/applications/misc/bibletime/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/bibletime/debian/changelog b/debian/_base/applications/misc/bibletime/debian/changelog
similarity index 100%
rename from debian/_base/applications/bibletime/debian/changelog
rename to debian/_base/applications/misc/bibletime/debian/changelog
diff --git a/debian/_base/applications/kcmldapcontroller/debian/compat b/debian/_base/applications/misc/bibletime/debian/compat
similarity index 100%
rename from debian/_base/applications/kcmldapcontroller/debian/compat
rename to debian/_base/applications/misc/bibletime/debian/compat
diff --git a/debian/_base/applications/bibletime/debian/control b/debian/_base/applications/misc/bibletime/debian/control
similarity index 100%
rename from debian/_base/applications/bibletime/debian/control
rename to debian/_base/applications/misc/bibletime/debian/control
diff --git a/debian/_base/applications/bibletime/debian/copyright b/debian/_base/applications/misc/bibletime/debian/copyright
similarity index 100%
rename from debian/_base/applications/bibletime/debian/copyright
rename to debian/_base/applications/misc/bibletime/debian/copyright
diff --git a/debian/_base/applications/bibletime/debian/de/bibletime.1 b/debian/_base/applications/misc/bibletime/debian/de/bibletime.1
similarity index 100%
rename from debian/_base/applications/bibletime/debian/de/bibletime.1
rename to debian/_base/applications/misc/bibletime/debian/de/bibletime.1
diff --git a/debian/_base/applications/bibletime/debian/dirs b/debian/_base/applications/misc/bibletime/debian/dirs
similarity index 100%
rename from debian/_base/applications/bibletime/debian/dirs
rename to debian/_base/applications/misc/bibletime/debian/dirs
diff --git a/debian/_base/applications/bibletime/debian/en/bibletime.1 b/debian/_base/applications/misc/bibletime/debian/en/bibletime.1
similarity index 100%
rename from debian/_base/applications/bibletime/debian/en/bibletime.1
rename to debian/_base/applications/misc/bibletime/debian/en/bibletime.1
diff --git a/debian/_base/applications/bibletime/debian/install b/debian/_base/applications/misc/bibletime/debian/install
similarity index 100%
rename from debian/_base/applications/bibletime/debian/install
rename to debian/_base/applications/misc/bibletime/debian/install
diff --git a/debian/_base/applications/bibletime/debian/menu b/debian/_base/applications/misc/bibletime/debian/menu
similarity index 100%
rename from debian/_base/applications/bibletime/debian/menu
rename to debian/_base/applications/misc/bibletime/debian/menu
diff --git a/debian/_base/applications/gwenview-i18n/debian/patches/series b/debian/_base/applications/misc/bibletime/debian/patches/series
similarity index 100%
rename from debian/_base/applications/gwenview-i18n/debian/patches/series
rename to debian/_base/applications/misc/bibletime/debian/patches/series
diff --git a/debian/_base/applications/bibletime/debian/rules b/debian/_base/applications/misc/bibletime/debian/rules
similarity index 100%
rename from debian/_base/applications/bibletime/debian/rules
rename to debian/_base/applications/misc/bibletime/debian/rules
diff --git a/debian/_base/applications/kcmautostart/debian/source/format b/debian/_base/applications/misc/bibletime/debian/source/format
similarity index 100%
rename from debian/_base/applications/kcmautostart/debian/source/format
rename to debian/_base/applications/misc/bibletime/debian/source/format
diff --git a/debian/_base/applications/kcmautostart/debian/source/options b/debian/_base/applications/misc/bibletime/debian/source/options
similarity index 100%
rename from debian/_base/applications/kcmautostart/debian/source/options
rename to debian/_base/applications/misc/bibletime/debian/source/options
diff --git a/debian/_base/applications/kcmldapmanager/debian/cdbs/debian-tde.mk b/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kcmldapmanager/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kcmldapmanager/debian/cdbs/versions.pl b/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kcmldapmanager/debian/cdbs/versions.pl
rename to debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/compizconfig-backend-tdeconfig/debian/changelog b/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/changelog
similarity index 100%
rename from debian/_base/applications/compizconfig-backend-tdeconfig/debian/changelog
rename to debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/changelog
diff --git a/debian/_base/applications/kcmldapmanager/debian/compat b/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/compat
similarity index 100%
rename from debian/_base/applications/kcmldapmanager/debian/compat
rename to debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/compat
diff --git a/debian/_base/applications/compizconfig-backend-tdeconfig/debian/control b/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/control
similarity index 100%
rename from debian/_base/applications/compizconfig-backend-tdeconfig/debian/control
rename to debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/control
diff --git a/debian/_base/applications/compizconfig-backend-tdeconfig/debian/copyright b/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/copyright
similarity index 100%
rename from debian/_base/applications/compizconfig-backend-tdeconfig/debian/copyright
rename to debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/copyright
diff --git a/debian/_base/applications/compizconfig-backend-tdeconfig/debian/docs b/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/docs
similarity index 100%
rename from debian/_base/applications/compizconfig-backend-tdeconfig/debian/docs
rename to debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/docs
diff --git a/debian/_base/applications/gwenview/debian/patches/series b/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/patches/series
similarity index 100%
rename from debian/_base/applications/gwenview/debian/patches/series
rename to debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/patches/series
diff --git a/debian/_base/applications/kchmviewer/debian/rules b/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/rules
similarity index 100%
rename from debian/_base/applications/kchmviewer/debian/rules
rename to debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/rules
diff --git a/debian/_base/applications/kcmldap/debian/source/format b/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/source/format
similarity index 100%
rename from debian/_base/applications/kcmldap/debian/source/format
rename to debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/source/format
diff --git a/debian/_base/applications/kcmldap/debian/source/options b/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/source/options
similarity index 100%
rename from debian/_base/applications/kcmldap/debian/source/options
rename to debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/source/options
diff --git a/debian/_base/applications/desktop-effects-tde/debian/changelog b/debian/_base/applications/misc/desktop-effects-tde/debian/changelog
similarity index 100%
rename from debian/_base/applications/desktop-effects-tde/debian/changelog
rename to debian/_base/applications/misc/desktop-effects-tde/debian/changelog
diff --git a/debian/_base/applications/kcpuload/debian/compat b/debian/_base/applications/misc/desktop-effects-tde/debian/compat
similarity index 100%
rename from debian/_base/applications/kcpuload/debian/compat
rename to debian/_base/applications/misc/desktop-effects-tde/debian/compat
diff --git a/debian/_base/applications/desktop-effects-tde/debian/control b/debian/_base/applications/misc/desktop-effects-tde/debian/control
similarity index 100%
rename from debian/_base/applications/desktop-effects-tde/debian/control
rename to debian/_base/applications/misc/desktop-effects-tde/debian/control
diff --git a/debian/_base/applications/desktop-effects-tde/debian/copyright b/debian/_base/applications/misc/desktop-effects-tde/debian/copyright
similarity index 100%
rename from debian/_base/applications/desktop-effects-tde/debian/copyright
rename to debian/_base/applications/misc/desktop-effects-tde/debian/copyright
diff --git a/debian/_base/applications/desktop-effects-tde/debian/desktop-effects-tde-trinity.install b/debian/_base/applications/misc/desktop-effects-tde/debian/desktop-effects-tde-trinity.install
similarity index 100%
rename from debian/_base/applications/desktop-effects-tde/debian/desktop-effects-tde-trinity.install
rename to debian/_base/applications/misc/desktop-effects-tde/debian/desktop-effects-tde-trinity.install
diff --git a/debian/_base/applications/desktop-effects-tde/debian/rules b/debian/_base/applications/misc/desktop-effects-tde/debian/rules
similarity index 100%
rename from debian/_base/applications/desktop-effects-tde/debian/rules
rename to debian/_base/applications/misc/desktop-effects-tde/debian/rules
diff --git a/debian/_base/applications/kcmldapcontroller/debian/source/format b/debian/_base/applications/misc/desktop-effects-tde/debian/source/format
similarity index 100%
rename from debian/_base/applications/kcmldapcontroller/debian/source/format
rename to debian/_base/applications/misc/desktop-effects-tde/debian/source/format
diff --git a/debian/_base/applications/kcmldapcontroller/debian/source/options b/debian/_base/applications/misc/desktop-effects-tde/debian/source/options
similarity index 100%
rename from debian/_base/applications/kcmldapcontroller/debian/source/options
rename to debian/_base/applications/misc/desktop-effects-tde/debian/source/options
diff --git a/debian/_base/applications/fusion-icon/debian/changelog b/debian/_base/applications/misc/fusion-icon/debian/changelog
similarity index 100%
rename from debian/_base/applications/fusion-icon/debian/changelog
rename to debian/_base/applications/misc/fusion-icon/debian/changelog
diff --git a/debian/_base/applications/kdbg/debian/compat b/debian/_base/applications/misc/fusion-icon/debian/compat
similarity index 100%
rename from debian/_base/applications/kdbg/debian/compat
rename to debian/_base/applications/misc/fusion-icon/debian/compat
diff --git a/debian/_base/applications/fusion-icon/debian/control b/debian/_base/applications/misc/fusion-icon/debian/control
similarity index 100%
rename from debian/_base/applications/fusion-icon/debian/control
rename to debian/_base/applications/misc/fusion-icon/debian/control
diff --git a/debian/_base/applications/fusion-icon/debian/copyright b/debian/_base/applications/misc/fusion-icon/debian/copyright
similarity index 100%
rename from debian/_base/applications/fusion-icon/debian/copyright
rename to debian/_base/applications/misc/fusion-icon/debian/copyright
diff --git a/debian/_base/applications/fusion-icon/debian/fusion-icon.1 b/debian/_base/applications/misc/fusion-icon/debian/fusion-icon.1
similarity index 100%
rename from debian/_base/applications/fusion-icon/debian/fusion-icon.1
rename to debian/_base/applications/misc/fusion-icon/debian/fusion-icon.1
diff --git a/debian/_base/applications/fusion-icon/debian/fusion-icon.xpm b/debian/_base/applications/misc/fusion-icon/debian/fusion-icon.xpm
similarity index 100%
rename from debian/_base/applications/fusion-icon/debian/fusion-icon.xpm
rename to debian/_base/applications/misc/fusion-icon/debian/fusion-icon.xpm
diff --git a/debian/_base/applications/fusion-icon/debian/install b/debian/_base/applications/misc/fusion-icon/debian/install
similarity index 100%
rename from debian/_base/applications/fusion-icon/debian/install
rename to debian/_base/applications/misc/fusion-icon/debian/install
diff --git a/debian/_base/applications/fusion-icon/debian/links b/debian/_base/applications/misc/fusion-icon/debian/links
similarity index 100%
rename from debian/_base/applications/fusion-icon/debian/links
rename to debian/_base/applications/misc/fusion-icon/debian/links
diff --git a/debian/_base/applications/fusion-icon/debian/manpages b/debian/_base/applications/misc/fusion-icon/debian/manpages
similarity index 100%
rename from debian/_base/applications/fusion-icon/debian/manpages
rename to debian/_base/applications/misc/fusion-icon/debian/manpages
diff --git a/debian/_base/applications/fusion-icon/debian/menu b/debian/_base/applications/misc/fusion-icon/debian/menu
similarity index 100%
rename from debian/_base/applications/fusion-icon/debian/menu
rename to debian/_base/applications/misc/fusion-icon/debian/menu
diff --git a/debian/_base/applications/k9copy/debian/patches/series b/debian/_base/applications/misc/fusion-icon/debian/patches/series
similarity index 100%
rename from debian/_base/applications/k9copy/debian/patches/series
rename to debian/_base/applications/misc/fusion-icon/debian/patches/series
diff --git a/debian/_base/applications/fusion-icon/debian/pycompat b/debian/_base/applications/misc/fusion-icon/debian/pycompat
similarity index 100%
rename from debian/_base/applications/fusion-icon/debian/pycompat
rename to debian/_base/applications/misc/fusion-icon/debian/pycompat
diff --git a/debian/_base/applications/fusion-icon/debian/python-distutils-custom.mk b/debian/_base/applications/misc/fusion-icon/debian/python-distutils-custom.mk
similarity index 100%
rename from debian/_base/applications/fusion-icon/debian/python-distutils-custom.mk
rename to debian/_base/applications/misc/fusion-icon/debian/python-distutils-custom.mk
diff --git a/debian/_base/applications/fusion-icon/debian/rules b/debian/_base/applications/misc/fusion-icon/debian/rules
similarity index 100%
rename from debian/_base/applications/fusion-icon/debian/rules
rename to debian/_base/applications/misc/fusion-icon/debian/rules
diff --git a/debian/_base/applications/kcmldapmanager/debian/source/format b/debian/_base/applications/misc/fusion-icon/debian/source/format
similarity index 100%
rename from debian/_base/applications/kcmldapmanager/debian/source/format
rename to debian/_base/applications/misc/fusion-icon/debian/source/format
diff --git a/debian/_base/applications/kcmldapmanager/debian/source/options b/debian/_base/applications/misc/fusion-icon/debian/source/options
similarity index 100%
rename from debian/_base/applications/kcmldapmanager/debian/source/options
rename to debian/_base/applications/misc/fusion-icon/debian/source/options
diff --git a/debian/_base/applications/kcpuload/debian/cdbs/debian-tde.mk b/debian/_base/applications/misc/kcmldap/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kcpuload/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/misc/kcmldap/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kcpuload/debian/cdbs/versions.pl b/debian/_base/applications/misc/kcmldap/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kcpuload/debian/cdbs/versions.pl
rename to debian/_base/applications/misc/kcmldap/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kcmldap/debian/changelog b/debian/_base/applications/misc/kcmldap/debian/changelog
similarity index 100%
rename from debian/_base/applications/kcmldap/debian/changelog
rename to debian/_base/applications/misc/kcmldap/debian/changelog
diff --git a/debian/_base/applications/kdbusnotification/debian/compat b/debian/_base/applications/misc/kcmldap/debian/compat
similarity index 100%
rename from debian/_base/applications/kdbusnotification/debian/compat
rename to debian/_base/applications/misc/kcmldap/debian/compat
diff --git a/debian/_base/applications/kcmldap/debian/control b/debian/_base/applications/misc/kcmldap/debian/control
similarity index 100%
rename from debian/_base/applications/kcmldap/debian/control
rename to debian/_base/applications/misc/kcmldap/debian/control
diff --git a/debian/_base/applications/gtk3-tqt-engine/debian/copyright b/debian/_base/applications/misc/kcmldap/debian/copyright
similarity index 100%
rename from debian/_base/applications/gtk3-tqt-engine/debian/copyright
rename to debian/_base/applications/misc/kcmldap/debian/copyright
diff --git a/debian/_base/applications/kcmldap/debian/docs b/debian/_base/applications/misc/kcmldap/debian/docs
similarity index 100%
rename from debian/_base/applications/kcmldap/debian/docs
rename to debian/_base/applications/misc/kcmldap/debian/docs
diff --git a/debian/_base/applications/kcmldap/debian/kcontrol-ldap-bonding-trinity.install b/debian/_base/applications/misc/kcmldap/debian/kcontrol-ldap-bonding-trinity.install
similarity index 100%
rename from debian/_base/applications/kcmldap/debian/kcontrol-ldap-bonding-trinity.install
rename to debian/_base/applications/misc/kcmldap/debian/kcontrol-ldap-bonding-trinity.install
diff --git a/debian/_base/applications/kaffeine-mozilla/debian/patches/series b/debian/_base/applications/misc/kcmldap/debian/patches/series
similarity index 100%
rename from debian/_base/applications/kaffeine-mozilla/debian/patches/series
rename to debian/_base/applications/misc/kcmldap/debian/patches/series
diff --git a/debian/_base/applications/kiosktool/debian/rules b/debian/_base/applications/misc/kcmldap/debian/rules
similarity index 100%
rename from debian/_base/applications/kiosktool/debian/rules
rename to debian/_base/applications/misc/kcmldap/debian/rules
diff --git a/debian/_base/applications/kcpuload/debian/source/format b/debian/_base/applications/misc/kcmldap/debian/source/format
similarity index 100%
rename from debian/_base/applications/kcpuload/debian/source/format
rename to debian/_base/applications/misc/kcmldap/debian/source/format
diff --git a/debian/_base/applications/kcpuload/debian/source/options b/debian/_base/applications/misc/kcmldap/debian/source/options
similarity index 100%
rename from debian/_base/applications/kcpuload/debian/source/options
rename to debian/_base/applications/misc/kcmldap/debian/source/options
diff --git a/debian/_base/applications/kcmldap/debian/tde-ldap-cert-updater.init b/debian/_base/applications/misc/kcmldap/debian/tde-ldap-cert-updater.init
similarity index 100%
rename from debian/_base/applications/kcmldap/debian/tde-ldap-cert-updater.init
rename to debian/_base/applications/misc/kcmldap/debian/tde-ldap-cert-updater.init
diff --git a/debian/_base/applications/kcmldap/debian/tde-ldap-cert-updater.install b/debian/_base/applications/misc/kcmldap/debian/tde-ldap-cert-updater.install
similarity index 100%
rename from debian/_base/applications/kcmldap/debian/tde-ldap-cert-updater.install
rename to debian/_base/applications/misc/kcmldap/debian/tde-ldap-cert-updater.install
diff --git a/debian/_base/applications/kdbg/debian/cdbs/debian-tde.mk b/debian/_base/applications/misc/kcmldapcontroller/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kdbg/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/misc/kcmldapcontroller/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kdbg/debian/cdbs/versions.pl b/debian/_base/applications/misc/kcmldapcontroller/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kdbg/debian/cdbs/versions.pl
rename to debian/_base/applications/misc/kcmldapcontroller/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kcmldapcontroller/debian/changelog b/debian/_base/applications/misc/kcmldapcontroller/debian/changelog
similarity index 100%
rename from debian/_base/applications/kcmldapcontroller/debian/changelog
rename to debian/_base/applications/misc/kcmldapcontroller/debian/changelog
diff --git a/debian/_base/applications/kdiff3/debian/compat b/debian/_base/applications/misc/kcmldapcontroller/debian/compat
similarity index 100%
rename from debian/_base/applications/kdiff3/debian/compat
rename to debian/_base/applications/misc/kcmldapcontroller/debian/compat
diff --git a/debian/_base/applications/kcmldapcontroller/debian/control b/debian/_base/applications/misc/kcmldapcontroller/debian/control
similarity index 100%
rename from debian/_base/applications/kcmldapcontroller/debian/control
rename to debian/_base/applications/misc/kcmldapcontroller/debian/control
diff --git a/debian/_base/applications/kcmldap/debian/copyright b/debian/_base/applications/misc/kcmldapcontroller/debian/copyright
similarity index 100%
rename from debian/_base/applications/kcmldap/debian/copyright
rename to debian/_base/applications/misc/kcmldapcontroller/debian/copyright
diff --git a/debian/_base/applications/kcmldapcontroller/debian/docs b/debian/_base/applications/misc/kcmldapcontroller/debian/docs
similarity index 100%
rename from debian/_base/applications/kcmldapcontroller/debian/docs
rename to debian/_base/applications/misc/kcmldapcontroller/debian/docs
diff --git a/debian/_base/applications/kaffeine/debian/patches/series b/debian/_base/applications/misc/kcmldapcontroller/debian/patches/series
similarity index 100%
rename from debian/_base/applications/kaffeine/debian/patches/series
rename to debian/_base/applications/misc/kcmldapcontroller/debian/patches/series
diff --git a/debian/_base/applications/kcmldapcontroller/debian/rules b/debian/_base/applications/misc/kcmldapcontroller/debian/rules
similarity index 100%
rename from debian/_base/applications/kcmldapcontroller/debian/rules
rename to debian/_base/applications/misc/kcmldapcontroller/debian/rules
diff --git a/debian/_base/applications/kdbg/debian/source/format b/debian/_base/applications/misc/kcmldapcontroller/debian/source/format
similarity index 100%
rename from debian/_base/applications/kdbg/debian/source/format
rename to debian/_base/applications/misc/kcmldapcontroller/debian/source/format
diff --git a/debian/_base/applications/kdbg/debian/source/options b/debian/_base/applications/misc/kcmldapcontroller/debian/source/options
similarity index 100%
rename from debian/_base/applications/kdbg/debian/source/options
rename to debian/_base/applications/misc/kcmldapcontroller/debian/source/options
diff --git a/debian/_base/applications/kdbusnotification/debian/cdbs/debian-tde.mk b/debian/_base/applications/misc/kcmldapmanager/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kdbusnotification/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/misc/kcmldapmanager/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kdbusnotification/debian/cdbs/versions.pl b/debian/_base/applications/misc/kcmldapmanager/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kdbusnotification/debian/cdbs/versions.pl
rename to debian/_base/applications/misc/kcmldapmanager/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kcmldapmanager/debian/changelog b/debian/_base/applications/misc/kcmldapmanager/debian/changelog
similarity index 100%
rename from debian/_base/applications/kcmldapmanager/debian/changelog
rename to debian/_base/applications/misc/kcmldapmanager/debian/changelog
diff --git a/debian/_base/applications/kdirstat/debian/compat b/debian/_base/applications/misc/kcmldapmanager/debian/compat
similarity index 100%
rename from debian/_base/applications/kdirstat/debian/compat
rename to debian/_base/applications/misc/kcmldapmanager/debian/compat
diff --git a/debian/_base/applications/kcmldapmanager/debian/control b/debian/_base/applications/misc/kcmldapmanager/debian/control
similarity index 100%
rename from debian/_base/applications/kcmldapmanager/debian/control
rename to debian/_base/applications/misc/kcmldapmanager/debian/control
diff --git a/debian/_base/applications/kcmldapcontroller/debian/copyright b/debian/_base/applications/misc/kcmldapmanager/debian/copyright
similarity index 100%
rename from debian/_base/applications/kcmldapcontroller/debian/copyright
rename to debian/_base/applications/misc/kcmldapmanager/debian/copyright
diff --git a/debian/_base/applications/kcmldapmanager/debian/docs b/debian/_base/applications/misc/kcmldapmanager/debian/docs
similarity index 100%
rename from debian/_base/applications/kcmldapmanager/debian/docs
rename to debian/_base/applications/misc/kcmldapmanager/debian/docs
diff --git a/debian/_base/applications/kasablanca/debian/patches/series b/debian/_base/applications/misc/kcmldapmanager/debian/patches/series
similarity index 100%
rename from debian/_base/applications/kasablanca/debian/patches/series
rename to debian/_base/applications/misc/kcmldapmanager/debian/patches/series
diff --git a/debian/_base/applications/kcmldapmanager/debian/rules b/debian/_base/applications/misc/kcmldapmanager/debian/rules
similarity index 100%
rename from debian/_base/applications/kcmldapmanager/debian/rules
rename to debian/_base/applications/misc/kcmldapmanager/debian/rules
diff --git a/debian/_base/applications/kdbusnotification/debian/source/format b/debian/_base/applications/misc/kcmldapmanager/debian/source/format
similarity index 100%
rename from debian/_base/applications/kdbusnotification/debian/source/format
rename to debian/_base/applications/misc/kcmldapmanager/debian/source/format
diff --git a/debian/_base/applications/kdbusnotification/debian/source/options b/debian/_base/applications/misc/kcmldapmanager/debian/source/options
similarity index 100%
rename from debian/_base/applications/kdbusnotification/debian/source/options
rename to debian/_base/applications/misc/kcmldapmanager/debian/source/options
diff --git a/debian/_base/applications/kdiff3/debian/cdbs/debian-tde.mk b/debian/_base/applications/misc/kerberostray/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kdiff3/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/misc/kerberostray/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kdiff3/debian/cdbs/versions.pl b/debian/_base/applications/misc/kerberostray/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kdiff3/debian/cdbs/versions.pl
rename to debian/_base/applications/misc/kerberostray/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kerberostray/debian/changelog b/debian/_base/applications/misc/kerberostray/debian/changelog
similarity index 100%
rename from debian/_base/applications/kerberostray/debian/changelog
rename to debian/_base/applications/misc/kerberostray/debian/changelog
diff --git a/debian/_base/applications/kdpkg/debian/compat b/debian/_base/applications/misc/kerberostray/debian/compat
similarity index 100%
rename from debian/_base/applications/kdpkg/debian/compat
rename to debian/_base/applications/misc/kerberostray/debian/compat
diff --git a/debian/_base/applications/kerberostray/debian/control b/debian/_base/applications/misc/kerberostray/debian/control
similarity index 100%
rename from debian/_base/applications/kerberostray/debian/control
rename to debian/_base/applications/misc/kerberostray/debian/control
diff --git a/debian/_base/applications/kcmldapmanager/debian/copyright b/debian/_base/applications/misc/kerberostray/debian/copyright
similarity index 100%
rename from debian/_base/applications/kcmldapmanager/debian/copyright
rename to debian/_base/applications/misc/kerberostray/debian/copyright
diff --git a/debian/_base/applications/kcmautostart/debian/docs b/debian/_base/applications/misc/kerberostray/debian/docs
similarity index 100%
rename from debian/_base/applications/kcmautostart/debian/docs
rename to debian/_base/applications/misc/kerberostray/debian/docs
diff --git a/debian/_base/applications/katapult/debian/patches/series b/debian/_base/applications/misc/kerberostray/debian/patches/series
similarity index 100%
rename from debian/_base/applications/katapult/debian/patches/series
rename to debian/_base/applications/misc/kerberostray/debian/patches/series
diff --git a/debian/_base/applications/kdbusnotification/debian/rules b/debian/_base/applications/misc/kerberostray/debian/rules
similarity index 100%
rename from debian/_base/applications/kdbusnotification/debian/rules
rename to debian/_base/applications/misc/kerberostray/debian/rules
diff --git a/debian/_base/applications/kdiff3/debian/source/format b/debian/_base/applications/misc/kerberostray/debian/source/format
similarity index 100%
rename from debian/_base/applications/kdiff3/debian/source/format
rename to debian/_base/applications/misc/kerberostray/debian/source/format
diff --git a/debian/_base/applications/kdiff3/debian/source/options b/debian/_base/applications/misc/kerberostray/debian/source/options
similarity index 100%
rename from debian/_base/applications/kdiff3/debian/source/options
rename to debian/_base/applications/misc/kerberostray/debian/source/options
diff --git a/debian/_base/applications/krecipes/debian/README.source b/debian/_base/applications/misc/krecipes/debian/README.source
similarity index 100%
rename from debian/_base/applications/krecipes/debian/README.source
rename to debian/_base/applications/misc/krecipes/debian/README.source
diff --git a/debian/_base/applications/kdirstat/debian/cdbs/debian-tde.mk b/debian/_base/applications/misc/krecipes/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kdirstat/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/misc/krecipes/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kdirstat/debian/cdbs/versions.pl b/debian/_base/applications/misc/krecipes/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kdirstat/debian/cdbs/versions.pl
rename to debian/_base/applications/misc/krecipes/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/krecipes/debian/changelog b/debian/_base/applications/misc/krecipes/debian/changelog
similarity index 100%
rename from debian/_base/applications/krecipes/debian/changelog
rename to debian/_base/applications/misc/krecipes/debian/changelog
diff --git a/debian/_base/applications/keep/debian/compat b/debian/_base/applications/misc/krecipes/debian/compat
similarity index 100%
rename from debian/_base/applications/keep/debian/compat
rename to debian/_base/applications/misc/krecipes/debian/compat
diff --git a/debian/_base/applications/krecipes/debian/control b/debian/_base/applications/misc/krecipes/debian/control
similarity index 100%
rename from debian/_base/applications/krecipes/debian/control
rename to debian/_base/applications/misc/krecipes/debian/control
diff --git a/debian/_base/applications/krecipes/debian/copyright b/debian/_base/applications/misc/krecipes/debian/copyright
similarity index 100%
rename from debian/_base/applications/krecipes/debian/copyright
rename to debian/_base/applications/misc/krecipes/debian/copyright
diff --git a/debian/_base/applications/krecipes/debian/krecipes-data-trinity.install b/debian/_base/applications/misc/krecipes/debian/krecipes-data-trinity.install
similarity index 100%
rename from debian/_base/applications/krecipes/debian/krecipes-data-trinity.install
rename to debian/_base/applications/misc/krecipes/debian/krecipes-data-trinity.install
diff --git a/debian/_base/applications/krecipes/debian/krecipes-data-trinity.manpages b/debian/_base/applications/misc/krecipes/debian/krecipes-data-trinity.manpages
similarity index 100%
rename from debian/_base/applications/krecipes/debian/krecipes-data-trinity.manpages
rename to debian/_base/applications/misc/krecipes/debian/krecipes-data-trinity.manpages
diff --git a/debian/_base/applications/krecipes/debian/krecipes-doc-trinity.install b/debian/_base/applications/misc/krecipes/debian/krecipes-doc-trinity.install
similarity index 100%
rename from debian/_base/applications/krecipes/debian/krecipes-doc-trinity.install
rename to debian/_base/applications/misc/krecipes/debian/krecipes-doc-trinity.install
diff --git a/debian/_base/applications/krecipes/debian/krecipes-trinity.install b/debian/_base/applications/misc/krecipes/debian/krecipes-trinity.install
similarity index 100%
rename from debian/_base/applications/krecipes/debian/krecipes-trinity.install
rename to debian/_base/applications/misc/krecipes/debian/krecipes-trinity.install
diff --git a/debian/_base/applications/krecipes/debian/krecipes-trinity.lintian b/debian/_base/applications/misc/krecipes/debian/krecipes-trinity.lintian
similarity index 100%
rename from debian/_base/applications/krecipes/debian/krecipes-trinity.lintian
rename to debian/_base/applications/misc/krecipes/debian/krecipes-trinity.lintian
diff --git a/debian/_base/applications/krecipes/debian/krecipes-trinity.menu b/debian/_base/applications/misc/krecipes/debian/krecipes-trinity.menu
similarity index 100%
rename from debian/_base/applications/krecipes/debian/krecipes-trinity.menu
rename to debian/_base/applications/misc/krecipes/debian/krecipes-trinity.menu
diff --git a/debian/_base/applications/krecipes/debian/krecipes.1 b/debian/_base/applications/misc/krecipes/debian/krecipes.1
similarity index 100%
rename from debian/_base/applications/krecipes/debian/krecipes.1
rename to debian/_base/applications/misc/krecipes/debian/krecipes.1
diff --git a/debian/_base/applications/krecipes/debian/krecipes.xpm b/debian/_base/applications/misc/krecipes/debian/krecipes.xpm
similarity index 100%
rename from debian/_base/applications/krecipes/debian/krecipes.xpm
rename to debian/_base/applications/misc/krecipes/debian/krecipes.xpm
diff --git a/debian/_base/applications/krecipes/debian/rules b/debian/_base/applications/misc/krecipes/debian/rules
similarity index 100%
rename from debian/_base/applications/krecipes/debian/rules
rename to debian/_base/applications/misc/krecipes/debian/rules
diff --git a/debian/_base/applications/kdirstat/debian/source/format b/debian/_base/applications/misc/krecipes/debian/source/format
similarity index 100%
rename from debian/_base/applications/kdirstat/debian/source/format
rename to debian/_base/applications/misc/krecipes/debian/source/format
diff --git a/debian/_base/applications/kdirstat/debian/source/options b/debian/_base/applications/misc/krecipes/debian/source/options
similarity index 100%
rename from debian/_base/applications/kdirstat/debian/source/options
rename to debian/_base/applications/misc/krecipes/debian/source/options
diff --git a/debian/_base/applications/krecipes/debian/watch b/debian/_base/applications/misc/krecipes/debian/watch
similarity index 100%
rename from debian/_base/applications/krecipes/debian/watch
rename to debian/_base/applications/misc/krecipes/debian/watch
diff --git a/debian/_base/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/_base/applications/multimedia/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
similarity index 100%
rename from debian/_base/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
rename to debian/_base/applications/multimedia/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/debian/_base/applications/amarok/debian/README.Debian b/debian/_base/applications/multimedia/amarok/debian/README.Debian
similarity index 100%
rename from debian/_base/applications/amarok/debian/README.Debian
rename to debian/_base/applications/multimedia/amarok/debian/README.Debian
diff --git a/debian/_base/applications/amarok/debian/amarok-common-trinity.install b/debian/_base/applications/multimedia/amarok/debian/amarok-common-trinity.install
similarity index 100%
rename from debian/_base/applications/amarok/debian/amarok-common-trinity.install
rename to debian/_base/applications/multimedia/amarok/debian/amarok-common-trinity.install
diff --git a/debian/_base/applications/amarok/debian/amarok-engine-akode-trinity.install b/debian/_base/applications/multimedia/amarok/debian/amarok-engine-akode-trinity.install
similarity index 100%
rename from debian/_base/applications/amarok/debian/amarok-engine-akode-trinity.install
rename to debian/_base/applications/multimedia/amarok/debian/amarok-engine-akode-trinity.install
diff --git a/debian/_base/applications/amarok/debian/amarok-engine-xine-trinity.install b/debian/_base/applications/multimedia/amarok/debian/amarok-engine-xine-trinity.install
similarity index 100%
rename from debian/_base/applications/amarok/debian/amarok-engine-xine-trinity.install
rename to debian/_base/applications/multimedia/amarok/debian/amarok-engine-xine-trinity.install
diff --git a/debian/_base/applications/amarok/debian/amarok-engine-yauap-trinity.install b/debian/_base/applications/multimedia/amarok/debian/amarok-engine-yauap-trinity.install
similarity index 100%
rename from debian/_base/applications/amarok/debian/amarok-engine-yauap-trinity.install
rename to debian/_base/applications/multimedia/amarok/debian/amarok-engine-yauap-trinity.install
diff --git a/debian/_base/applications/amarok/debian/amarok-konqsidebar-trinity.install b/debian/_base/applications/multimedia/amarok/debian/amarok-konqsidebar-trinity.install
similarity index 100%
rename from debian/_base/applications/amarok/debian/amarok-konqsidebar-trinity.install
rename to debian/_base/applications/multimedia/amarok/debian/amarok-konqsidebar-trinity.install
diff --git a/debian/_base/applications/amarok/debian/amarok-trinity.install b/debian/_base/applications/multimedia/amarok/debian/amarok-trinity.install
similarity index 100%
rename from debian/_base/applications/amarok/debian/amarok-trinity.install
rename to debian/_base/applications/multimedia/amarok/debian/amarok-trinity.install
diff --git a/debian/_base/applications/amarok/debian/amarok-trinity.manpages b/debian/_base/applications/multimedia/amarok/debian/amarok-trinity.manpages
similarity index 100%
rename from debian/_base/applications/amarok/debian/amarok-trinity.manpages
rename to debian/_base/applications/multimedia/amarok/debian/amarok-trinity.manpages
diff --git a/debian/_base/applications/amarok/debian/amarok-trinity.menu b/debian/_base/applications/multimedia/amarok/debian/amarok-trinity.menu
similarity index 100%
rename from debian/_base/applications/amarok/debian/amarok-trinity.menu
rename to debian/_base/applications/multimedia/amarok/debian/amarok-trinity.menu
diff --git a/debian/_base/applications/amarok/debian/amarok_play_audiocd.desktop b/debian/_base/applications/multimedia/amarok/debian/amarok_play_audiocd.desktop
similarity index 100%
rename from debian/_base/applications/amarok/debian/amarok_play_audiocd.desktop
rename to debian/_base/applications/multimedia/amarok/debian/amarok_play_audiocd.desktop
diff --git a/debian/_base/applications/kdpkg/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/amarok/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kdpkg/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/multimedia/amarok/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kdpkg/debian/cdbs/versions.pl b/debian/_base/applications/multimedia/amarok/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kdpkg/debian/cdbs/versions.pl
rename to debian/_base/applications/multimedia/amarok/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/amarok/debian/changelog b/debian/_base/applications/multimedia/amarok/debian/changelog
similarity index 100%
rename from debian/_base/applications/amarok/debian/changelog
rename to debian/_base/applications/multimedia/amarok/debian/changelog
diff --git a/debian/_base/applications/kerberostray/debian/compat b/debian/_base/applications/multimedia/amarok/debian/compat
similarity index 100%
rename from debian/_base/applications/kerberostray/debian/compat
rename to debian/_base/applications/multimedia/amarok/debian/compat
diff --git a/debian/_base/applications/amarok/debian/control b/debian/_base/applications/multimedia/amarok/debian/control
similarity index 100%
rename from debian/_base/applications/amarok/debian/control
rename to debian/_base/applications/multimedia/amarok/debian/control
diff --git a/debian/_base/applications/amarok/debian/copyright b/debian/_base/applications/multimedia/amarok/debian/copyright
similarity index 100%
rename from debian/_base/applications/amarok/debian/copyright
rename to debian/_base/applications/multimedia/amarok/debian/copyright
diff --git a/debian/_base/applications/amarok/debian/icons/amarok-16.xpm b/debian/_base/applications/multimedia/amarok/debian/icons/amarok-16.xpm
similarity index 100%
rename from debian/_base/applications/amarok/debian/icons/amarok-16.xpm
rename to debian/_base/applications/multimedia/amarok/debian/icons/amarok-16.xpm
diff --git a/debian/_base/applications/amarok/debian/icons/amarok.xpm b/debian/_base/applications/multimedia/amarok/debian/icons/amarok.xpm
similarity index 100%
rename from debian/_base/applications/amarok/debian/icons/amarok.xpm
rename to debian/_base/applications/multimedia/amarok/debian/icons/amarok.xpm
diff --git a/debian/_base/applications/amarok/debian/install-mp3 b/debian/_base/applications/multimedia/amarok/debian/install-mp3
similarity index 100%
rename from debian/_base/applications/amarok/debian/install-mp3
rename to debian/_base/applications/multimedia/amarok/debian/install-mp3
diff --git a/debian/_base/applications/amarok/debian/kubuntu-media-amarok b/debian/_base/applications/multimedia/amarok/debian/kubuntu-media-amarok
similarity index 100%
rename from debian/_base/applications/amarok/debian/kubuntu-media-amarok
rename to debian/_base/applications/multimedia/amarok/debian/kubuntu-media-amarok
diff --git a/debian/_base/applications/amarok/debian/man/amarok-trinity.1 b/debian/_base/applications/multimedia/amarok/debian/man/amarok-trinity.1
similarity index 100%
rename from debian/_base/applications/amarok/debian/man/amarok-trinity.1
rename to debian/_base/applications/multimedia/amarok/debian/man/amarok-trinity.1
diff --git a/debian/_base/applications/amarok/debian/man/amarok_libvisual-trinity.1 b/debian/_base/applications/multimedia/amarok/debian/man/amarok_libvisual-trinity.1
similarity index 100%
rename from debian/_base/applications/amarok/debian/man/amarok_libvisual-trinity.1
rename to debian/_base/applications/multimedia/amarok/debian/man/amarok_libvisual-trinity.1
diff --git a/debian/_base/applications/amarok/debian/man/amarokapp-trinity.1 b/debian/_base/applications/multimedia/amarok/debian/man/amarokapp-trinity.1
similarity index 100%
rename from debian/_base/applications/amarok/debian/man/amarokapp-trinity.1
rename to debian/_base/applications/multimedia/amarok/debian/man/amarokapp-trinity.1
diff --git a/debian/_base/applications/amarok/debian/man/amarokcollectionscanner-trinity.1 b/debian/_base/applications/multimedia/amarok/debian/man/amarokcollectionscanner-trinity.1
similarity index 100%
rename from debian/_base/applications/amarok/debian/man/amarokcollectionscanner-trinity.1
rename to debian/_base/applications/multimedia/amarok/debian/man/amarokcollectionscanner-trinity.1
diff --git a/debian/_base/applications/kbfx/debian/patches/series b/debian/_base/applications/multimedia/amarok/debian/patches/series
similarity index 100%
rename from debian/_base/applications/kbfx/debian/patches/series
rename to debian/_base/applications/multimedia/amarok/debian/patches/series
diff --git a/debian/_base/applications/amarok/debian/rules b/debian/_base/applications/multimedia/amarok/debian/rules
similarity index 100%
rename from debian/_base/applications/amarok/debian/rules
rename to debian/_base/applications/multimedia/amarok/debian/rules
diff --git a/debian/_base/applications/kdpkg/debian/source/format b/debian/_base/applications/multimedia/amarok/debian/source/format
similarity index 100%
rename from debian/_base/applications/kdpkg/debian/source/format
rename to debian/_base/applications/multimedia/amarok/debian/source/format
diff --git a/debian/_base/applications/kdpkg/debian/source/options b/debian/_base/applications/multimedia/amarok/debian/source/options
similarity index 100%
rename from debian/_base/applications/kdpkg/debian/source/options
rename to debian/_base/applications/multimedia/amarok/debian/source/options
diff --git a/debian/_base/applications/keep/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/codeine/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/keep/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/multimedia/codeine/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/keep/debian/cdbs/versions.pl b/debian/_base/applications/multimedia/codeine/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/keep/debian/cdbs/versions.pl
rename to debian/_base/applications/multimedia/codeine/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/codeine/debian/changelog b/debian/_base/applications/multimedia/codeine/debian/changelog
similarity index 100%
rename from debian/_base/applications/codeine/debian/changelog
rename to debian/_base/applications/multimedia/codeine/debian/changelog
diff --git a/debian/_base/applications/codeine/debian/codeine-trinity.menu b/debian/_base/applications/multimedia/codeine/debian/codeine-trinity.menu
similarity index 100%
rename from debian/_base/applications/codeine/debian/codeine-trinity.menu
rename to debian/_base/applications/multimedia/codeine/debian/codeine-trinity.menu
diff --git a/debian/_base/applications/keximdb/debian/compat b/debian/_base/applications/multimedia/codeine/debian/compat
similarity index 100%
rename from debian/_base/applications/keximdb/debian/compat
rename to debian/_base/applications/multimedia/codeine/debian/compat
diff --git a/debian/_base/applications/codeine/debian/control b/debian/_base/applications/multimedia/codeine/debian/control
similarity index 100%
rename from debian/_base/applications/codeine/debian/control
rename to debian/_base/applications/multimedia/codeine/debian/control
diff --git a/debian/_base/applications/codeine/debian/copyright b/debian/_base/applications/multimedia/codeine/debian/copyright
similarity index 100%
rename from debian/_base/applications/codeine/debian/copyright
rename to debian/_base/applications/multimedia/codeine/debian/copyright
diff --git a/debian/_base/applications/knetload/debian/patches/series b/debian/_base/applications/multimedia/codeine/debian/patches/series
similarity index 100%
rename from debian/_base/applications/knetload/debian/patches/series
rename to debian/_base/applications/multimedia/codeine/debian/patches/series
diff --git a/debian/_base/applications/klcddimmer/debian/rules b/debian/_base/applications/multimedia/codeine/debian/rules
similarity index 100%
rename from debian/_base/applications/klcddimmer/debian/rules
rename to debian/_base/applications/multimedia/codeine/debian/rules
diff --git a/debian/_base/applications/keep/debian/source/format b/debian/_base/applications/multimedia/codeine/debian/source/format
similarity index 100%
rename from debian/_base/applications/keep/debian/source/format
rename to debian/_base/applications/multimedia/codeine/debian/source/format
diff --git a/debian/_base/applications/keep/debian/source/options b/debian/_base/applications/multimedia/codeine/debian/source/options
similarity index 100%
rename from debian/_base/applications/keep/debian/source/options
rename to debian/_base/applications/multimedia/codeine/debian/source/options
diff --git a/debian/_base/applications/k3b-i18n/debian/changelog b/debian/_base/applications/multimedia/k3b-i18n/debian/changelog
similarity index 100%
rename from debian/_base/applications/k3b-i18n/debian/changelog
rename to debian/_base/applications/multimedia/k3b-i18n/debian/changelog
diff --git a/debian/_base/applications/kftpgrabber/debian/compat b/debian/_base/applications/multimedia/k3b-i18n/debian/compat
similarity index 100%
rename from debian/_base/applications/kftpgrabber/debian/compat
rename to debian/_base/applications/multimedia/k3b-i18n/debian/compat
diff --git a/debian/_base/applications/k3b-i18n/debian/control b/debian/_base/applications/multimedia/k3b-i18n/debian/control
similarity index 100%
rename from debian/_base/applications/k3b-i18n/debian/control
rename to debian/_base/applications/multimedia/k3b-i18n/debian/control
diff --git a/debian/_base/applications/k3b-i18n/debian/copyright b/debian/_base/applications/multimedia/k3b-i18n/debian/copyright
similarity index 100%
rename from debian/_base/applications/k3b-i18n/debian/copyright
rename to debian/_base/applications/multimedia/k3b-i18n/debian/copyright
diff --git a/debian/_base/applications/k3b-i18n/debian/rules b/debian/_base/applications/multimedia/k3b-i18n/debian/rules
similarity index 100%
rename from debian/_base/applications/k3b-i18n/debian/rules
rename to debian/_base/applications/multimedia/k3b-i18n/debian/rules
diff --git a/debian/_base/applications/kerberostray/debian/source/format b/debian/_base/applications/multimedia/k3b-i18n/debian/source/format
similarity index 100%
rename from debian/_base/applications/kerberostray/debian/source/format
rename to debian/_base/applications/multimedia/k3b-i18n/debian/source/format
diff --git a/debian/_base/applications/kerberostray/debian/source/options b/debian/_base/applications/multimedia/k3b-i18n/debian/source/options
similarity index 100%
rename from debian/_base/applications/kerberostray/debian/source/options
rename to debian/_base/applications/multimedia/k3b-i18n/debian/source/options
diff --git a/debian/_base/applications/k3b-i18n/debian/watch b/debian/_base/applications/multimedia/k3b-i18n/debian/watch
similarity index 100%
rename from debian/_base/applications/k3b-i18n/debian/watch
rename to debian/_base/applications/multimedia/k3b-i18n/debian/watch
diff --git a/debian/_base/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
similarity index 100%
rename from debian/_base/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
rename to debian/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/debian/_base/applications/k3b/debian/README.Debian b/debian/_base/applications/multimedia/k3b/debian/README.Debian
similarity index 100%
rename from debian/_base/applications/k3b/debian/README.Debian
rename to debian/_base/applications/multimedia/k3b/debian/README.Debian
diff --git a/debian/_base/applications/kerberostray/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/k3b/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kerberostray/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/multimedia/k3b/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kerberostray/debian/cdbs/versions.pl b/debian/_base/applications/multimedia/k3b/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kerberostray/debian/cdbs/versions.pl
rename to debian/_base/applications/multimedia/k3b/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/k3b/debian/changelog b/debian/_base/applications/multimedia/k3b/debian/changelog
similarity index 100%
rename from debian/_base/applications/k3b/debian/changelog
rename to debian/_base/applications/multimedia/k3b/debian/changelog
diff --git a/debian/_base/applications/kgtk-qt3/debian/compat b/debian/_base/applications/multimedia/k3b/debian/compat
similarity index 100%
rename from debian/_base/applications/kgtk-qt3/debian/compat
rename to debian/_base/applications/multimedia/k3b/debian/compat
diff --git a/debian/_base/applications/k3b/debian/control b/debian/_base/applications/multimedia/k3b/debian/control
similarity index 100%
rename from debian/_base/applications/k3b/debian/control
rename to debian/_base/applications/multimedia/k3b/debian/control
diff --git a/debian/_base/applications/k3b/debian/copyright b/debian/_base/applications/multimedia/k3b/debian/copyright
similarity index 100%
rename from debian/_base/applications/k3b/debian/copyright
rename to debian/_base/applications/multimedia/k3b/debian/copyright
diff --git a/debian/_base/applications/k3b/debian/docs b/debian/_base/applications/multimedia/k3b/debian/docs
similarity index 100%
rename from debian/_base/applications/k3b/debian/docs
rename to debian/_base/applications/multimedia/k3b/debian/docs
diff --git a/debian/_base/applications/k3b/debian/k3b-data-trinity.install b/debian/_base/applications/multimedia/k3b/debian/k3b-data-trinity.install
similarity index 100%
rename from debian/_base/applications/k3b/debian/k3b-data-trinity.install
rename to debian/_base/applications/multimedia/k3b/debian/k3b-data-trinity.install
diff --git a/debian/_base/applications/k3b/debian/k3b-data.files b/debian/_base/applications/multimedia/k3b/debian/k3b-data.files
similarity index 100%
rename from debian/_base/applications/k3b/debian/k3b-data.files
rename to debian/_base/applications/multimedia/k3b/debian/k3b-data.files
diff --git a/debian/_base/applications/k3b/debian/k3b-data.install b/debian/_base/applications/multimedia/k3b/debian/k3b-data.install
similarity index 100%
rename from debian/_base/applications/k3b/debian/k3b-data.install
rename to debian/_base/applications/multimedia/k3b/debian/k3b-data.install
diff --git a/debian/_base/applications/k3b/debian/k3b-rip-audiocd.desktop b/debian/_base/applications/multimedia/k3b/debian/k3b-rip-audiocd.desktop
similarity index 100%
rename from debian/_base/applications/k3b/debian/k3b-rip-audiocd.desktop
rename to debian/_base/applications/multimedia/k3b/debian/k3b-rip-audiocd.desktop
diff --git a/debian/_base/applications/k3b/debian/k3b-rip-videodvd.desktop b/debian/_base/applications/multimedia/k3b/debian/k3b-rip-videodvd.desktop
similarity index 100%
rename from debian/_base/applications/k3b/debian/k3b-rip-videodvd.desktop
rename to debian/_base/applications/multimedia/k3b/debian/k3b-rip-videodvd.desktop
diff --git a/debian/_base/applications/k3b/debian/k3b-trinity.1 b/debian/_base/applications/multimedia/k3b/debian/k3b-trinity.1
similarity index 100%
rename from debian/_base/applications/k3b/debian/k3b-trinity.1
rename to debian/_base/applications/multimedia/k3b/debian/k3b-trinity.1
diff --git a/debian/_base/applications/k3b/debian/k3b-trinity.install b/debian/_base/applications/multimedia/k3b/debian/k3b-trinity.install
similarity index 100%
rename from debian/_base/applications/k3b/debian/k3b-trinity.install
rename to debian/_base/applications/multimedia/k3b/debian/k3b-trinity.install
diff --git a/debian/_base/applications/k3b/debian/k3b-trinity.manpages b/debian/_base/applications/multimedia/k3b/debian/k3b-trinity.manpages
similarity index 100%
rename from debian/_base/applications/k3b/debian/k3b-trinity.manpages
rename to debian/_base/applications/multimedia/k3b/debian/k3b-trinity.manpages
diff --git a/debian/_base/applications/k3b/debian/k3b-trinity.menu b/debian/_base/applications/multimedia/k3b/debian/k3b-trinity.menu
similarity index 100%
rename from debian/_base/applications/k3b/debian/k3b-trinity.menu
rename to debian/_base/applications/multimedia/k3b/debian/k3b-trinity.menu
diff --git a/debian/_base/applications/k3b/debian/k3b-trinity.postinst b/debian/_base/applications/multimedia/k3b/debian/k3b-trinity.postinst
similarity index 100%
rename from debian/_base/applications/k3b/debian/k3b-trinity.postinst
rename to debian/_base/applications/multimedia/k3b/debian/k3b-trinity.postinst
diff --git a/debian/_base/applications/k3b/debian/k3b-write-bin-image.desktop b/debian/_base/applications/multimedia/k3b/debian/k3b-write-bin-image.desktop
similarity index 100%
rename from debian/_base/applications/k3b/debian/k3b-write-bin-image.desktop
rename to debian/_base/applications/multimedia/k3b/debian/k3b-write-bin-image.desktop
diff --git a/debian/_base/applications/k3b/debian/k3b-write-iso-image.desktop b/debian/_base/applications/multimedia/k3b/debian/k3b-write-iso-image.desktop
similarity index 100%
rename from debian/_base/applications/k3b/debian/k3b-write-iso-image.desktop
rename to debian/_base/applications/multimedia/k3b/debian/k3b-write-iso-image.desktop
diff --git a/debian/_base/applications/k3b/debian/k3b.files b/debian/_base/applications/multimedia/k3b/debian/k3b.files
similarity index 100%
rename from debian/_base/applications/k3b/debian/k3b.files
rename to debian/_base/applications/multimedia/k3b/debian/k3b.files
diff --git a/debian/_base/applications/k3b/debian/k3b.install b/debian/_base/applications/multimedia/k3b/debian/k3b.install
similarity index 100%
rename from debian/_base/applications/k3b/debian/k3b.install
rename to debian/_base/applications/multimedia/k3b/debian/k3b.install
diff --git a/debian/_base/applications/k3b/debian/k3b.manpages b/debian/_base/applications/multimedia/k3b/debian/k3b.manpages
similarity index 100%
rename from debian/_base/applications/k3b/debian/k3b.manpages
rename to debian/_base/applications/multimedia/k3b/debian/k3b.manpages
diff --git a/debian/_base/applications/k3b/debian/k3b.menu b/debian/_base/applications/multimedia/k3b/debian/k3b.menu
similarity index 100%
rename from debian/_base/applications/k3b/debian/k3b.menu
rename to debian/_base/applications/multimedia/k3b/debian/k3b.menu
diff --git a/debian/_base/applications/k3b/debian/k3b.postinst b/debian/_base/applications/multimedia/k3b/debian/k3b.postinst
similarity index 100%
rename from debian/_base/applications/k3b/debian/k3b.postinst
rename to debian/_base/applications/multimedia/k3b/debian/k3b.postinst
diff --git a/debian/_base/applications/k3b/debian/k3b.xpm b/debian/_base/applications/multimedia/k3b/debian/k3b.xpm
similarity index 100%
rename from debian/_base/applications/k3b/debian/k3b.xpm
rename to debian/_base/applications/multimedia/k3b/debian/k3b.xpm
diff --git a/debian/_base/applications/k3b/debian/libk3b-dev.files b/debian/_base/applications/multimedia/k3b/debian/libk3b-dev.files
similarity index 100%
rename from debian/_base/applications/k3b/debian/libk3b-dev.files
rename to debian/_base/applications/multimedia/k3b/debian/libk3b-dev.files
diff --git a/debian/_base/applications/k3b/debian/libk3b-dev.install b/debian/_base/applications/multimedia/k3b/debian/libk3b-dev.install
similarity index 100%
rename from debian/_base/applications/k3b/debian/libk3b-dev.install
rename to debian/_base/applications/multimedia/k3b/debian/libk3b-dev.install
diff --git a/debian/_base/applications/k3b/debian/libk3b-trinity-dev.install b/debian/_base/applications/multimedia/k3b/debian/libk3b-trinity-dev.install
similarity index 100%
rename from debian/_base/applications/k3b/debian/libk3b-trinity-dev.install
rename to debian/_base/applications/multimedia/k3b/debian/libk3b-trinity-dev.install
diff --git a/debian/_base/applications/k3b/debian/libk3b3-extracodecs-trinity.install b/debian/_base/applications/multimedia/k3b/debian/libk3b3-extracodecs-trinity.install
similarity index 100%
rename from debian/_base/applications/k3b/debian/libk3b3-extracodecs-trinity.install
rename to debian/_base/applications/multimedia/k3b/debian/libk3b3-extracodecs-trinity.install
diff --git a/debian/_base/applications/k3b/debian/libk3b3-extracodecs.install b/debian/_base/applications/multimedia/k3b/debian/libk3b3-extracodecs.install
similarity index 100%
rename from debian/_base/applications/k3b/debian/libk3b3-extracodecs.install
rename to debian/_base/applications/multimedia/k3b/debian/libk3b3-extracodecs.install
diff --git a/debian/_base/applications/k3b/debian/libk3b3-trinity.install b/debian/_base/applications/multimedia/k3b/debian/libk3b3-trinity.install
similarity index 100%
rename from debian/_base/applications/k3b/debian/libk3b3-trinity.install
rename to debian/_base/applications/multimedia/k3b/debian/libk3b3-trinity.install
diff --git a/debian/_base/applications/k3b/debian/libk3b3.files b/debian/_base/applications/multimedia/k3b/debian/libk3b3.files
similarity index 100%
rename from debian/_base/applications/k3b/debian/libk3b3.files
rename to debian/_base/applications/multimedia/k3b/debian/libk3b3.files
diff --git a/debian/_base/applications/k3b/debian/libk3b3.install b/debian/_base/applications/multimedia/k3b/debian/libk3b3.install
similarity index 100%
rename from debian/_base/applications/k3b/debian/libk3b3.install
rename to debian/_base/applications/multimedia/k3b/debian/libk3b3.install
diff --git a/debian/_base/applications/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff b/debian/_base/applications/multimedia/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff
similarity index 100%
rename from debian/_base/applications/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff
rename to debian/_base/applications/multimedia/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff
diff --git a/debian/_base/applications/k3b/debian/patches/series b/debian/_base/applications/multimedia/k3b/debian/patches/series
similarity index 100%
rename from debian/_base/applications/k3b/debian/patches/series
rename to debian/_base/applications/multimedia/k3b/debian/patches/series
diff --git a/debian/_base/applications/k3b/debian/rules b/debian/_base/applications/multimedia/k3b/debian/rules
similarity index 100%
rename from debian/_base/applications/k3b/debian/rules
rename to debian/_base/applications/multimedia/k3b/debian/rules
diff --git a/debian/_base/applications/keximdb/debian/source/format b/debian/_base/applications/multimedia/k3b/debian/source/format
similarity index 100%
rename from debian/_base/applications/keximdb/debian/source/format
rename to debian/_base/applications/multimedia/k3b/debian/source/format
diff --git a/debian/_base/applications/keximdb/debian/source/options b/debian/_base/applications/multimedia/k3b/debian/source/options
similarity index 100%
rename from debian/_base/applications/keximdb/debian/source/options
rename to debian/_base/applications/multimedia/k3b/debian/source/options
diff --git a/debian/_base/applications/k3b/debian/watch b/debian/_base/applications/multimedia/k3b/debian/watch
similarity index 100%
rename from debian/_base/applications/k3b/debian/watch
rename to debian/_base/applications/multimedia/k3b/debian/watch
diff --git a/debian/_base/applications/keximdb/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/k9copy/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/keximdb/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/multimedia/k9copy/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/keximdb/debian/cdbs/versions.pl b/debian/_base/applications/multimedia/k9copy/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/keximdb/debian/cdbs/versions.pl
rename to debian/_base/applications/multimedia/k9copy/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/k9copy/debian/changelog b/debian/_base/applications/multimedia/k9copy/debian/changelog
similarity index 100%
rename from debian/_base/applications/k9copy/debian/changelog
rename to debian/_base/applications/multimedia/k9copy/debian/changelog
diff --git a/debian/_base/applications/k9copy/debian/compat b/debian/_base/applications/multimedia/k9copy/debian/compat
similarity index 100%
rename from debian/_base/applications/k9copy/debian/compat
rename to debian/_base/applications/multimedia/k9copy/debian/compat
diff --git a/debian/_base/applications/k9copy/debian/control b/debian/_base/applications/multimedia/k9copy/debian/control
similarity index 100%
rename from debian/_base/applications/k9copy/debian/control
rename to debian/_base/applications/multimedia/k9copy/debian/control
diff --git a/debian/_base/applications/k9copy/debian/copyright b/debian/_base/applications/multimedia/k9copy/debian/copyright
similarity index 100%
rename from debian/_base/applications/k9copy/debian/copyright
rename to debian/_base/applications/multimedia/k9copy/debian/copyright
diff --git a/debian/_base/applications/k9copy/debian/docs b/debian/_base/applications/multimedia/k9copy/debian/docs
similarity index 100%
rename from debian/_base/applications/k9copy/debian/docs
rename to debian/_base/applications/multimedia/k9copy/debian/docs
diff --git a/debian/_base/applications/k9copy/debian/k9copy.1.docbook b/debian/_base/applications/multimedia/k9copy/debian/k9copy.1.docbook
similarity index 100%
rename from debian/_base/applications/k9copy/debian/k9copy.1.docbook
rename to debian/_base/applications/multimedia/k9copy/debian/k9copy.1.docbook
diff --git a/debian/_base/applications/kbookreader/debian/patches/series b/debian/_base/applications/multimedia/k9copy/debian/patches/series
similarity index 100%
rename from debian/_base/applications/kbookreader/debian/patches/series
rename to debian/_base/applications/multimedia/k9copy/debian/patches/series
diff --git a/debian/_base/applications/k9copy/debian/rules b/debian/_base/applications/multimedia/k9copy/debian/rules
similarity index 100%
rename from debian/_base/applications/k9copy/debian/rules
rename to debian/_base/applications/multimedia/k9copy/debian/rules
diff --git a/debian/_base/applications/kftpgrabber/debian/source/format b/debian/_base/applications/multimedia/k9copy/debian/source/format
similarity index 100%
rename from debian/_base/applications/kftpgrabber/debian/source/format
rename to debian/_base/applications/multimedia/k9copy/debian/source/format
diff --git a/debian/_base/applications/kftpgrabber/debian/source/options b/debian/_base/applications/multimedia/k9copy/debian/source/options
similarity index 100%
rename from debian/_base/applications/kftpgrabber/debian/source/options
rename to debian/_base/applications/multimedia/k9copy/debian/source/options
diff --git a/debian/_base/applications/kftpgrabber/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kftpgrabber/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kftpgrabber/debian/cdbs/versions.pl b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kftpgrabber/debian/cdbs/versions.pl
rename to debian/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kaffeine-mozilla/debian/changelog b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/changelog
similarity index 100%
rename from debian/_base/applications/kaffeine-mozilla/debian/changelog
rename to debian/_base/applications/multimedia/kaffeine-mozilla/debian/changelog
diff --git a/debian/_base/applications/kile/debian/compat b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/compat
similarity index 100%
rename from debian/_base/applications/kile/debian/compat
rename to debian/_base/applications/multimedia/kaffeine-mozilla/debian/compat
diff --git a/debian/_base/applications/kaffeine-mozilla/debian/control b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/control
similarity index 100%
rename from debian/_base/applications/kaffeine-mozilla/debian/control
rename to debian/_base/applications/multimedia/kaffeine-mozilla/debian/control
diff --git a/debian/_base/applications/kaffeine-mozilla/debian/copyright b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/copyright
similarity index 100%
rename from debian/_base/applications/kaffeine-mozilla/debian/copyright
rename to debian/_base/applications/multimedia/kaffeine-mozilla/debian/copyright
diff --git a/debian/_base/applications/kdbusnotification/debian/docs b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/docs
similarity index 100%
rename from debian/_base/applications/kdbusnotification/debian/docs
rename to debian/_base/applications/multimedia/kaffeine-mozilla/debian/docs
diff --git a/debian/_base/applications/kcmautostart/debian/patches/series b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/patches/series
similarity index 100%
rename from debian/_base/applications/kcmautostart/debian/patches/series
rename to debian/_base/applications/multimedia/kaffeine-mozilla/debian/patches/series
diff --git a/debian/_base/applications/kaffeine-mozilla/debian/rules b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/rules
similarity index 100%
rename from debian/_base/applications/kaffeine-mozilla/debian/rules
rename to debian/_base/applications/multimedia/kaffeine-mozilla/debian/rules
diff --git a/debian/_base/applications/kgtk-qt3/debian/source/format b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/source/format
similarity index 100%
rename from debian/_base/applications/kgtk-qt3/debian/source/format
rename to debian/_base/applications/multimedia/kaffeine-mozilla/debian/source/format
diff --git a/debian/_base/applications/kgtk-qt3/debian/source/options b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/source/options
similarity index 100%
rename from debian/_base/applications/kgtk-qt3/debian/source/options
rename to debian/_base/applications/multimedia/kaffeine-mozilla/debian/source/options
diff --git a/debian/_base/applications/kaffeine/debian/README.Debian b/debian/_base/applications/multimedia/kaffeine/debian/README.Debian
similarity index 100%
rename from debian/_base/applications/kaffeine/debian/README.Debian
rename to debian/_base/applications/multimedia/kaffeine/debian/README.Debian
diff --git a/debian/_base/applications/kgtk-qt3/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/kaffeine/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kgtk-qt3/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/multimedia/kaffeine/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kgtk-qt3/debian/cdbs/versions.pl b/debian/_base/applications/multimedia/kaffeine/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kgtk-qt3/debian/cdbs/versions.pl
rename to debian/_base/applications/multimedia/kaffeine/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kaffeine/debian/changelog b/debian/_base/applications/multimedia/kaffeine/debian/changelog
similarity index 100%
rename from debian/_base/applications/kaffeine/debian/changelog
rename to debian/_base/applications/multimedia/kaffeine/debian/changelog
diff --git a/debian/_base/applications/kima/debian/compat b/debian/_base/applications/multimedia/kaffeine/debian/compat
similarity index 100%
rename from debian/_base/applications/kima/debian/compat
rename to debian/_base/applications/multimedia/kaffeine/debian/compat
diff --git a/debian/_base/applications/kaffeine/debian/control b/debian/_base/applications/multimedia/kaffeine/debian/control
similarity index 100%
rename from debian/_base/applications/kaffeine/debian/control
rename to debian/_base/applications/multimedia/kaffeine/debian/control
diff --git a/debian/_base/applications/kaffeine/debian/copyright b/debian/_base/applications/multimedia/kaffeine/debian/copyright
similarity index 100%
rename from debian/_base/applications/kaffeine/debian/copyright
rename to debian/_base/applications/multimedia/kaffeine/debian/copyright
diff --git a/debian/_base/applications/kaffeine/debian/docs b/debian/_base/applications/multimedia/kaffeine/debian/docs
similarity index 100%
rename from debian/_base/applications/kaffeine/debian/docs
rename to debian/_base/applications/multimedia/kaffeine/debian/docs
diff --git a/debian/_base/applications/kaffeine/debian/kaffeine-gstreamer-trinity.install b/debian/_base/applications/multimedia/kaffeine/debian/kaffeine-gstreamer-trinity.install
similarity index 100%
rename from debian/_base/applications/kaffeine/debian/kaffeine-gstreamer-trinity.install
rename to debian/_base/applications/multimedia/kaffeine/debian/kaffeine-gstreamer-trinity.install
diff --git a/debian/_base/applications/kaffeine/debian/kaffeine-trinity.install b/debian/_base/applications/multimedia/kaffeine/debian/kaffeine-trinity.install
similarity index 100%
rename from debian/_base/applications/kaffeine/debian/kaffeine-trinity.install
rename to debian/_base/applications/multimedia/kaffeine/debian/kaffeine-trinity.install
diff --git a/debian/_base/applications/kaffeine/debian/kaffeine-trinity.lintian-overrides b/debian/_base/applications/multimedia/kaffeine/debian/kaffeine-trinity.lintian-overrides
similarity index 100%
rename from debian/_base/applications/kaffeine/debian/kaffeine-trinity.lintian-overrides
rename to debian/_base/applications/multimedia/kaffeine/debian/kaffeine-trinity.lintian-overrides
diff --git a/debian/_base/applications/kaffeine/debian/kaffeine-trinity.menu b/debian/_base/applications/multimedia/kaffeine/debian/kaffeine-trinity.menu
similarity index 100%
rename from debian/_base/applications/kaffeine/debian/kaffeine-trinity.menu
rename to debian/_base/applications/multimedia/kaffeine/debian/kaffeine-trinity.menu
diff --git a/debian/_base/applications/kaffeine/debian/kaffeine.xpm b/debian/_base/applications/multimedia/kaffeine/debian/kaffeine.xpm
similarity index 100%
rename from debian/_base/applications/kaffeine/debian/kaffeine.xpm
rename to debian/_base/applications/multimedia/kaffeine/debian/kaffeine.xpm
diff --git a/debian/_base/applications/kcmldap/debian/patches/series b/debian/_base/applications/multimedia/kaffeine/debian/patches/series
similarity index 100%
rename from debian/_base/applications/kcmldap/debian/patches/series
rename to debian/_base/applications/multimedia/kaffeine/debian/patches/series
diff --git a/debian/_base/applications/kmplayer/debian/rules b/debian/_base/applications/multimedia/kaffeine/debian/rules
similarity index 100%
rename from debian/_base/applications/kmplayer/debian/rules
rename to debian/_base/applications/multimedia/kaffeine/debian/rules
diff --git a/debian/_base/applications/kile/debian/source/format b/debian/_base/applications/multimedia/kaffeine/debian/source/format
similarity index 100%
rename from debian/_base/applications/kile/debian/source/format
rename to debian/_base/applications/multimedia/kaffeine/debian/source/format
diff --git a/debian/_base/applications/kile/debian/source/options b/debian/_base/applications/multimedia/kaffeine/debian/source/options
similarity index 100%
rename from debian/_base/applications/kile/debian/source/options
rename to debian/_base/applications/multimedia/kaffeine/debian/source/options
diff --git a/debian/_base/applications/kbfx/debian/README.Debian b/debian/_base/applications/multimedia/kmplayer/debian/README.Debian
similarity index 100%
rename from debian/_base/applications/kbfx/debian/README.Debian
rename to debian/_base/applications/multimedia/kmplayer/debian/README.Debian
diff --git a/debian/_base/applications/kile/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/kmplayer/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kile/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/multimedia/kmplayer/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kile/debian/cdbs/versions.pl b/debian/_base/applications/multimedia/kmplayer/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kile/debian/cdbs/versions.pl
rename to debian/_base/applications/multimedia/kmplayer/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kmplayer/debian/changelog b/debian/_base/applications/multimedia/kmplayer/debian/changelog
similarity index 100%
rename from debian/_base/applications/kmplayer/debian/changelog
rename to debian/_base/applications/multimedia/kmplayer/debian/changelog
diff --git a/debian/_base/applications/kiosktool/debian/compat b/debian/_base/applications/multimedia/kmplayer/debian/compat
similarity index 100%
rename from debian/_base/applications/kiosktool/debian/compat
rename to debian/_base/applications/multimedia/kmplayer/debian/compat
diff --git a/debian/_base/applications/kmplayer/debian/control b/debian/_base/applications/multimedia/kmplayer/debian/control
similarity index 100%
rename from debian/_base/applications/kmplayer/debian/control
rename to debian/_base/applications/multimedia/kmplayer/debian/control
diff --git a/debian/_base/applications/kmplayer/debian/copyright b/debian/_base/applications/multimedia/kmplayer/debian/copyright
similarity index 100%
rename from debian/_base/applications/kmplayer/debian/copyright
rename to debian/_base/applications/multimedia/kmplayer/debian/copyright
diff --git a/debian/_base/applications/kmplayer/debian/kmplayer-base-trinity.install b/debian/_base/applications/multimedia/kmplayer/debian/kmplayer-base-trinity.install
similarity index 100%
rename from debian/_base/applications/kmplayer/debian/kmplayer-base-trinity.install
rename to debian/_base/applications/multimedia/kmplayer/debian/kmplayer-base-trinity.install
diff --git a/debian/_base/applications/kmplayer/debian/kmplayer-koffice-plugins-trinity.install b/debian/_base/applications/multimedia/kmplayer/debian/kmplayer-koffice-plugins-trinity.install
similarity index 100%
rename from debian/_base/applications/kmplayer/debian/kmplayer-koffice-plugins-trinity.install
rename to debian/_base/applications/multimedia/kmplayer/debian/kmplayer-koffice-plugins-trinity.install
diff --git a/debian/_base/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install b/debian/_base/applications/multimedia/kmplayer/debian/kmplayer-konq-plugins-trinity.install
similarity index 100%
rename from debian/_base/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install
rename to debian/_base/applications/multimedia/kmplayer/debian/kmplayer-konq-plugins-trinity.install
diff --git a/debian/_base/applications/kmplayer/debian/kmplayer-trinity-doc.install b/debian/_base/applications/multimedia/kmplayer/debian/kmplayer-trinity-doc.install
similarity index 100%
rename from debian/_base/applications/kmplayer/debian/kmplayer-trinity-doc.install
rename to debian/_base/applications/multimedia/kmplayer/debian/kmplayer-trinity-doc.install
diff --git a/debian/_base/applications/kmplayer/debian/kmplayer-trinity.install b/debian/_base/applications/multimedia/kmplayer/debian/kmplayer-trinity.install
similarity index 100%
rename from debian/_base/applications/kmplayer/debian/kmplayer-trinity.install
rename to debian/_base/applications/multimedia/kmplayer/debian/kmplayer-trinity.install
diff --git a/debian/_base/applications/kmplayer/debian/kmplayer-trinity.menu b/debian/_base/applications/multimedia/kmplayer/debian/kmplayer-trinity.menu
similarity index 100%
rename from debian/_base/applications/kmplayer/debian/kmplayer-trinity.menu
rename to debian/_base/applications/multimedia/kmplayer/debian/kmplayer-trinity.menu
diff --git a/debian/_base/applications/kcmldapcontroller/debian/patches/series b/debian/_base/applications/multimedia/kmplayer/debian/patches/series
similarity index 100%
rename from debian/_base/applications/kcmldapcontroller/debian/patches/series
rename to debian/_base/applications/multimedia/kmplayer/debian/patches/series
diff --git a/debian/_base/applications/knetstats/debian/rules b/debian/_base/applications/multimedia/kmplayer/debian/rules
similarity index 100%
rename from debian/_base/applications/knetstats/debian/rules
rename to debian/_base/applications/multimedia/kmplayer/debian/rules
diff --git a/debian/_base/applications/kima/debian/source/format b/debian/_base/applications/multimedia/kmplayer/debian/source/format
similarity index 100%
rename from debian/_base/applications/kima/debian/source/format
rename to debian/_base/applications/multimedia/kmplayer/debian/source/format
diff --git a/debian/_base/applications/kima/debian/source/options b/debian/_base/applications/multimedia/kmplayer/debian/source/options
similarity index 100%
rename from debian/_base/applications/kima/debian/source/options
rename to debian/_base/applications/multimedia/kmplayer/debian/source/options
diff --git a/debian/_base/applications/kima/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/kplayer/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kima/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/multimedia/kplayer/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kima/debian/cdbs/versions.pl b/debian/_base/applications/multimedia/kplayer/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kima/debian/cdbs/versions.pl
rename to debian/_base/applications/multimedia/kplayer/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kplayer/debian/changelog b/debian/_base/applications/multimedia/kplayer/debian/changelog
similarity index 100%
rename from debian/_base/applications/kplayer/debian/changelog
rename to debian/_base/applications/multimedia/kplayer/debian/changelog
diff --git a/debian/_base/applications/kkbswitch/debian/compat b/debian/_base/applications/multimedia/kplayer/debian/compat
similarity index 100%
rename from debian/_base/applications/kkbswitch/debian/compat
rename to debian/_base/applications/multimedia/kplayer/debian/compat
diff --git a/debian/_base/applications/kplayer/debian/control b/debian/_base/applications/multimedia/kplayer/debian/control
similarity index 100%
rename from debian/_base/applications/kplayer/debian/control
rename to debian/_base/applications/multimedia/kplayer/debian/control
diff --git a/debian/_base/applications/kplayer/debian/copyright b/debian/_base/applications/multimedia/kplayer/debian/copyright
similarity index 100%
rename from debian/_base/applications/kplayer/debian/copyright
rename to debian/_base/applications/multimedia/kplayer/debian/copyright
diff --git a/debian/_base/applications/kplayer/debian/patches/series b/debian/_base/applications/multimedia/kplayer/debian/patches/series
similarity index 100%
rename from debian/_base/applications/kplayer/debian/patches/series
rename to debian/_base/applications/multimedia/kplayer/debian/patches/series
diff --git a/debian/_base/applications/knmap/debian/rules b/debian/_base/applications/multimedia/kplayer/debian/rules
similarity index 100%
rename from debian/_base/applications/knmap/debian/rules
rename to debian/_base/applications/multimedia/kplayer/debian/rules
diff --git a/debian/_base/applications/kiosktool/debian/source/format b/debian/_base/applications/multimedia/kplayer/debian/source/format
similarity index 100%
rename from debian/_base/applications/kiosktool/debian/source/format
rename to debian/_base/applications/multimedia/kplayer/debian/source/format
diff --git a/debian/_base/applications/kiosktool/debian/source/options b/debian/_base/applications/multimedia/kplayer/debian/source/options
similarity index 100%
rename from debian/_base/applications/kiosktool/debian/source/options
rename to debian/_base/applications/multimedia/kplayer/debian/source/options
diff --git a/debian/_base/applications/kiosktool/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/mplayerthumbs/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kiosktool/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/multimedia/mplayerthumbs/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kiosktool/debian/cdbs/versions.pl b/debian/_base/applications/multimedia/mplayerthumbs/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kiosktool/debian/cdbs/versions.pl
rename to debian/_base/applications/multimedia/mplayerthumbs/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/mplayerthumbs/debian/changelog b/debian/_base/applications/multimedia/mplayerthumbs/debian/changelog
similarity index 100%
rename from debian/_base/applications/mplayerthumbs/debian/changelog
rename to debian/_base/applications/multimedia/mplayerthumbs/debian/changelog
diff --git a/debian/_base/applications/klamav/debian/compat b/debian/_base/applications/multimedia/mplayerthumbs/debian/compat
similarity index 100%
rename from debian/_base/applications/klamav/debian/compat
rename to debian/_base/applications/multimedia/mplayerthumbs/debian/compat
diff --git a/debian/_base/applications/mplayerthumbs/debian/control b/debian/_base/applications/multimedia/mplayerthumbs/debian/control
similarity index 100%
rename from debian/_base/applications/mplayerthumbs/debian/control
rename to debian/_base/applications/multimedia/mplayerthumbs/debian/control
diff --git a/debian/_base/applications/mplayerthumbs/debian/copyright b/debian/_base/applications/multimedia/mplayerthumbs/debian/copyright
similarity index 100%
rename from debian/_base/applications/mplayerthumbs/debian/copyright
rename to debian/_base/applications/multimedia/mplayerthumbs/debian/copyright
diff --git a/debian/_base/applications/knmap/debian/docs b/debian/_base/applications/multimedia/mplayerthumbs/debian/docs
similarity index 100%
rename from debian/_base/applications/knmap/debian/docs
rename to debian/_base/applications/multimedia/mplayerthumbs/debian/docs
diff --git a/debian/_base/applications/kdpkg/debian/rules b/debian/_base/applications/multimedia/mplayerthumbs/debian/rules
similarity index 100%
rename from debian/_base/applications/kdpkg/debian/rules
rename to debian/_base/applications/multimedia/mplayerthumbs/debian/rules
diff --git a/debian/_base/applications/kkbswitch/debian/source/format b/debian/_base/applications/multimedia/mplayerthumbs/debian/source/format
similarity index 100%
rename from debian/_base/applications/kkbswitch/debian/source/format
rename to debian/_base/applications/multimedia/mplayerthumbs/debian/source/format
diff --git a/debian/_base/applications/kkbswitch/debian/source/options b/debian/_base/applications/multimedia/mplayerthumbs/debian/source/options
similarity index 100%
rename from debian/_base/applications/kkbswitch/debian/source/options
rename to debian/_base/applications/multimedia/mplayerthumbs/debian/source/options
diff --git a/debian/_base/applications/rosegarden/debian/README.Debian b/debian/_base/applications/multimedia/rosegarden/debian/README.Debian
similarity index 100%
rename from debian/_base/applications/rosegarden/debian/README.Debian
rename to debian/_base/applications/multimedia/rosegarden/debian/README.Debian
diff --git a/debian/_base/applications/kkbswitch/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/rosegarden/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kkbswitch/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/multimedia/rosegarden/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kkbswitch/debian/cdbs/versions.pl b/debian/_base/applications/multimedia/rosegarden/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kkbswitch/debian/cdbs/versions.pl
rename to debian/_base/applications/multimedia/rosegarden/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/rosegarden/debian/changelog b/debian/_base/applications/multimedia/rosegarden/debian/changelog
similarity index 100%
rename from debian/_base/applications/rosegarden/debian/changelog
rename to debian/_base/applications/multimedia/rosegarden/debian/changelog
diff --git a/debian/_base/applications/klcddimmer/debian/compat b/debian/_base/applications/multimedia/rosegarden/debian/compat
similarity index 100%
rename from debian/_base/applications/klcddimmer/debian/compat
rename to debian/_base/applications/multimedia/rosegarden/debian/compat
diff --git a/debian/_base/applications/rosegarden/debian/control b/debian/_base/applications/multimedia/rosegarden/debian/control
similarity index 100%
rename from debian/_base/applications/rosegarden/debian/control
rename to debian/_base/applications/multimedia/rosegarden/debian/control
diff --git a/debian/_base/applications/rosegarden/debian/copyright b/debian/_base/applications/multimedia/rosegarden/debian/copyright
similarity index 100%
rename from debian/_base/applications/rosegarden/debian/copyright
rename to debian/_base/applications/multimedia/rosegarden/debian/copyright
diff --git a/debian/_base/applications/kcmldapmanager/debian/patches/series b/debian/_base/applications/multimedia/rosegarden/debian/patches/series
similarity index 100%
rename from debian/_base/applications/kcmldapmanager/debian/patches/series
rename to debian/_base/applications/multimedia/rosegarden/debian/patches/series
diff --git a/debian/_base/applications/rosegarden/debian/rosegarden-audiofile-importer.1 b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-audiofile-importer.1
similarity index 100%
rename from debian/_base/applications/rosegarden/debian/rosegarden-audiofile-importer.1
rename to debian/_base/applications/multimedia/rosegarden/debian/rosegarden-audiofile-importer.1
diff --git a/debian/_base/applications/rosegarden/debian/rosegarden-data-trinity.install b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-data-trinity.install
similarity index 100%
rename from debian/_base/applications/rosegarden/debian/rosegarden-data-trinity.install
rename to debian/_base/applications/multimedia/rosegarden/debian/rosegarden-data-trinity.install
diff --git a/debian/_base/applications/rosegarden/debian/rosegarden-lilypondview.1 b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-lilypondview.1
similarity index 100%
rename from debian/_base/applications/rosegarden/debian/rosegarden-lilypondview.1
rename to debian/_base/applications/multimedia/rosegarden/debian/rosegarden-lilypondview.1
diff --git a/debian/_base/applications/rosegarden/debian/rosegarden-project-package.1 b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-project-package.1
similarity index 100%
rename from debian/_base/applications/rosegarden/debian/rosegarden-project-package.1
rename to debian/_base/applications/multimedia/rosegarden/debian/rosegarden-project-package.1
diff --git a/debian/_base/applications/rosegarden/debian/rosegarden-trinity.dirs b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.dirs
similarity index 100%
rename from debian/_base/applications/rosegarden/debian/rosegarden-trinity.dirs
rename to debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.dirs
diff --git a/debian/_base/applications/rosegarden/debian/rosegarden-trinity.docs b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.docs
similarity index 100%
rename from debian/_base/applications/rosegarden/debian/rosegarden-trinity.docs
rename to debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.docs
diff --git a/debian/_base/applications/rosegarden/debian/rosegarden-trinity.examples b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.examples
similarity index 100%
rename from debian/_base/applications/rosegarden/debian/rosegarden-trinity.examples
rename to debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.examples
diff --git a/debian/_base/applications/rosegarden/debian/rosegarden-trinity.install b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.install
similarity index 100%
rename from debian/_base/applications/rosegarden/debian/rosegarden-trinity.install
rename to debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.install
diff --git a/debian/_base/applications/rosegarden/debian/rosegarden-trinity.links b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.links
similarity index 100%
rename from debian/_base/applications/rosegarden/debian/rosegarden-trinity.links
rename to debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.links
diff --git a/debian/_base/applications/rosegarden/debian/rosegarden-trinity.lintian b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.lintian
similarity index 100%
rename from debian/_base/applications/rosegarden/debian/rosegarden-trinity.lintian
rename to debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.lintian
diff --git a/debian/_base/applications/rosegarden/debian/rosegarden-trinity.manpages b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.manpages
similarity index 100%
rename from debian/_base/applications/rosegarden/debian/rosegarden-trinity.manpages
rename to debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.manpages
diff --git a/debian/_base/applications/rosegarden/debian/rosegarden-trinity.menu b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.menu
similarity index 100%
rename from debian/_base/applications/rosegarden/debian/rosegarden-trinity.menu
rename to debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.menu
diff --git a/debian/_base/applications/rosegarden/debian/rosegarden-trinity.sharedmimeinfo b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.sharedmimeinfo
similarity index 100%
rename from debian/_base/applications/rosegarden/debian/rosegarden-trinity.sharedmimeinfo
rename to debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.sharedmimeinfo
diff --git a/debian/_base/applications/rosegarden/debian/rosegarden.1 b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden.1
similarity index 100%
rename from debian/_base/applications/rosegarden/debian/rosegarden.1
rename to debian/_base/applications/multimedia/rosegarden/debian/rosegarden.1
diff --git a/debian/_base/applications/rosegarden/debian/rules b/debian/_base/applications/multimedia/rosegarden/debian/rules
similarity index 100%
rename from debian/_base/applications/rosegarden/debian/rules
rename to debian/_base/applications/multimedia/rosegarden/debian/rules
diff --git a/debian/_base/applications/rosegarden/debian/semantic.cache b/debian/_base/applications/multimedia/rosegarden/debian/semantic.cache
similarity index 100%
rename from debian/_base/applications/rosegarden/debian/semantic.cache
rename to debian/_base/applications/multimedia/rosegarden/debian/semantic.cache
diff --git a/debian/_base/applications/klamav/debian/source/format b/debian/_base/applications/multimedia/rosegarden/debian/source/format
similarity index 100%
rename from debian/_base/applications/klamav/debian/source/format
rename to debian/_base/applications/multimedia/rosegarden/debian/source/format
diff --git a/debian/_base/applications/klamav/debian/source/options b/debian/_base/applications/multimedia/rosegarden/debian/source/options
similarity index 100%
rename from debian/_base/applications/klamav/debian/source/options
rename to debian/_base/applications/multimedia/rosegarden/debian/source/options
diff --git a/debian/_base/applications/rosegarden/debian/watch b/debian/_base/applications/multimedia/rosegarden/debian/watch
similarity index 100%
rename from debian/_base/applications/rosegarden/debian/watch
rename to debian/_base/applications/multimedia/rosegarden/debian/watch
diff --git a/debian/_base/applications/rosegarden/debian/x-rosegarden.desktop b/debian/_base/applications/multimedia/rosegarden/debian/x-rosegarden.desktop
similarity index 100%
rename from debian/_base/applications/rosegarden/debian/x-rosegarden.desktop
rename to debian/_base/applications/multimedia/rosegarden/debian/x-rosegarden.desktop
diff --git a/debian/_base/applications/soundkonverter/debian/README.Debian b/debian/_base/applications/multimedia/soundkonverter/debian/README.Debian
similarity index 100%
rename from debian/_base/applications/soundkonverter/debian/README.Debian
rename to debian/_base/applications/multimedia/soundkonverter/debian/README.Debian
diff --git a/debian/_base/applications/klamav/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/soundkonverter/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/klamav/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/multimedia/soundkonverter/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/klamav/debian/cdbs/versions.pl b/debian/_base/applications/multimedia/soundkonverter/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/klamav/debian/cdbs/versions.pl
rename to debian/_base/applications/multimedia/soundkonverter/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/soundkonverter/debian/changelog b/debian/_base/applications/multimedia/soundkonverter/debian/changelog
similarity index 100%
rename from debian/_base/applications/soundkonverter/debian/changelog
rename to debian/_base/applications/multimedia/soundkonverter/debian/changelog
diff --git a/debian/_base/applications/kmplayer/debian/compat b/debian/_base/applications/multimedia/soundkonverter/debian/compat
similarity index 100%
rename from debian/_base/applications/kmplayer/debian/compat
rename to debian/_base/applications/multimedia/soundkonverter/debian/compat
diff --git a/debian/_base/applications/soundkonverter/debian/control b/debian/_base/applications/multimedia/soundkonverter/debian/control
similarity index 100%
rename from debian/_base/applications/soundkonverter/debian/control
rename to debian/_base/applications/multimedia/soundkonverter/debian/control
diff --git a/debian/_base/applications/soundkonverter/debian/copyright b/debian/_base/applications/multimedia/soundkonverter/debian/copyright
similarity index 100%
rename from debian/_base/applications/soundkonverter/debian/copyright
rename to debian/_base/applications/multimedia/soundkonverter/debian/copyright
diff --git a/debian/_base/applications/kdiff3/debian/docs b/debian/_base/applications/multimedia/soundkonverter/debian/docs
similarity index 100%
rename from debian/_base/applications/kdiff3/debian/docs
rename to debian/_base/applications/multimedia/soundkonverter/debian/docs
diff --git a/debian/_base/applications/ksplash-engine-moodin/debian/patches/.gitignore b/debian/_base/applications/multimedia/soundkonverter/debian/patches/.gitignore
similarity index 100%
rename from debian/_base/applications/ksplash-engine-moodin/debian/patches/.gitignore
rename to debian/_base/applications/multimedia/soundkonverter/debian/patches/.gitignore
diff --git a/debian/_base/applications/soundkonverter/debian/rules b/debian/_base/applications/multimedia/soundkonverter/debian/rules
similarity index 100%
rename from debian/_base/applications/soundkonverter/debian/rules
rename to debian/_base/applications/multimedia/soundkonverter/debian/rules
diff --git a/debian/_base/applications/soundkonverter/debian/soundkonverter-amarok-trinity.install b/debian/_base/applications/multimedia/soundkonverter/debian/soundkonverter-amarok-trinity.install
similarity index 100%
rename from debian/_base/applications/soundkonverter/debian/soundkonverter-amarok-trinity.install
rename to debian/_base/applications/multimedia/soundkonverter/debian/soundkonverter-amarok-trinity.install
diff --git a/debian/_base/applications/soundkonverter/debian/soundkonverter-trinity.install b/debian/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.install
similarity index 100%
rename from debian/_base/applications/soundkonverter/debian/soundkonverter-trinity.install
rename to debian/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.install
diff --git a/debian/_base/applications/soundkonverter/debian/soundkonverter-trinity.lintian-overrides b/debian/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.lintian-overrides
similarity index 100%
rename from debian/_base/applications/soundkonverter/debian/soundkonverter-trinity.lintian-overrides
rename to debian/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.lintian-overrides
diff --git a/debian/_base/applications/klcddimmer/debian/source/format b/debian/_base/applications/multimedia/soundkonverter/debian/source/format
similarity index 100%
rename from debian/_base/applications/klcddimmer/debian/source/format
rename to debian/_base/applications/multimedia/soundkonverter/debian/source/format
diff --git a/debian/_base/applications/klcddimmer/debian/source/options b/debian/_base/applications/multimedia/soundkonverter/debian/source/options
similarity index 100%
rename from debian/_base/applications/klcddimmer/debian/source/options
rename to debian/_base/applications/multimedia/soundkonverter/debian/source/options
diff --git a/debian/_base/applications/tderadio/debian/changelog b/debian/_base/applications/multimedia/tderadio/debian/changelog
similarity index 100%
rename from debian/_base/applications/tderadio/debian/changelog
rename to debian/_base/applications/multimedia/tderadio/debian/changelog
diff --git a/debian/_base/applications/kmyfirewall/debian/compat b/debian/_base/applications/multimedia/tderadio/debian/compat
similarity index 100%
rename from debian/_base/applications/kmyfirewall/debian/compat
rename to debian/_base/applications/multimedia/tderadio/debian/compat
diff --git a/debian/_base/applications/tderadio/debian/control b/debian/_base/applications/multimedia/tderadio/debian/control
similarity index 100%
rename from debian/_base/applications/tderadio/debian/control
rename to debian/_base/applications/multimedia/tderadio/debian/control
diff --git a/debian/_base/applications/tderadio/debian/convert-presets.1 b/debian/_base/applications/multimedia/tderadio/debian/convert-presets.1
similarity index 100%
rename from debian/_base/applications/tderadio/debian/convert-presets.1
rename to debian/_base/applications/multimedia/tderadio/debian/convert-presets.1
diff --git a/debian/_base/applications/tderadio/debian/copyright b/debian/_base/applications/multimedia/tderadio/debian/copyright
similarity index 100%
rename from debian/_base/applications/tderadio/debian/copyright
rename to debian/_base/applications/multimedia/tderadio/debian/copyright
diff --git a/debian/_base/applications/tderadio/debian/docs b/debian/_base/applications/multimedia/tderadio/debian/docs
similarity index 100%
rename from debian/_base/applications/tderadio/debian/docs
rename to debian/_base/applications/multimedia/tderadio/debian/docs
diff --git a/debian/_base/applications/tderadio/debian/manpages b/debian/_base/applications/multimedia/tderadio/debian/manpages
similarity index 100%
rename from debian/_base/applications/tderadio/debian/manpages
rename to debian/_base/applications/multimedia/tderadio/debian/manpages
diff --git a/debian/_base/applications/tderadio/debian/menu b/debian/_base/applications/multimedia/tderadio/debian/menu
similarity index 100%
rename from debian/_base/applications/tderadio/debian/menu
rename to debian/_base/applications/multimedia/tderadio/debian/menu
diff --git a/debian/_base/applications/tderadio/debian/rules b/debian/_base/applications/multimedia/tderadio/debian/rules
similarity index 100%
rename from debian/_base/applications/tderadio/debian/rules
rename to debian/_base/applications/multimedia/tderadio/debian/rules
diff --git a/debian/_base/applications/kmplayer/debian/source/format b/debian/_base/applications/multimedia/tderadio/debian/source/format
similarity index 100%
rename from debian/_base/applications/kmplayer/debian/source/format
rename to debian/_base/applications/multimedia/tderadio/debian/source/format
diff --git a/debian/_base/applications/kmplayer/debian/source/options b/debian/_base/applications/multimedia/tderadio/debian/source/options
similarity index 100%
rename from debian/_base/applications/kmplayer/debian/source/options
rename to debian/_base/applications/multimedia/tderadio/debian/source/options
diff --git a/debian/_base/applications/tderadio/debian/tderadio.1 b/debian/_base/applications/multimedia/tderadio/debian/tderadio.1
similarity index 100%
rename from debian/_base/applications/tderadio/debian/tderadio.1
rename to debian/_base/applications/multimedia/tderadio/debian/tderadio.1
diff --git a/debian/_base/applications/tderadio/debian/watch b/debian/_base/applications/multimedia/tderadio/debian/watch
similarity index 100%
rename from debian/_base/applications/tderadio/debian/watch
rename to debian/_base/applications/multimedia/tderadio/debian/watch
diff --git a/debian/_base/applications/basket/debian/basket-kontact-integration-trinity.install b/debian/_base/applications/office/basket/debian/basket-kontact-integration-trinity.install
similarity index 100%
rename from debian/_base/applications/basket/debian/basket-kontact-integration-trinity.install
rename to debian/_base/applications/office/basket/debian/basket-kontact-integration-trinity.install
diff --git a/debian/_base/applications/basket/debian/basket-trinity.install b/debian/_base/applications/office/basket/debian/basket-trinity.install
similarity index 100%
rename from debian/_base/applications/basket/debian/basket-trinity.install
rename to debian/_base/applications/office/basket/debian/basket-trinity.install
diff --git a/debian/_base/applications/klcddimmer/debian/cdbs/debian-tde.mk b/debian/_base/applications/office/basket/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/klcddimmer/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/office/basket/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/klcddimmer/debian/cdbs/versions.pl b/debian/_base/applications/office/basket/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/klcddimmer/debian/cdbs/versions.pl
rename to debian/_base/applications/office/basket/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/basket/debian/changelog b/debian/_base/applications/office/basket/debian/changelog
similarity index 100%
rename from debian/_base/applications/basket/debian/changelog
rename to debian/_base/applications/office/basket/debian/changelog
diff --git a/debian/_base/applications/kmymoney/debian/compat b/debian/_base/applications/office/basket/debian/compat
similarity index 100%
rename from debian/_base/applications/kmymoney/debian/compat
rename to debian/_base/applications/office/basket/debian/compat
diff --git a/debian/_base/applications/basket/debian/control b/debian/_base/applications/office/basket/debian/control
similarity index 100%
rename from debian/_base/applications/basket/debian/control
rename to debian/_base/applications/office/basket/debian/control
diff --git a/debian/_base/applications/basket/debian/copyright b/debian/_base/applications/office/basket/debian/copyright
similarity index 100%
rename from debian/_base/applications/basket/debian/copyright
rename to debian/_base/applications/office/basket/debian/copyright
diff --git a/debian/_base/applications/kbiff/debian/dirs b/debian/_base/applications/office/basket/debian/dirs
similarity index 100%
rename from debian/_base/applications/kbiff/debian/dirs
rename to debian/_base/applications/office/basket/debian/dirs
diff --git a/debian/_base/applications/kompose/debian/docs b/debian/_base/applications/office/basket/debian/docs
similarity index 100%
rename from debian/_base/applications/kompose/debian/docs
rename to debian/_base/applications/office/basket/debian/docs
diff --git a/debian/_base/applications/basket/debian/menu b/debian/_base/applications/office/basket/debian/menu
similarity index 100%
rename from debian/_base/applications/basket/debian/menu
rename to debian/_base/applications/office/basket/debian/menu
diff --git a/debian/_base/applications/kdirstat/debian/patches/series b/debian/_base/applications/office/basket/debian/patches/series
similarity index 100%
rename from debian/_base/applications/kdirstat/debian/patches/series
rename to debian/_base/applications/office/basket/debian/patches/series
diff --git a/debian/_base/applications/knowit/debian/rules b/debian/_base/applications/office/basket/debian/rules
similarity index 100%
rename from debian/_base/applications/knowit/debian/rules
rename to debian/_base/applications/office/basket/debian/rules
diff --git a/debian/_base/applications/kmyfirewall/debian/source/format b/debian/_base/applications/office/basket/debian/source/format
similarity index 100%
rename from debian/_base/applications/kmyfirewall/debian/source/format
rename to debian/_base/applications/office/basket/debian/source/format
diff --git a/debian/_base/applications/kmyfirewall/debian/source/options b/debian/_base/applications/office/basket/debian/source/options
similarity index 100%
rename from debian/_base/applications/kmyfirewall/debian/source/options
rename to debian/_base/applications/office/basket/debian/source/options
diff --git a/debian/_base/applications/kmplayer/debian/cdbs/debian-tde.mk b/debian/_base/applications/office/kbibtex/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kmplayer/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/office/kbibtex/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kmplayer/debian/cdbs/versions.pl b/debian/_base/applications/office/kbibtex/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kmplayer/debian/cdbs/versions.pl
rename to debian/_base/applications/office/kbibtex/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kbibtex/debian/changelog b/debian/_base/applications/office/kbibtex/debian/changelog
similarity index 100%
rename from debian/_base/applications/kbibtex/debian/changelog
rename to debian/_base/applications/office/kbibtex/debian/changelog
diff --git a/debian/_base/applications/knemo/debian/compat b/debian/_base/applications/office/kbibtex/debian/compat
similarity index 100%
rename from debian/_base/applications/knemo/debian/compat
rename to debian/_base/applications/office/kbibtex/debian/compat
diff --git a/debian/_base/applications/kbibtex/debian/control b/debian/_base/applications/office/kbibtex/debian/control
similarity index 100%
rename from debian/_base/applications/kbibtex/debian/control
rename to debian/_base/applications/office/kbibtex/debian/control
diff --git a/debian/_base/applications/kbibtex/debian/copyright b/debian/_base/applications/office/kbibtex/debian/copyright
similarity index 100%
rename from debian/_base/applications/kbibtex/debian/copyright
rename to debian/_base/applications/office/kbibtex/debian/copyright
diff --git a/debian/_base/applications/kbibtex/debian/docs b/debian/_base/applications/office/kbibtex/debian/docs
similarity index 100%
rename from debian/_base/applications/kbibtex/debian/docs
rename to debian/_base/applications/office/kbibtex/debian/docs
diff --git a/debian/_base/applications/kbibtex/debian/menu b/debian/_base/applications/office/kbibtex/debian/menu
similarity index 100%
rename from debian/_base/applications/kbibtex/debian/menu
rename to debian/_base/applications/office/kbibtex/debian/menu
diff --git a/debian/_base/applications/keep/debian/rules b/debian/_base/applications/office/kbibtex/debian/rules
similarity index 100%
rename from debian/_base/applications/keep/debian/rules
rename to debian/_base/applications/office/kbibtex/debian/rules
diff --git a/debian/_base/applications/kmymoney/debian/source/format b/debian/_base/applications/office/kbibtex/debian/source/format
similarity index 100%
rename from debian/_base/applications/kmymoney/debian/source/format
rename to debian/_base/applications/office/kbibtex/debian/source/format
diff --git a/debian/_base/applications/kmymoney/debian/source/options b/debian/_base/applications/office/kbibtex/debian/source/options
similarity index 100%
rename from debian/_base/applications/kmymoney/debian/source/options
rename to debian/_base/applications/office/kbibtex/debian/source/options
diff --git a/debian/_base/applications/kmyfirewall/debian/cdbs/debian-tde.mk b/debian/_base/applications/office/kbookreader/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kmyfirewall/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/office/kbookreader/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kmyfirewall/debian/cdbs/versions.pl b/debian/_base/applications/office/kbookreader/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kmyfirewall/debian/cdbs/versions.pl
rename to debian/_base/applications/office/kbookreader/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kbookreader/debian/changelog b/debian/_base/applications/office/kbookreader/debian/changelog
similarity index 100%
rename from debian/_base/applications/kbookreader/debian/changelog
rename to debian/_base/applications/office/kbookreader/debian/changelog
diff --git a/debian/_base/applications/kbookreader/debian/compat b/debian/_base/applications/office/kbookreader/debian/compat
similarity index 100%
rename from debian/_base/applications/kbookreader/debian/compat
rename to debian/_base/applications/office/kbookreader/debian/compat
diff --git a/debian/_base/applications/kbookreader/debian/control b/debian/_base/applications/office/kbookreader/debian/control
similarity index 100%
rename from debian/_base/applications/kbookreader/debian/control
rename to debian/_base/applications/office/kbookreader/debian/control
diff --git a/debian/_base/applications/kbookreader/debian/copyright b/debian/_base/applications/office/kbookreader/debian/copyright
similarity index 100%
rename from debian/_base/applications/kbookreader/debian/copyright
rename to debian/_base/applications/office/kbookreader/debian/copyright
diff --git a/debian/_base/applications/kbookreader/debian/docs b/debian/_base/applications/office/kbookreader/debian/docs
similarity index 100%
rename from debian/_base/applications/kbookreader/debian/docs
rename to debian/_base/applications/office/kbookreader/debian/docs
diff --git a/debian/_base/applications/kdpkg/debian/patches/series b/debian/_base/applications/office/kbookreader/debian/patches/series
similarity index 100%
rename from debian/_base/applications/kdpkg/debian/patches/series
rename to debian/_base/applications/office/kbookreader/debian/patches/series
diff --git a/debian/_base/applications/knutclient/debian/rules b/debian/_base/applications/office/kbookreader/debian/rules
similarity index 100%
rename from debian/_base/applications/knutclient/debian/rules
rename to debian/_base/applications/office/kbookreader/debian/rules
diff --git a/debian/_base/applications/knemo/debian/source/format b/debian/_base/applications/office/kbookreader/debian/source/format
similarity index 100%
rename from debian/_base/applications/knemo/debian/source/format
rename to debian/_base/applications/office/kbookreader/debian/source/format
diff --git a/debian/_base/applications/knemo/debian/source/options b/debian/_base/applications/office/kbookreader/debian/source/options
similarity index 100%
rename from debian/_base/applications/knemo/debian/source/options
rename to debian/_base/applications/office/kbookreader/debian/source/options
diff --git a/debian/_base/applications/kmymoney/debian/cdbs/debian-tde.mk b/debian/_base/applications/office/keximdb/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kmymoney/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/office/keximdb/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kmymoney/debian/cdbs/versions.pl b/debian/_base/applications/office/keximdb/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kmymoney/debian/cdbs/versions.pl
rename to debian/_base/applications/office/keximdb/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/keximdb/debian/changelog b/debian/_base/applications/office/keximdb/debian/changelog
similarity index 100%
rename from debian/_base/applications/keximdb/debian/changelog
rename to debian/_base/applications/office/keximdb/debian/changelog
diff --git a/debian/_base/applications/knetload/debian/compat b/debian/_base/applications/office/keximdb/debian/compat
similarity index 100%
rename from debian/_base/applications/knetload/debian/compat
rename to debian/_base/applications/office/keximdb/debian/compat
diff --git a/debian/_base/applications/keximdb/debian/control b/debian/_base/applications/office/keximdb/debian/control
similarity index 100%
rename from debian/_base/applications/keximdb/debian/control
rename to debian/_base/applications/office/keximdb/debian/control
diff --git a/debian/_base/applications/keximdb/debian/copyright b/debian/_base/applications/office/keximdb/debian/copyright
similarity index 100%
rename from debian/_base/applications/keximdb/debian/copyright
rename to debian/_base/applications/office/keximdb/debian/copyright
diff --git a/debian/_base/applications/kshowmail/debian/docs b/debian/_base/applications/office/keximdb/debian/docs
similarity index 100%
rename from debian/_base/applications/kshowmail/debian/docs
rename to debian/_base/applications/office/keximdb/debian/docs
diff --git a/debian/_base/applications/keximdb/debian/rules b/debian/_base/applications/office/keximdb/debian/rules
similarity index 100%
rename from debian/_base/applications/keximdb/debian/rules
rename to debian/_base/applications/office/keximdb/debian/rules
diff --git a/debian/_base/applications/knetload/debian/source/format b/debian/_base/applications/office/keximdb/debian/source/format
similarity index 100%
rename from debian/_base/applications/knetload/debian/source/format
rename to debian/_base/applications/office/keximdb/debian/source/format
diff --git a/debian/_base/applications/knetload/debian/source/options b/debian/_base/applications/office/keximdb/debian/source/options
similarity index 100%
rename from debian/_base/applications/knetload/debian/source/options
rename to debian/_base/applications/office/keximdb/debian/source/options
diff --git a/debian/_base/applications/kile/debian/README.Debian b/debian/_base/applications/office/kile/debian/README.Debian
similarity index 100%
rename from debian/_base/applications/kile/debian/README.Debian
rename to debian/_base/applications/office/kile/debian/README.Debian
diff --git a/debian/_base/applications/kile/debian/TODO.Debian b/debian/_base/applications/office/kile/debian/TODO.Debian
similarity index 100%
rename from debian/_base/applications/kile/debian/TODO.Debian
rename to debian/_base/applications/office/kile/debian/TODO.Debian
diff --git a/debian/_base/applications/knemo/debian/cdbs/debian-tde.mk b/debian/_base/applications/office/kile/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/knemo/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/office/kile/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/knemo/debian/cdbs/versions.pl b/debian/_base/applications/office/kile/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/knemo/debian/cdbs/versions.pl
rename to debian/_base/applications/office/kile/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kile/debian/changelog b/debian/_base/applications/office/kile/debian/changelog
similarity index 100%
rename from debian/_base/applications/kile/debian/changelog
rename to debian/_base/applications/office/kile/debian/changelog
diff --git a/debian/_base/applications/knetstats/debian/compat b/debian/_base/applications/office/kile/debian/compat
similarity index 100%
rename from debian/_base/applications/knetstats/debian/compat
rename to debian/_base/applications/office/kile/debian/compat
diff --git a/debian/_base/applications/kile/debian/control b/debian/_base/applications/office/kile/debian/control
similarity index 100%
rename from debian/_base/applications/kile/debian/control
rename to debian/_base/applications/office/kile/debian/control
diff --git a/debian/_base/applications/kile/debian/copyright b/debian/_base/applications/office/kile/debian/copyright
similarity index 100%
rename from debian/_base/applications/kile/debian/copyright
rename to debian/_base/applications/office/kile/debian/copyright
diff --git a/debian/_base/applications/ksquirrel/debian/docs b/debian/_base/applications/office/kile/debian/docs
similarity index 100%
rename from debian/_base/applications/ksquirrel/debian/docs
rename to debian/_base/applications/office/kile/debian/docs
diff --git a/debian/_base/applications/kile/debian/kile-trinity.install b/debian/_base/applications/office/kile/debian/kile-trinity.install
similarity index 100%
rename from debian/_base/applications/kile/debian/kile-trinity.install
rename to debian/_base/applications/office/kile/debian/kile-trinity.install
diff --git a/debian/_base/applications/kile/debian/kile-trinity.links b/debian/_base/applications/office/kile/debian/kile-trinity.links
similarity index 100%
rename from debian/_base/applications/kile/debian/kile-trinity.links
rename to debian/_base/applications/office/kile/debian/kile-trinity.links
diff --git a/debian/_base/applications/kile/debian/kile.1 b/debian/_base/applications/office/kile/debian/kile.1
similarity index 100%
rename from debian/_base/applications/kile/debian/kile.1
rename to debian/_base/applications/office/kile/debian/kile.1
diff --git a/debian/_base/applications/kile/debian/kile.xpm b/debian/_base/applications/office/kile/debian/kile.xpm
similarity index 100%
rename from debian/_base/applications/kile/debian/kile.xpm
rename to debian/_base/applications/office/kile/debian/kile.xpm
diff --git a/debian/_base/applications/kile/debian/menu b/debian/_base/applications/office/kile/debian/menu
similarity index 100%
rename from debian/_base/applications/kile/debian/menu
rename to debian/_base/applications/office/kile/debian/menu
diff --git a/debian/_base/applications/ksquirrel/debian/patches/.gitignore b/debian/_base/applications/office/kile/debian/patches/.gitignore
similarity index 100%
rename from debian/_base/applications/ksquirrel/debian/patches/.gitignore
rename to debian/_base/applications/office/kile/debian/patches/.gitignore
diff --git a/debian/_base/applications/kile/debian/rules b/debian/_base/applications/office/kile/debian/rules
similarity index 100%
rename from debian/_base/applications/kile/debian/rules
rename to debian/_base/applications/office/kile/debian/rules
diff --git a/debian/_base/applications/knetstats/debian/source/format b/debian/_base/applications/office/kile/debian/source/format
similarity index 100%
rename from debian/_base/applications/knetstats/debian/source/format
rename to debian/_base/applications/office/kile/debian/source/format
diff --git a/debian/_base/applications/knetstats/debian/source/options b/debian/_base/applications/office/kile/debian/source/options
similarity index 100%
rename from debian/_base/applications/knetstats/debian/source/options
rename to debian/_base/applications/office/kile/debian/source/options
diff --git a/debian/_base/applications/kile/debian/watch b/debian/_base/applications/office/kile/debian/watch
similarity index 100%
rename from debian/_base/applications/kile/debian/watch
rename to debian/_base/applications/office/kile/debian/watch
diff --git a/debian/_base/applications/kmymoney/debian/NEWS b/debian/_base/applications/office/kmymoney/debian/NEWS
similarity index 100%
rename from debian/_base/applications/kmymoney/debian/NEWS
rename to debian/_base/applications/office/kmymoney/debian/NEWS
diff --git a/debian/_base/applications/kmymoney/debian/README.source b/debian/_base/applications/office/kmymoney/debian/README.source
similarity index 100%
rename from debian/_base/applications/kmymoney/debian/README.source
rename to debian/_base/applications/office/kmymoney/debian/README.source
diff --git a/debian/_base/applications/knetload/debian/cdbs/debian-tde.mk b/debian/_base/applications/office/kmymoney/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/knetload/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/office/kmymoney/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/knetload/debian/cdbs/versions.pl b/debian/_base/applications/office/kmymoney/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/knetload/debian/cdbs/versions.pl
rename to debian/_base/applications/office/kmymoney/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kmymoney/debian/changelog b/debian/_base/applications/office/kmymoney/debian/changelog
similarity index 100%
rename from debian/_base/applications/kmymoney/debian/changelog
rename to debian/_base/applications/office/kmymoney/debian/changelog
diff --git a/debian/_base/applications/knetworkmanager8/debian/compat b/debian/_base/applications/office/kmymoney/debian/compat
similarity index 100%
rename from debian/_base/applications/knetworkmanager8/debian/compat
rename to debian/_base/applications/office/kmymoney/debian/compat
diff --git a/debian/_base/applications/kmymoney/debian/control b/debian/_base/applications/office/kmymoney/debian/control
similarity index 100%
rename from debian/_base/applications/kmymoney/debian/control
rename to debian/_base/applications/office/kmymoney/debian/control
diff --git a/debian/_base/applications/kmymoney/debian/copyright b/debian/_base/applications/office/kmymoney/debian/copyright
similarity index 100%
rename from debian/_base/applications/kmymoney/debian/copyright
rename to debian/_base/applications/office/kmymoney/debian/copyright
diff --git a/debian/_base/applications/kmymoney/debian/kmymoney2-common-trinity.install b/debian/_base/applications/office/kmymoney/debian/kmymoney2-common-trinity.install
similarity index 100%
rename from debian/_base/applications/kmymoney/debian/kmymoney2-common-trinity.install
rename to debian/_base/applications/office/kmymoney/debian/kmymoney2-common-trinity.install
diff --git a/debian/_base/applications/kmymoney/debian/kmymoney2-trinity-dev.install b/debian/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install
similarity index 100%
rename from debian/_base/applications/kmymoney/debian/kmymoney2-trinity-dev.install
rename to debian/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install
diff --git a/debian/_base/applications/kmymoney/debian/kmymoney2-trinity.docs b/debian/_base/applications/office/kmymoney/debian/kmymoney2-trinity.docs
similarity index 100%
rename from debian/_base/applications/kmymoney/debian/kmymoney2-trinity.docs
rename to debian/_base/applications/office/kmymoney/debian/kmymoney2-trinity.docs
diff --git a/debian/_base/applications/kmymoney/debian/kmymoney2-trinity.install b/debian/_base/applications/office/kmymoney/debian/kmymoney2-trinity.install
similarity index 100%
rename from debian/_base/applications/kmymoney/debian/kmymoney2-trinity.install
rename to debian/_base/applications/office/kmymoney/debian/kmymoney2-trinity.install
diff --git a/debian/_base/applications/kmymoney/debian/kmymoney2.xpm b/debian/_base/applications/office/kmymoney/debian/kmymoney2.xpm
similarity index 100%
rename from debian/_base/applications/kmymoney/debian/kmymoney2.xpm
rename to debian/_base/applications/office/kmymoney/debian/kmymoney2.xpm
diff --git a/debian/_base/applications/kmymoney/debian/menu b/debian/_base/applications/office/kmymoney/debian/menu
similarity index 100%
rename from debian/_base/applications/kmymoney/debian/menu
rename to debian/_base/applications/office/kmymoney/debian/menu
diff --git a/debian/_base/applications/keep/debian/patches/series b/debian/_base/applications/office/kmymoney/debian/patches/series
similarity index 100%
rename from debian/_base/applications/keep/debian/patches/series
rename to debian/_base/applications/office/kmymoney/debian/patches/series
diff --git a/debian/_base/applications/kmymoney/debian/rules b/debian/_base/applications/office/kmymoney/debian/rules
similarity index 100%
rename from debian/_base/applications/kmymoney/debian/rules
rename to debian/_base/applications/office/kmymoney/debian/rules
diff --git a/debian/_base/applications/knetworkmanager8/debian/source/format b/debian/_base/applications/office/kmymoney/debian/source/format
similarity index 100%
rename from debian/_base/applications/knetworkmanager8/debian/source/format
rename to debian/_base/applications/office/kmymoney/debian/source/format
diff --git a/debian/_base/applications/knetworkmanager8/debian/source/options b/debian/_base/applications/office/kmymoney/debian/source/options
similarity index 100%
rename from debian/_base/applications/knetworkmanager8/debian/source/options
rename to debian/_base/applications/office/kmymoney/debian/source/options
diff --git a/debian/_base/applications/kmymoney/debian/watch b/debian/_base/applications/office/kmymoney/debian/watch
similarity index 100%
rename from debian/_base/applications/kmymoney/debian/watch
rename to debian/_base/applications/office/kmymoney/debian/watch
diff --git a/debian/_base/applications/knetstats/debian/cdbs/debian-tde.mk b/debian/_base/applications/office/knowit/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/knetstats/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/office/knowit/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/knetstats/debian/cdbs/versions.pl b/debian/_base/applications/office/knowit/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/knetstats/debian/cdbs/versions.pl
rename to debian/_base/applications/office/knowit/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/knowit/debian/changelog b/debian/_base/applications/office/knowit/debian/changelog
similarity index 100%
rename from debian/_base/applications/knowit/debian/changelog
rename to debian/_base/applications/office/knowit/debian/changelog
diff --git a/debian/_base/applications/knights/debian/compat b/debian/_base/applications/office/knowit/debian/compat
similarity index 100%
rename from debian/_base/applications/knights/debian/compat
rename to debian/_base/applications/office/knowit/debian/compat
diff --git a/debian/_base/applications/knowit/debian/control b/debian/_base/applications/office/knowit/debian/control
similarity index 100%
rename from debian/_base/applications/knowit/debian/control
rename to debian/_base/applications/office/knowit/debian/control
diff --git a/debian/_base/applications/knowit/debian/copyright b/debian/_base/applications/office/knowit/debian/copyright
similarity index 100%
rename from debian/_base/applications/knowit/debian/copyright
rename to debian/_base/applications/office/knowit/debian/copyright
diff --git a/debian/_base/applications/knowit/debian/docs b/debian/_base/applications/office/knowit/debian/docs
similarity index 100%
rename from debian/_base/applications/knowit/debian/docs
rename to debian/_base/applications/office/knowit/debian/docs
diff --git a/debian/_base/applications/kopete-otr/debian/rules b/debian/_base/applications/office/knowit/debian/rules
similarity index 100%
rename from debian/_base/applications/kopete-otr/debian/rules
rename to debian/_base/applications/office/knowit/debian/rules
diff --git a/debian/_base/applications/knights/debian/source/format b/debian/_base/applications/office/knowit/debian/source/format
similarity index 100%
rename from debian/_base/applications/knights/debian/source/format
rename to debian/_base/applications/office/knowit/debian/source/format
diff --git a/debian/_base/applications/knights/debian/source/options b/debian/_base/applications/office/knowit/debian/source/options
similarity index 100%
rename from debian/_base/applications/knights/debian/source/options
rename to debian/_base/applications/office/knowit/debian/source/options
diff --git a/debian/_base/applications/koffice-i18n/debian/changelog b/debian/_base/applications/office/koffice-i18n/debian/changelog
similarity index 100%
rename from debian/_base/applications/koffice-i18n/debian/changelog
rename to debian/_base/applications/office/koffice-i18n/debian/changelog
diff --git a/debian/_base/applications/knmap/debian/compat b/debian/_base/applications/office/koffice-i18n/debian/compat
similarity index 100%
rename from debian/_base/applications/knmap/debian/compat
rename to debian/_base/applications/office/koffice-i18n/debian/compat
diff --git a/debian/_base/applications/koffice-i18n/debian/control b/debian/_base/applications/office/koffice-i18n/debian/control
similarity index 100%
rename from debian/_base/applications/koffice-i18n/debian/control
rename to debian/_base/applications/office/koffice-i18n/debian/control
diff --git a/debian/_base/applications/koffice-i18n/debian/copyright b/debian/_base/applications/office/koffice-i18n/debian/copyright
similarity index 100%
rename from debian/_base/applications/koffice-i18n/debian/copyright
rename to debian/_base/applications/office/koffice-i18n/debian/copyright
diff --git a/debian/_base/applications/kmyfirewall/debian/debiandirs b/debian/_base/applications/office/koffice-i18n/debian/debiandirs
similarity index 100%
rename from debian/_base/applications/kmyfirewall/debian/debiandirs
rename to debian/_base/applications/office/koffice-i18n/debian/debiandirs
diff --git a/debian/_base/applications/koffice-i18n/debian/rules b/debian/_base/applications/office/koffice-i18n/debian/rules
similarity index 100%
rename from debian/_base/applications/koffice-i18n/debian/rules
rename to debian/_base/applications/office/koffice-i18n/debian/rules
diff --git a/debian/_base/applications/knmap/debian/source/format b/debian/_base/applications/office/koffice-i18n/debian/source/format
similarity index 100%
rename from debian/_base/applications/knmap/debian/source/format
rename to debian/_base/applications/office/koffice-i18n/debian/source/format
diff --git a/debian/_base/applications/knmap/debian/source/options b/debian/_base/applications/office/koffice-i18n/debian/source/options
similarity index 100%
rename from debian/_base/applications/knmap/debian/source/options
rename to debian/_base/applications/office/koffice-i18n/debian/source/options
diff --git a/debian/_base/applications/koffice/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/_base/applications/office/koffice/debian/KUBUNTU-DEBIAN-DIFFERENCES
similarity index 100%
rename from debian/_base/applications/koffice/debian/KUBUNTU-DEBIAN-DIFFERENCES
rename to debian/_base/applications/office/koffice/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/debian/_base/applications/koffice/debian/README.MimeType b/debian/_base/applications/office/koffice/debian/README.MimeType
similarity index 100%
rename from debian/_base/applications/koffice/debian/README.MimeType
rename to debian/_base/applications/office/koffice/debian/README.MimeType
diff --git a/debian/_base/applications/knetworkmanager8/debian/cdbs/debian-tde.mk b/debian/_base/applications/office/koffice/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/knetworkmanager8/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/office/koffice/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/knetworkmanager8/debian/cdbs/versions.pl b/debian/_base/applications/office/koffice/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/knetworkmanager8/debian/cdbs/versions.pl
rename to debian/_base/applications/office/koffice/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/koffice/debian/chalk-data-trinity.install b/debian/_base/applications/office/koffice/debian/chalk-data-trinity.install
similarity index 100%
rename from debian/_base/applications/koffice/debian/chalk-data-trinity.install
rename to debian/_base/applications/office/koffice/debian/chalk-data-trinity.install
diff --git a/debian/_base/applications/koffice/debian/chalk-data-trinity.lintian b/debian/_base/applications/office/koffice/debian/chalk-data-trinity.lintian
similarity index 100%
rename from debian/_base/applications/koffice/debian/chalk-data-trinity.lintian
rename to debian/_base/applications/office/koffice/debian/chalk-data-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/chalk-trinity.docs b/debian/_base/applications/office/koffice/debian/chalk-trinity.docs
similarity index 100%
rename from debian/_base/applications/koffice/debian/chalk-trinity.docs
rename to debian/_base/applications/office/koffice/debian/chalk-trinity.docs
diff --git a/debian/_base/applications/koffice/debian/chalk-trinity.install b/debian/_base/applications/office/koffice/debian/chalk-trinity.install
similarity index 100%
rename from debian/_base/applications/koffice/debian/chalk-trinity.install
rename to debian/_base/applications/office/koffice/debian/chalk-trinity.install
diff --git a/debian/_base/applications/koffice/debian/chalk-trinity.lintian b/debian/_base/applications/office/koffice/debian/chalk-trinity.lintian
similarity index 100%
rename from debian/_base/applications/koffice/debian/chalk-trinity.lintian
rename to debian/_base/applications/office/koffice/debian/chalk-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/chalk-trinity.menu b/debian/_base/applications/office/koffice/debian/chalk-trinity.menu
similarity index 100%
rename from debian/_base/applications/koffice/debian/chalk-trinity.menu
rename to debian/_base/applications/office/koffice/debian/chalk-trinity.menu
diff --git a/debian/_base/applications/koffice/debian/chalk-trinity.mime b/debian/_base/applications/office/koffice/debian/chalk-trinity.mime
similarity index 100%
rename from debian/_base/applications/koffice/debian/chalk-trinity.mime
rename to debian/_base/applications/office/koffice/debian/chalk-trinity.mime
diff --git a/debian/_base/applications/koffice/debian/chalk.xpm b/debian/_base/applications/office/koffice/debian/chalk.xpm
similarity index 100%
rename from debian/_base/applications/koffice/debian/chalk.xpm
rename to debian/_base/applications/office/koffice/debian/chalk.xpm
diff --git a/debian/_base/applications/koffice/debian/changelog b/debian/_base/applications/office/koffice/debian/changelog
similarity index 100%
rename from debian/_base/applications/koffice/debian/changelog
rename to debian/_base/applications/office/koffice/debian/changelog
diff --git a/debian/_base/applications/knowit/debian/compat b/debian/_base/applications/office/koffice/debian/compat
similarity index 100%
rename from debian/_base/applications/knowit/debian/compat
rename to debian/_base/applications/office/koffice/debian/compat
diff --git a/debian/_base/applications/koffice/debian/control b/debian/_base/applications/office/koffice/debian/control
similarity index 100%
rename from debian/_base/applications/koffice/debian/control
rename to debian/_base/applications/office/koffice/debian/control
diff --git a/debian/_base/applications/koffice/debian/copyright b/debian/_base/applications/office/koffice/debian/copyright
similarity index 100%
rename from debian/_base/applications/koffice/debian/copyright
rename to debian/_base/applications/office/koffice/debian/copyright
diff --git a/debian/_base/applications/koffice/debian/fogra27l.icm.uu b/debian/_base/applications/office/koffice/debian/fogra27l.icm.uu
similarity index 100%
rename from debian/_base/applications/koffice/debian/fogra27l.icm.uu
rename to debian/_base/applications/office/koffice/debian/fogra27l.icm.uu
diff --git a/debian/_base/applications/koffice/debian/karbon-trinity.docs b/debian/_base/applications/office/koffice/debian/karbon-trinity.docs
similarity index 100%
rename from debian/_base/applications/koffice/debian/karbon-trinity.docs
rename to debian/_base/applications/office/koffice/debian/karbon-trinity.docs
diff --git a/debian/_base/applications/koffice/debian/karbon-trinity.install b/debian/_base/applications/office/koffice/debian/karbon-trinity.install
similarity index 100%
rename from debian/_base/applications/koffice/debian/karbon-trinity.install
rename to debian/_base/applications/office/koffice/debian/karbon-trinity.install
diff --git a/debian/_base/applications/koffice/debian/karbon-trinity.lintian b/debian/_base/applications/office/koffice/debian/karbon-trinity.lintian
similarity index 100%
rename from debian/_base/applications/koffice/debian/karbon-trinity.lintian
rename to debian/_base/applications/office/koffice/debian/karbon-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/karbon-trinity.manpages b/debian/_base/applications/office/koffice/debian/karbon-trinity.manpages
similarity index 100%
rename from debian/_base/applications/koffice/debian/karbon-trinity.manpages
rename to debian/_base/applications/office/koffice/debian/karbon-trinity.manpages
diff --git a/debian/_base/applications/koffice/debian/karbon-trinity.menu b/debian/_base/applications/office/koffice/debian/karbon-trinity.menu
similarity index 100%
rename from debian/_base/applications/koffice/debian/karbon-trinity.menu
rename to debian/_base/applications/office/koffice/debian/karbon-trinity.menu
diff --git a/debian/_base/applications/koffice/debian/karbon-trinity.mime b/debian/_base/applications/office/koffice/debian/karbon-trinity.mime
similarity index 100%
rename from debian/_base/applications/koffice/debian/karbon-trinity.mime
rename to debian/_base/applications/office/koffice/debian/karbon-trinity.mime
diff --git a/debian/_base/applications/koffice/debian/karbon.1 b/debian/_base/applications/office/koffice/debian/karbon.1
similarity index 100%
rename from debian/_base/applications/koffice/debian/karbon.1
rename to debian/_base/applications/office/koffice/debian/karbon.1
diff --git a/debian/_base/applications/koffice/debian/karbon.xpm b/debian/_base/applications/office/koffice/debian/karbon.xpm
similarity index 100%
rename from debian/_base/applications/koffice/debian/karbon.xpm
rename to debian/_base/applications/office/koffice/debian/karbon.xpm
diff --git a/debian/_base/applications/koffice/debian/kchart-trinity.README.Debian b/debian/_base/applications/office/koffice/debian/kchart-trinity.README.Debian
similarity index 100%
rename from debian/_base/applications/koffice/debian/kchart-trinity.README.Debian
rename to debian/_base/applications/office/koffice/debian/kchart-trinity.README.Debian
diff --git a/debian/_base/applications/koffice/debian/kchart-trinity.docs b/debian/_base/applications/office/koffice/debian/kchart-trinity.docs
similarity index 100%
rename from debian/_base/applications/koffice/debian/kchart-trinity.docs
rename to debian/_base/applications/office/koffice/debian/kchart-trinity.docs
diff --git a/debian/_base/applications/koffice/debian/kchart-trinity.install b/debian/_base/applications/office/koffice/debian/kchart-trinity.install
similarity index 100%
rename from debian/_base/applications/koffice/debian/kchart-trinity.install
rename to debian/_base/applications/office/koffice/debian/kchart-trinity.install
diff --git a/debian/_base/applications/koffice/debian/kchart-trinity.lintian b/debian/_base/applications/office/koffice/debian/kchart-trinity.lintian
similarity index 100%
rename from debian/_base/applications/koffice/debian/kchart-trinity.lintian
rename to debian/_base/applications/office/koffice/debian/kchart-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/kchart-trinity.manpages b/debian/_base/applications/office/koffice/debian/kchart-trinity.manpages
similarity index 100%
rename from debian/_base/applications/koffice/debian/kchart-trinity.manpages
rename to debian/_base/applications/office/koffice/debian/kchart-trinity.manpages
diff --git a/debian/_base/applications/koffice/debian/kchart-trinity.menu b/debian/_base/applications/office/koffice/debian/kchart-trinity.menu
similarity index 100%
rename from debian/_base/applications/koffice/debian/kchart-trinity.menu
rename to debian/_base/applications/office/koffice/debian/kchart-trinity.menu
diff --git a/debian/_base/applications/koffice/debian/kchart-trinity.mime b/debian/_base/applications/office/koffice/debian/kchart-trinity.mime
similarity index 100%
rename from debian/_base/applications/koffice/debian/kchart-trinity.mime
rename to debian/_base/applications/office/koffice/debian/kchart-trinity.mime
diff --git a/debian/_base/applications/koffice/debian/kchart.1 b/debian/_base/applications/office/koffice/debian/kchart.1
similarity index 100%
rename from debian/_base/applications/koffice/debian/kchart.1
rename to debian/_base/applications/office/koffice/debian/kchart.1
diff --git a/debian/_base/applications/koffice/debian/kchart.xpm b/debian/_base/applications/office/koffice/debian/kchart.xpm
similarity index 100%
rename from debian/_base/applications/koffice/debian/kchart.xpm
rename to debian/_base/applications/office/koffice/debian/kchart.xpm
diff --git a/debian/_base/applications/koffice/debian/kexi-trinity.docs b/debian/_base/applications/office/koffice/debian/kexi-trinity.docs
similarity index 100%
rename from debian/_base/applications/koffice/debian/kexi-trinity.docs
rename to debian/_base/applications/office/koffice/debian/kexi-trinity.docs
diff --git a/debian/_base/applications/koffice/debian/kexi-trinity.install b/debian/_base/applications/office/koffice/debian/kexi-trinity.install
similarity index 100%
rename from debian/_base/applications/koffice/debian/kexi-trinity.install
rename to debian/_base/applications/office/koffice/debian/kexi-trinity.install
diff --git a/debian/_base/applications/koffice/debian/kexi-trinity.lintian b/debian/_base/applications/office/koffice/debian/kexi-trinity.lintian
similarity index 100%
rename from debian/_base/applications/koffice/debian/kexi-trinity.lintian
rename to debian/_base/applications/office/koffice/debian/kexi-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/kformula-trinity.README.Debian b/debian/_base/applications/office/koffice/debian/kformula-trinity.README.Debian
similarity index 100%
rename from debian/_base/applications/koffice/debian/kformula-trinity.README.Debian
rename to debian/_base/applications/office/koffice/debian/kformula-trinity.README.Debian
diff --git a/debian/_base/applications/koffice/debian/kformula-trinity.docs b/debian/_base/applications/office/koffice/debian/kformula-trinity.docs
similarity index 100%
rename from debian/_base/applications/koffice/debian/kformula-trinity.docs
rename to debian/_base/applications/office/koffice/debian/kformula-trinity.docs
diff --git a/debian/_base/applications/koffice/debian/kformula-trinity.install b/debian/_base/applications/office/koffice/debian/kformula-trinity.install
similarity index 100%
rename from debian/_base/applications/koffice/debian/kformula-trinity.install
rename to debian/_base/applications/office/koffice/debian/kformula-trinity.install
diff --git a/debian/_base/applications/koffice/debian/kformula-trinity.lintian b/debian/_base/applications/office/koffice/debian/kformula-trinity.lintian
similarity index 100%
rename from debian/_base/applications/koffice/debian/kformula-trinity.lintian
rename to debian/_base/applications/office/koffice/debian/kformula-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/kformula-trinity.manpages b/debian/_base/applications/office/koffice/debian/kformula-trinity.manpages
similarity index 100%
rename from debian/_base/applications/koffice/debian/kformula-trinity.manpages
rename to debian/_base/applications/office/koffice/debian/kformula-trinity.manpages
diff --git a/debian/_base/applications/koffice/debian/kformula-trinity.menu b/debian/_base/applications/office/koffice/debian/kformula-trinity.menu
similarity index 100%
rename from debian/_base/applications/koffice/debian/kformula-trinity.menu
rename to debian/_base/applications/office/koffice/debian/kformula-trinity.menu
diff --git a/debian/_base/applications/koffice/debian/kformula-trinity.mime b/debian/_base/applications/office/koffice/debian/kformula-trinity.mime
similarity index 100%
rename from debian/_base/applications/koffice/debian/kformula-trinity.mime
rename to debian/_base/applications/office/koffice/debian/kformula-trinity.mime
diff --git a/debian/_base/applications/koffice/debian/kformula.1 b/debian/_base/applications/office/koffice/debian/kformula.1
similarity index 100%
rename from debian/_base/applications/koffice/debian/kformula.1
rename to debian/_base/applications/office/koffice/debian/kformula.1
diff --git a/debian/_base/applications/koffice/debian/kformula.xpm b/debian/_base/applications/office/koffice/debian/kformula.xpm
similarity index 100%
rename from debian/_base/applications/koffice/debian/kformula.xpm
rename to debian/_base/applications/office/koffice/debian/kformula.xpm
diff --git a/debian/_base/applications/koffice/debian/kivio-data-trinity.README.Debian b/debian/_base/applications/office/koffice/debian/kivio-data-trinity.README.Debian
similarity index 100%
rename from debian/_base/applications/koffice/debian/kivio-data-trinity.README.Debian
rename to debian/_base/applications/office/koffice/debian/kivio-data-trinity.README.Debian
diff --git a/debian/_base/applications/koffice/debian/kivio-data-trinity.docs b/debian/_base/applications/office/koffice/debian/kivio-data-trinity.docs
similarity index 100%
rename from debian/_base/applications/koffice/debian/kivio-data-trinity.docs
rename to debian/_base/applications/office/koffice/debian/kivio-data-trinity.docs
diff --git a/debian/_base/applications/koffice/debian/kivio-data-trinity.install b/debian/_base/applications/office/koffice/debian/kivio-data-trinity.install
similarity index 100%
rename from debian/_base/applications/koffice/debian/kivio-data-trinity.install
rename to debian/_base/applications/office/koffice/debian/kivio-data-trinity.install
diff --git a/debian/_base/applications/koffice/debian/kivio-data-trinity.lintian b/debian/_base/applications/office/koffice/debian/kivio-data-trinity.lintian
similarity index 100%
rename from debian/_base/applications/koffice/debian/kivio-data-trinity.lintian
rename to debian/_base/applications/office/koffice/debian/kivio-data-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/kivio-trinity.docs b/debian/_base/applications/office/koffice/debian/kivio-trinity.docs
similarity index 100%
rename from debian/_base/applications/koffice/debian/kivio-trinity.docs
rename to debian/_base/applications/office/koffice/debian/kivio-trinity.docs
diff --git a/debian/_base/applications/koffice/debian/kivio-trinity.install b/debian/_base/applications/office/koffice/debian/kivio-trinity.install
similarity index 100%
rename from debian/_base/applications/koffice/debian/kivio-trinity.install
rename to debian/_base/applications/office/koffice/debian/kivio-trinity.install
diff --git a/debian/_base/applications/koffice/debian/kivio-trinity.lintian b/debian/_base/applications/office/koffice/debian/kivio-trinity.lintian
similarity index 100%
rename from debian/_base/applications/koffice/debian/kivio-trinity.lintian
rename to debian/_base/applications/office/koffice/debian/kivio-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/kivio-trinity.manpages b/debian/_base/applications/office/koffice/debian/kivio-trinity.manpages
similarity index 100%
rename from debian/_base/applications/koffice/debian/kivio-trinity.manpages
rename to debian/_base/applications/office/koffice/debian/kivio-trinity.manpages
diff --git a/debian/_base/applications/koffice/debian/kivio-trinity.menu b/debian/_base/applications/office/koffice/debian/kivio-trinity.menu
similarity index 100%
rename from debian/_base/applications/koffice/debian/kivio-trinity.menu
rename to debian/_base/applications/office/koffice/debian/kivio-trinity.menu
diff --git a/debian/_base/applications/koffice/debian/kivio-trinity.mime b/debian/_base/applications/office/koffice/debian/kivio-trinity.mime
similarity index 100%
rename from debian/_base/applications/koffice/debian/kivio-trinity.mime
rename to debian/_base/applications/office/koffice/debian/kivio-trinity.mime
diff --git a/debian/_base/applications/koffice/debian/kivio.1 b/debian/_base/applications/office/koffice/debian/kivio.1
similarity index 100%
rename from debian/_base/applications/koffice/debian/kivio.1
rename to debian/_base/applications/office/koffice/debian/kivio.1
diff --git a/debian/_base/applications/koffice/debian/kivio.xpm b/debian/_base/applications/office/koffice/debian/kivio.xpm
similarity index 100%
rename from debian/_base/applications/koffice/debian/kivio.xpm
rename to debian/_base/applications/office/koffice/debian/kivio.xpm
diff --git a/debian/_base/applications/koffice/debian/koconverter.1 b/debian/_base/applications/office/koffice/debian/koconverter.1
similarity index 100%
rename from debian/_base/applications/koffice/debian/koconverter.1
rename to debian/_base/applications/office/koffice/debian/koconverter.1
diff --git a/debian/_base/applications/koffice/debian/koffice-data-trinity.README.Debian b/debian/_base/applications/office/koffice/debian/koffice-data-trinity.README.Debian
similarity index 100%
rename from debian/_base/applications/koffice/debian/koffice-data-trinity.README.Debian
rename to debian/_base/applications/office/koffice/debian/koffice-data-trinity.README.Debian
diff --git a/debian/_base/applications/koffice/debian/koffice-data-trinity.docs b/debian/_base/applications/office/koffice/debian/koffice-data-trinity.docs
similarity index 100%
rename from debian/_base/applications/koffice/debian/koffice-data-trinity.docs
rename to debian/_base/applications/office/koffice/debian/koffice-data-trinity.docs
diff --git a/debian/_base/applications/koffice/debian/koffice-data-trinity.install b/debian/_base/applications/office/koffice/debian/koffice-data-trinity.install
similarity index 100%
rename from debian/_base/applications/koffice/debian/koffice-data-trinity.install
rename to debian/_base/applications/office/koffice/debian/koffice-data-trinity.install
diff --git a/debian/_base/applications/koffice/debian/koffice-data-trinity.links b/debian/_base/applications/office/koffice/debian/koffice-data-trinity.links
similarity index 100%
rename from debian/_base/applications/koffice/debian/koffice-data-trinity.links
rename to debian/_base/applications/office/koffice/debian/koffice-data-trinity.links
diff --git a/debian/_base/applications/koffice/debian/koffice-libs-trinity.README.Debian b/debian/_base/applications/office/koffice/debian/koffice-libs-trinity.README.Debian
similarity index 100%
rename from debian/_base/applications/koffice/debian/koffice-libs-trinity.README.Debian
rename to debian/_base/applications/office/koffice/debian/koffice-libs-trinity.README.Debian
diff --git a/debian/_base/applications/koffice/debian/koffice-libs-trinity.docs b/debian/_base/applications/office/koffice/debian/koffice-libs-trinity.docs
similarity index 100%
rename from debian/_base/applications/koffice/debian/koffice-libs-trinity.docs
rename to debian/_base/applications/office/koffice/debian/koffice-libs-trinity.docs
diff --git a/debian/_base/applications/koffice/debian/koffice-libs-trinity.install b/debian/_base/applications/office/koffice/debian/koffice-libs-trinity.install
similarity index 100%
rename from debian/_base/applications/koffice/debian/koffice-libs-trinity.install
rename to debian/_base/applications/office/koffice/debian/koffice-libs-trinity.install
diff --git a/debian/_base/applications/koffice/debian/koffice-libs-trinity.links b/debian/_base/applications/office/koffice/debian/koffice-libs-trinity.links
similarity index 100%
rename from debian/_base/applications/koffice/debian/koffice-libs-trinity.links
rename to debian/_base/applications/office/koffice/debian/koffice-libs-trinity.links
diff --git a/debian/_base/applications/koffice/debian/koffice-libs-trinity.lintian b/debian/_base/applications/office/koffice/debian/koffice-libs-trinity.lintian
similarity index 100%
rename from debian/_base/applications/koffice/debian/koffice-libs-trinity.lintian
rename to debian/_base/applications/office/koffice/debian/koffice-libs-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/koffice-libs-trinity.manpages b/debian/_base/applications/office/koffice/debian/koffice-libs-trinity.manpages
similarity index 100%
rename from debian/_base/applications/koffice/debian/koffice-libs-trinity.manpages
rename to debian/_base/applications/office/koffice/debian/koffice-libs-trinity.manpages
diff --git a/debian/_base/applications/koffice/debian/koffice-trinity-dev.install b/debian/_base/applications/office/koffice/debian/koffice-trinity-dev.install
similarity index 100%
rename from debian/_base/applications/koffice/debian/koffice-trinity-dev.install
rename to debian/_base/applications/office/koffice/debian/koffice-trinity-dev.install
diff --git a/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kchart b/debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kchart
similarity index 100%
rename from debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kchart
rename to debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kchart
diff --git a/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kformula b/debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kformula
similarity index 100%
rename from debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kformula
rename to debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kformula
diff --git a/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kivio b/debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kivio
similarity index 100%
rename from debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kivio
rename to debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kivio
diff --git a/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.koffice b/debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.koffice
similarity index 100%
rename from debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.koffice
rename to debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.koffice
diff --git a/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kpresenter b/debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kpresenter
similarity index 100%
rename from debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kpresenter
rename to debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kpresenter
diff --git a/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kspread b/debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kspread
similarity index 100%
rename from debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kspread
rename to debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kspread
diff --git a/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kugar b/debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kugar
similarity index 100%
rename from debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kugar
rename to debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kugar
diff --git a/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kword b/debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kword
similarity index 100%
rename from debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kword
rename to debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kword
diff --git a/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.thesaurus b/debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.thesaurus
similarity index 100%
rename from debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.thesaurus
rename to debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.thesaurus
diff --git a/debian/_base/applications/koffice/debian/koffice-trinity-doc.install b/debian/_base/applications/office/koffice/debian/koffice-trinity-doc.install
similarity index 100%
rename from debian/_base/applications/koffice/debian/koffice-trinity-doc.install
rename to debian/_base/applications/office/koffice/debian/koffice-trinity-doc.install
diff --git a/debian/_base/applications/koffice/debian/koffice-trinity.README.Debian b/debian/_base/applications/office/koffice/debian/koffice-trinity.README.Debian
similarity index 100%
rename from debian/_base/applications/koffice/debian/koffice-trinity.README.Debian
rename to debian/_base/applications/office/koffice/debian/koffice-trinity.README.Debian
diff --git a/debian/_base/applications/koffice/debian/koffice-trinity.docs b/debian/_base/applications/office/koffice/debian/koffice-trinity.docs
similarity index 100%
rename from debian/_base/applications/koffice/debian/koffice-trinity.docs
rename to debian/_base/applications/office/koffice/debian/koffice-trinity.docs
diff --git a/debian/_base/applications/koffice/debian/koscript.1 b/debian/_base/applications/office/koffice/debian/koscript.1
similarity index 100%
rename from debian/_base/applications/koffice/debian/koscript.1
rename to debian/_base/applications/office/koffice/debian/koscript.1
diff --git a/debian/_base/applications/koffice/debian/koshell-trinity.docs b/debian/_base/applications/office/koffice/debian/koshell-trinity.docs
similarity index 100%
rename from debian/_base/applications/koffice/debian/koshell-trinity.docs
rename to debian/_base/applications/office/koffice/debian/koshell-trinity.docs
diff --git a/debian/_base/applications/koffice/debian/koshell-trinity.install b/debian/_base/applications/office/koffice/debian/koshell-trinity.install
similarity index 100%
rename from debian/_base/applications/koffice/debian/koshell-trinity.install
rename to debian/_base/applications/office/koffice/debian/koshell-trinity.install
diff --git a/debian/_base/applications/koffice/debian/koshell-trinity.lintian b/debian/_base/applications/office/koffice/debian/koshell-trinity.lintian
similarity index 100%
rename from debian/_base/applications/koffice/debian/koshell-trinity.lintian
rename to debian/_base/applications/office/koffice/debian/koshell-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/koshell-trinity.manpages b/debian/_base/applications/office/koffice/debian/koshell-trinity.manpages
similarity index 100%
rename from debian/_base/applications/koffice/debian/koshell-trinity.manpages
rename to debian/_base/applications/office/koffice/debian/koshell-trinity.manpages
diff --git a/debian/_base/applications/koffice/debian/koshell-trinity.menu b/debian/_base/applications/office/koffice/debian/koshell-trinity.menu
similarity index 100%
rename from debian/_base/applications/koffice/debian/koshell-trinity.menu
rename to debian/_base/applications/office/koffice/debian/koshell-trinity.menu
diff --git a/debian/_base/applications/koffice/debian/koshell.1 b/debian/_base/applications/office/koffice/debian/koshell.1
similarity index 100%
rename from debian/_base/applications/koffice/debian/koshell.1
rename to debian/_base/applications/office/koffice/debian/koshell.1
diff --git a/debian/_base/applications/koffice/debian/koshell.xpm b/debian/_base/applications/office/koffice/debian/koshell.xpm
similarity index 100%
rename from debian/_base/applications/koffice/debian/koshell.xpm
rename to debian/_base/applications/office/koffice/debian/koshell.xpm
diff --git a/debian/_base/applications/koffice/debian/kplato-trinity.install b/debian/_base/applications/office/koffice/debian/kplato-trinity.install
similarity index 100%
rename from debian/_base/applications/koffice/debian/kplato-trinity.install
rename to debian/_base/applications/office/koffice/debian/kplato-trinity.install
diff --git a/debian/_base/applications/koffice/debian/kplato-trinity.lintian b/debian/_base/applications/office/koffice/debian/kplato-trinity.lintian
similarity index 100%
rename from debian/_base/applications/koffice/debian/kplato-trinity.lintian
rename to debian/_base/applications/office/koffice/debian/kplato-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/kprconverter.pl.1 b/debian/_base/applications/office/koffice/debian/kprconverter.pl.1
similarity index 100%
rename from debian/_base/applications/koffice/debian/kprconverter.pl.1
rename to debian/_base/applications/office/koffice/debian/kprconverter.pl.1
diff --git a/debian/_base/applications/koffice/debian/kpresenter-data-trinity.install b/debian/_base/applications/office/koffice/debian/kpresenter-data-trinity.install
similarity index 100%
rename from debian/_base/applications/koffice/debian/kpresenter-data-trinity.install
rename to debian/_base/applications/office/koffice/debian/kpresenter-data-trinity.install
diff --git a/debian/_base/applications/koffice/debian/kpresenter-data-trinity.lintian b/debian/_base/applications/office/koffice/debian/kpresenter-data-trinity.lintian
similarity index 100%
rename from debian/_base/applications/koffice/debian/kpresenter-data-trinity.lintian
rename to debian/_base/applications/office/koffice/debian/kpresenter-data-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/kpresenter-trinity.README.Debian b/debian/_base/applications/office/koffice/debian/kpresenter-trinity.README.Debian
similarity index 100%
rename from debian/_base/applications/koffice/debian/kpresenter-trinity.README.Debian
rename to debian/_base/applications/office/koffice/debian/kpresenter-trinity.README.Debian
diff --git a/debian/_base/applications/koffice/debian/kpresenter-trinity.docs b/debian/_base/applications/office/koffice/debian/kpresenter-trinity.docs
similarity index 100%
rename from debian/_base/applications/koffice/debian/kpresenter-trinity.docs
rename to debian/_base/applications/office/koffice/debian/kpresenter-trinity.docs
diff --git a/debian/_base/applications/koffice/debian/kpresenter-trinity.install b/debian/_base/applications/office/koffice/debian/kpresenter-trinity.install
similarity index 100%
rename from debian/_base/applications/koffice/debian/kpresenter-trinity.install
rename to debian/_base/applications/office/koffice/debian/kpresenter-trinity.install
diff --git a/debian/_base/applications/koffice/debian/kpresenter-trinity.lintian b/debian/_base/applications/office/koffice/debian/kpresenter-trinity.lintian
similarity index 100%
rename from debian/_base/applications/koffice/debian/kpresenter-trinity.lintian
rename to debian/_base/applications/office/koffice/debian/kpresenter-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/kpresenter-trinity.manpages b/debian/_base/applications/office/koffice/debian/kpresenter-trinity.manpages
similarity index 100%
rename from debian/_base/applications/koffice/debian/kpresenter-trinity.manpages
rename to debian/_base/applications/office/koffice/debian/kpresenter-trinity.manpages
diff --git a/debian/_base/applications/koffice/debian/kpresenter-trinity.menu b/debian/_base/applications/office/koffice/debian/kpresenter-trinity.menu
similarity index 100%
rename from debian/_base/applications/koffice/debian/kpresenter-trinity.menu
rename to debian/_base/applications/office/koffice/debian/kpresenter-trinity.menu
diff --git a/debian/_base/applications/koffice/debian/kpresenter-trinity.mime b/debian/_base/applications/office/koffice/debian/kpresenter-trinity.mime
similarity index 100%
rename from debian/_base/applications/koffice/debian/kpresenter-trinity.mime
rename to debian/_base/applications/office/koffice/debian/kpresenter-trinity.mime
diff --git a/debian/_base/applications/koffice/debian/kpresenter.1 b/debian/_base/applications/office/koffice/debian/kpresenter.1
similarity index 100%
rename from debian/_base/applications/koffice/debian/kpresenter.1
rename to debian/_base/applications/office/koffice/debian/kpresenter.1
diff --git a/debian/_base/applications/koffice/debian/kpresenter.xpm b/debian/_base/applications/office/koffice/debian/kpresenter.xpm
similarity index 100%
rename from debian/_base/applications/koffice/debian/kpresenter.xpm
rename to debian/_base/applications/office/koffice/debian/kpresenter.xpm
diff --git a/debian/_base/applications/koffice/debian/kspread-trinity.README.Debian b/debian/_base/applications/office/koffice/debian/kspread-trinity.README.Debian
similarity index 100%
rename from debian/_base/applications/koffice/debian/kspread-trinity.README.Debian
rename to debian/_base/applications/office/koffice/debian/kspread-trinity.README.Debian
diff --git a/debian/_base/applications/koffice/debian/kspread-trinity.docs b/debian/_base/applications/office/koffice/debian/kspread-trinity.docs
similarity index 100%
rename from debian/_base/applications/koffice/debian/kspread-trinity.docs
rename to debian/_base/applications/office/koffice/debian/kspread-trinity.docs
diff --git a/debian/_base/applications/koffice/debian/kspread-trinity.examples b/debian/_base/applications/office/koffice/debian/kspread-trinity.examples
similarity index 100%
rename from debian/_base/applications/koffice/debian/kspread-trinity.examples
rename to debian/_base/applications/office/koffice/debian/kspread-trinity.examples
diff --git a/debian/_base/applications/koffice/debian/kspread-trinity.install b/debian/_base/applications/office/koffice/debian/kspread-trinity.install
similarity index 100%
rename from debian/_base/applications/koffice/debian/kspread-trinity.install
rename to debian/_base/applications/office/koffice/debian/kspread-trinity.install
diff --git a/debian/_base/applications/koffice/debian/kspread-trinity.lintian b/debian/_base/applications/office/koffice/debian/kspread-trinity.lintian
similarity index 100%
rename from debian/_base/applications/koffice/debian/kspread-trinity.lintian
rename to debian/_base/applications/office/koffice/debian/kspread-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/kspread-trinity.manpages b/debian/_base/applications/office/koffice/debian/kspread-trinity.manpages
similarity index 100%
rename from debian/_base/applications/koffice/debian/kspread-trinity.manpages
rename to debian/_base/applications/office/koffice/debian/kspread-trinity.manpages
diff --git a/debian/_base/applications/koffice/debian/kspread-trinity.menu b/debian/_base/applications/office/koffice/debian/kspread-trinity.menu
similarity index 100%
rename from debian/_base/applications/koffice/debian/kspread-trinity.menu
rename to debian/_base/applications/office/koffice/debian/kspread-trinity.menu
diff --git a/debian/_base/applications/koffice/debian/kspread-trinity.mime b/debian/_base/applications/office/koffice/debian/kspread-trinity.mime
similarity index 100%
rename from debian/_base/applications/koffice/debian/kspread-trinity.mime
rename to debian/_base/applications/office/koffice/debian/kspread-trinity.mime
diff --git a/debian/_base/applications/koffice/debian/kspread.1 b/debian/_base/applications/office/koffice/debian/kspread.1
similarity index 100%
rename from debian/_base/applications/koffice/debian/kspread.1
rename to debian/_base/applications/office/koffice/debian/kspread.1
diff --git a/debian/_base/applications/koffice/debian/kspread.xpm b/debian/_base/applications/office/koffice/debian/kspread.xpm
similarity index 100%
rename from debian/_base/applications/koffice/debian/kspread.xpm
rename to debian/_base/applications/office/koffice/debian/kspread.xpm
diff --git a/debian/_base/applications/koffice/debian/kthesaurus-trinity.install b/debian/_base/applications/office/koffice/debian/kthesaurus-trinity.install
similarity index 100%
rename from debian/_base/applications/koffice/debian/kthesaurus-trinity.install
rename to debian/_base/applications/office/koffice/debian/kthesaurus-trinity.install
diff --git a/debian/_base/applications/koffice/debian/kthesaurus-trinity.lintian b/debian/_base/applications/office/koffice/debian/kthesaurus-trinity.lintian
similarity index 100%
rename from debian/_base/applications/koffice/debian/kthesaurus-trinity.lintian
rename to debian/_base/applications/office/koffice/debian/kthesaurus-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/kthesaurus-trinity.manpages b/debian/_base/applications/office/koffice/debian/kthesaurus-trinity.manpages
similarity index 100%
rename from debian/_base/applications/koffice/debian/kthesaurus-trinity.manpages
rename to debian/_base/applications/office/koffice/debian/kthesaurus-trinity.manpages
diff --git a/debian/_base/applications/koffice/debian/kthesaurus-trinity.menu b/debian/_base/applications/office/koffice/debian/kthesaurus-trinity.menu
similarity index 100%
rename from debian/_base/applications/koffice/debian/kthesaurus-trinity.menu
rename to debian/_base/applications/office/koffice/debian/kthesaurus-trinity.menu
diff --git a/debian/_base/applications/koffice/debian/kthesaurus.1 b/debian/_base/applications/office/koffice/debian/kthesaurus.1
similarity index 100%
rename from debian/_base/applications/koffice/debian/kthesaurus.1
rename to debian/_base/applications/office/koffice/debian/kthesaurus.1
diff --git a/debian/_base/applications/koffice/debian/kthesaurus.xpm b/debian/_base/applications/office/koffice/debian/kthesaurus.xpm
similarity index 100%
rename from debian/_base/applications/koffice/debian/kthesaurus.xpm
rename to debian/_base/applications/office/koffice/debian/kthesaurus.xpm
diff --git a/debian/_base/applications/koffice/debian/kudesigner.1 b/debian/_base/applications/office/koffice/debian/kudesigner.1
similarity index 100%
rename from debian/_base/applications/koffice/debian/kudesigner.1
rename to debian/_base/applications/office/koffice/debian/kudesigner.1
diff --git a/debian/_base/applications/koffice/debian/kugar-trinity.README.Debian b/debian/_base/applications/office/koffice/debian/kugar-trinity.README.Debian
similarity index 100%
rename from debian/_base/applications/koffice/debian/kugar-trinity.README.Debian
rename to debian/_base/applications/office/koffice/debian/kugar-trinity.README.Debian
diff --git a/debian/_base/applications/koffice/debian/kugar-trinity.docs b/debian/_base/applications/office/koffice/debian/kugar-trinity.docs
similarity index 100%
rename from debian/_base/applications/koffice/debian/kugar-trinity.docs
rename to debian/_base/applications/office/koffice/debian/kugar-trinity.docs
diff --git a/debian/_base/applications/koffice/debian/kugar-trinity.examples b/debian/_base/applications/office/koffice/debian/kugar-trinity.examples
similarity index 100%
rename from debian/_base/applications/koffice/debian/kugar-trinity.examples
rename to debian/_base/applications/office/koffice/debian/kugar-trinity.examples
diff --git a/debian/_base/applications/koffice/debian/kugar-trinity.examples.README b/debian/_base/applications/office/koffice/debian/kugar-trinity.examples.README
similarity index 100%
rename from debian/_base/applications/koffice/debian/kugar-trinity.examples.README
rename to debian/_base/applications/office/koffice/debian/kugar-trinity.examples.README
diff --git a/debian/_base/applications/koffice/debian/kugar-trinity.install b/debian/_base/applications/office/koffice/debian/kugar-trinity.install
similarity index 100%
rename from debian/_base/applications/koffice/debian/kugar-trinity.install
rename to debian/_base/applications/office/koffice/debian/kugar-trinity.install
diff --git a/debian/_base/applications/koffice/debian/kugar-trinity.links b/debian/_base/applications/office/koffice/debian/kugar-trinity.links
similarity index 100%
rename from debian/_base/applications/koffice/debian/kugar-trinity.links
rename to debian/_base/applications/office/koffice/debian/kugar-trinity.links
diff --git a/debian/_base/applications/koffice/debian/kugar-trinity.lintian b/debian/_base/applications/office/koffice/debian/kugar-trinity.lintian
similarity index 100%
rename from debian/_base/applications/koffice/debian/kugar-trinity.lintian
rename to debian/_base/applications/office/koffice/debian/kugar-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/kugar-trinity.manpages b/debian/_base/applications/office/koffice/debian/kugar-trinity.manpages
similarity index 100%
rename from debian/_base/applications/koffice/debian/kugar-trinity.manpages
rename to debian/_base/applications/office/koffice/debian/kugar-trinity.manpages
diff --git a/debian/_base/applications/koffice/debian/kugar-trinity.menu b/debian/_base/applications/office/koffice/debian/kugar-trinity.menu
similarity index 100%
rename from debian/_base/applications/koffice/debian/kugar-trinity.menu
rename to debian/_base/applications/office/koffice/debian/kugar-trinity.menu
diff --git a/debian/_base/applications/koffice/debian/kugar-trinity.mime b/debian/_base/applications/office/koffice/debian/kugar-trinity.mime
similarity index 100%
rename from debian/_base/applications/koffice/debian/kugar-trinity.mime
rename to debian/_base/applications/office/koffice/debian/kugar-trinity.mime
diff --git a/debian/_base/applications/koffice/debian/kugar.1 b/debian/_base/applications/office/koffice/debian/kugar.1
similarity index 100%
rename from debian/_base/applications/koffice/debian/kugar.1
rename to debian/_base/applications/office/koffice/debian/kugar.1
diff --git a/debian/_base/applications/koffice/debian/kugar.xpm b/debian/_base/applications/office/koffice/debian/kugar.xpm
similarity index 100%
rename from debian/_base/applications/koffice/debian/kugar.xpm
rename to debian/_base/applications/office/koffice/debian/kugar.xpm
diff --git a/debian/_base/applications/koffice/debian/kword-data-trinity.install b/debian/_base/applications/office/koffice/debian/kword-data-trinity.install
similarity index 100%
rename from debian/_base/applications/koffice/debian/kword-data-trinity.install
rename to debian/_base/applications/office/koffice/debian/kword-data-trinity.install
diff --git a/debian/_base/applications/koffice/debian/kword-data-trinity.lintian b/debian/_base/applications/office/koffice/debian/kword-data-trinity.lintian
similarity index 100%
rename from debian/_base/applications/koffice/debian/kword-data-trinity.lintian
rename to debian/_base/applications/office/koffice/debian/kword-data-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/kword-trinity.README.Debian b/debian/_base/applications/office/koffice/debian/kword-trinity.README.Debian
similarity index 100%
rename from debian/_base/applications/koffice/debian/kword-trinity.README.Debian
rename to debian/_base/applications/office/koffice/debian/kword-trinity.README.Debian
diff --git a/debian/_base/applications/koffice/debian/kword-trinity.docs b/debian/_base/applications/office/koffice/debian/kword-trinity.docs
similarity index 100%
rename from debian/_base/applications/koffice/debian/kword-trinity.docs
rename to debian/_base/applications/office/koffice/debian/kword-trinity.docs
diff --git a/debian/_base/applications/koffice/debian/kword-trinity.examples b/debian/_base/applications/office/koffice/debian/kword-trinity.examples
similarity index 100%
rename from debian/_base/applications/koffice/debian/kword-trinity.examples
rename to debian/_base/applications/office/koffice/debian/kword-trinity.examples
diff --git a/debian/_base/applications/koffice/debian/kword-trinity.install b/debian/_base/applications/office/koffice/debian/kword-trinity.install
similarity index 100%
rename from debian/_base/applications/koffice/debian/kword-trinity.install
rename to debian/_base/applications/office/koffice/debian/kword-trinity.install
diff --git a/debian/_base/applications/koffice/debian/kword-trinity.lintian b/debian/_base/applications/office/koffice/debian/kword-trinity.lintian
similarity index 100%
rename from debian/_base/applications/koffice/debian/kword-trinity.lintian
rename to debian/_base/applications/office/koffice/debian/kword-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/kword-trinity.manpages b/debian/_base/applications/office/koffice/debian/kword-trinity.manpages
similarity index 100%
rename from debian/_base/applications/koffice/debian/kword-trinity.manpages
rename to debian/_base/applications/office/koffice/debian/kword-trinity.manpages
diff --git a/debian/_base/applications/koffice/debian/kword-trinity.menu b/debian/_base/applications/office/koffice/debian/kword-trinity.menu
similarity index 100%
rename from debian/_base/applications/koffice/debian/kword-trinity.menu
rename to debian/_base/applications/office/koffice/debian/kword-trinity.menu
diff --git a/debian/_base/applications/koffice/debian/kword-trinity.mime b/debian/_base/applications/office/koffice/debian/kword-trinity.mime
similarity index 100%
rename from debian/_base/applications/koffice/debian/kword-trinity.mime
rename to debian/_base/applications/office/koffice/debian/kword-trinity.mime
diff --git a/debian/_base/applications/koffice/debian/kword.1 b/debian/_base/applications/office/koffice/debian/kword.1
similarity index 100%
rename from debian/_base/applications/koffice/debian/kword.1
rename to debian/_base/applications/office/koffice/debian/kword.1
diff --git a/debian/_base/applications/koffice/debian/kword.xpm b/debian/_base/applications/office/koffice/debian/kword.xpm
similarity index 100%
rename from debian/_base/applications/koffice/debian/kword.xpm
rename to debian/_base/applications/office/koffice/debian/kword.xpm
diff --git a/debian/_base/applications/koffice/debian/not-installed.list b/debian/_base/applications/office/koffice/debian/not-installed.list
similarity index 100%
rename from debian/_base/applications/koffice/debian/not-installed.list
rename to debian/_base/applications/office/koffice/debian/not-installed.list
diff --git a/debian/_base/applications/kerberostray/debian/patches/series b/debian/_base/applications/office/koffice/debian/patches/series
similarity index 100%
rename from debian/_base/applications/kerberostray/debian/patches/series
rename to debian/_base/applications/office/koffice/debian/patches/series
diff --git a/debian/_base/applications/koffice/debian/rules b/debian/_base/applications/office/koffice/debian/rules
similarity index 100%
rename from debian/_base/applications/koffice/debian/rules
rename to debian/_base/applications/office/koffice/debian/rules
diff --git a/debian/_base/applications/knowit/debian/source/format b/debian/_base/applications/office/koffice/debian/source/format
similarity index 100%
rename from debian/_base/applications/knowit/debian/source/format
rename to debian/_base/applications/office/koffice/debian/source/format
diff --git a/debian/_base/applications/knowit/debian/source/options b/debian/_base/applications/office/koffice/debian/source/options
similarity index 100%
rename from debian/_base/applications/knowit/debian/source/options
rename to debian/_base/applications/office/koffice/debian/source/options
diff --git a/debian/_base/applications/knights/debian/cdbs/debian-tde.mk b/debian/_base/applications/office/kpilot/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/knights/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/office/kpilot/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/knights/debian/cdbs/versions.pl b/debian/_base/applications/office/kpilot/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/knights/debian/cdbs/versions.pl
rename to debian/_base/applications/office/kpilot/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kpilot/debian/changelog b/debian/_base/applications/office/kpilot/debian/changelog
similarity index 100%
rename from debian/_base/applications/kpilot/debian/changelog
rename to debian/_base/applications/office/kpilot/debian/changelog
diff --git a/debian/_base/applications/knutclient/debian/compat b/debian/_base/applications/office/kpilot/debian/compat
similarity index 100%
rename from debian/_base/applications/knutclient/debian/compat
rename to debian/_base/applications/office/kpilot/debian/compat
diff --git a/debian/_base/applications/kpilot/debian/control b/debian/_base/applications/office/kpilot/debian/control
similarity index 100%
rename from debian/_base/applications/kpilot/debian/control
rename to debian/_base/applications/office/kpilot/debian/control
diff --git a/debian/_base/applications/kpilot/debian/copyright b/debian/_base/applications/office/kpilot/debian/copyright
similarity index 100%
rename from debian/_base/applications/kpilot/debian/copyright
rename to debian/_base/applications/office/kpilot/debian/copyright
diff --git a/debian/_base/applications/kpilot/debian/kpilot-trinity.install b/debian/_base/applications/office/kpilot/debian/kpilot-trinity.install
similarity index 100%
rename from debian/_base/applications/kpilot/debian/kpilot-trinity.install
rename to debian/_base/applications/office/kpilot/debian/kpilot-trinity.install
diff --git a/debian/_base/applications/kpilot/debian/rules b/debian/_base/applications/office/kpilot/debian/rules
similarity index 100%
rename from debian/_base/applications/kpilot/debian/rules
rename to debian/_base/applications/office/kpilot/debian/rules
diff --git a/debian/_base/applications/knutclient/debian/source/format b/debian/_base/applications/office/kpilot/debian/source/format
similarity index 100%
rename from debian/_base/applications/knutclient/debian/source/format
rename to debian/_base/applications/office/kpilot/debian/source/format
diff --git a/debian/_base/applications/knutclient/debian/source/options b/debian/_base/applications/office/kpilot/debian/source/options
similarity index 100%
rename from debian/_base/applications/knutclient/debian/source/options
rename to debian/_base/applications/office/kpilot/debian/source/options
diff --git a/debian/_base/applications/knmap/debian/cdbs/debian-tde.mk b/debian/_base/applications/office/tellico/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/knmap/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/office/tellico/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/knmap/debian/cdbs/versions.pl b/debian/_base/applications/office/tellico/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/knmap/debian/cdbs/versions.pl
rename to debian/_base/applications/office/tellico/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/tellico/debian/changelog b/debian/_base/applications/office/tellico/debian/changelog
similarity index 100%
rename from debian/_base/applications/tellico/debian/changelog
rename to debian/_base/applications/office/tellico/debian/changelog
diff --git a/debian/_base/applications/koffice-i18n/debian/compat b/debian/_base/applications/office/tellico/debian/compat
similarity index 100%
rename from debian/_base/applications/koffice-i18n/debian/compat
rename to debian/_base/applications/office/tellico/debian/compat
diff --git a/debian/_base/applications/tellico/debian/control b/debian/_base/applications/office/tellico/debian/control
similarity index 100%
rename from debian/_base/applications/tellico/debian/control
rename to debian/_base/applications/office/tellico/debian/control
diff --git a/debian/_base/applications/tellico/debian/copyright b/debian/_base/applications/office/tellico/debian/copyright
similarity index 100%
rename from debian/_base/applications/tellico/debian/copyright
rename to debian/_base/applications/office/tellico/debian/copyright
diff --git a/debian/_base/applications/tellico/debian/menu b/debian/_base/applications/office/tellico/debian/menu
similarity index 100%
rename from debian/_base/applications/tellico/debian/menu
rename to debian/_base/applications/office/tellico/debian/menu
diff --git a/debian/_base/applications/tellico/debian/rules b/debian/_base/applications/office/tellico/debian/rules
similarity index 100%
rename from debian/_base/applications/tellico/debian/rules
rename to debian/_base/applications/office/tellico/debian/rules
diff --git a/debian/_base/applications/koffice-i18n/debian/source/format b/debian/_base/applications/office/tellico/debian/source/format
similarity index 100%
rename from debian/_base/applications/koffice-i18n/debian/source/format
rename to debian/_base/applications/office/tellico/debian/source/format
diff --git a/debian/_base/applications/koffice-i18n/debian/source/options b/debian/_base/applications/office/tellico/debian/source/options
similarity index 100%
rename from debian/_base/applications/koffice-i18n/debian/source/options
rename to debian/_base/applications/office/tellico/debian/source/options
diff --git a/debian/_base/applications/tellico/debian/tellico-data-trinity.install b/debian/_base/applications/office/tellico/debian/tellico-data-trinity.install
similarity index 100%
rename from debian/_base/applications/tellico/debian/tellico-data-trinity.install
rename to debian/_base/applications/office/tellico/debian/tellico-data-trinity.install
diff --git a/debian/_base/applications/tellico/debian/tellico-scripts-trinity.install b/debian/_base/applications/office/tellico/debian/tellico-scripts-trinity.install
similarity index 100%
rename from debian/_base/applications/tellico/debian/tellico-scripts-trinity.install
rename to debian/_base/applications/office/tellico/debian/tellico-scripts-trinity.install
diff --git a/debian/_base/applications/tellico/debian/tellico-trinity.install b/debian/_base/applications/office/tellico/debian/tellico-trinity.install
similarity index 100%
rename from debian/_base/applications/tellico/debian/tellico-trinity.install
rename to debian/_base/applications/office/tellico/debian/tellico-trinity.install
diff --git a/debian/_base/applications/tellico/debian/tellico-trinity.manpages b/debian/_base/applications/office/tellico/debian/tellico-trinity.manpages
similarity index 100%
rename from debian/_base/applications/tellico/debian/tellico-trinity.manpages
rename to debian/_base/applications/office/tellico/debian/tellico-trinity.manpages
diff --git a/debian/_base/applications/tellico/debian/tellico.1x b/debian/_base/applications/office/tellico/debian/tellico.1x
similarity index 100%
rename from debian/_base/applications/tellico/debian/tellico.1x
rename to debian/_base/applications/office/tellico/debian/tellico.1x
diff --git a/debian/_base/applications/tellico/debian/tellico.xpm b/debian/_base/applications/office/tellico/debian/tellico.xpm
similarity index 100%
rename from debian/_base/applications/tellico/debian/tellico.xpm
rename to debian/_base/applications/office/tellico/debian/tellico.xpm
diff --git a/debian/_base/applications/tellico/debian/watch b/debian/_base/applications/office/tellico/debian/watch
similarity index 100%
rename from debian/_base/applications/tellico/debian/watch
rename to debian/_base/applications/office/tellico/debian/watch
diff --git a/debian/_base/applications/knowit/debian/cdbs/debian-tde.mk b/debian/_base/applications/settings/kdpkg/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/knowit/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/settings/kdpkg/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/knowit/debian/cdbs/versions.pl b/debian/_base/applications/settings/kdpkg/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/knowit/debian/cdbs/versions.pl
rename to debian/_base/applications/settings/kdpkg/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kdpkg/debian/changelog b/debian/_base/applications/settings/kdpkg/debian/changelog
similarity index 100%
rename from debian/_base/applications/kdpkg/debian/changelog
rename to debian/_base/applications/settings/kdpkg/debian/changelog
diff --git a/debian/_base/applications/koffice/debian/compat b/debian/_base/applications/settings/kdpkg/debian/compat
similarity index 100%
rename from debian/_base/applications/koffice/debian/compat
rename to debian/_base/applications/settings/kdpkg/debian/compat
diff --git a/debian/_base/applications/kdpkg/debian/control b/debian/_base/applications/settings/kdpkg/debian/control
similarity index 100%
rename from debian/_base/applications/kdpkg/debian/control
rename to debian/_base/applications/settings/kdpkg/debian/control
diff --git a/debian/_base/applications/kdpkg/debian/copyright b/debian/_base/applications/settings/kdpkg/debian/copyright
similarity index 100%
rename from debian/_base/applications/kdpkg/debian/copyright
rename to debian/_base/applications/settings/kdpkg/debian/copyright
diff --git a/debian/_base/applications/kdpkg/debian/docs b/debian/_base/applications/settings/kdpkg/debian/docs
similarity index 100%
rename from debian/_base/applications/kdpkg/debian/docs
rename to debian/_base/applications/settings/kdpkg/debian/docs
diff --git a/debian/_base/applications/kftpgrabber/debian/patches/series b/debian/_base/applications/settings/kdpkg/debian/patches/series
similarity index 100%
rename from debian/_base/applications/kftpgrabber/debian/patches/series
rename to debian/_base/applications/settings/kdpkg/debian/patches/series
diff --git a/debian/_base/applications/kerberostray/debian/rules b/debian/_base/applications/settings/kdpkg/debian/rules
similarity index 100%
rename from debian/_base/applications/kerberostray/debian/rules
rename to debian/_base/applications/settings/kdpkg/debian/rules
diff --git a/debian/_base/applications/koffice/debian/source/format b/debian/_base/applications/settings/kdpkg/debian/source/format
similarity index 100%
rename from debian/_base/applications/koffice/debian/source/format
rename to debian/_base/applications/settings/kdpkg/debian/source/format
diff --git a/debian/_base/applications/koffice/debian/source/options b/debian/_base/applications/settings/kdpkg/debian/source/options
similarity index 100%
rename from debian/_base/applications/koffice/debian/source/options
rename to debian/_base/applications/settings/kdpkg/debian/source/options
diff --git a/debian/_base/applications/knutclient/debian/cdbs/debian-tde.mk b/debian/_base/applications/settings/kima/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/knutclient/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/settings/kima/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/knutclient/debian/cdbs/versions.pl b/debian/_base/applications/settings/kima/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/knutclient/debian/cdbs/versions.pl
rename to debian/_base/applications/settings/kima/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kima/debian/changelog b/debian/_base/applications/settings/kima/debian/changelog
similarity index 100%
rename from debian/_base/applications/kima/debian/changelog
rename to debian/_base/applications/settings/kima/debian/changelog
diff --git a/debian/_base/applications/kompose/debian/compat b/debian/_base/applications/settings/kima/debian/compat
similarity index 100%
rename from debian/_base/applications/kompose/debian/compat
rename to debian/_base/applications/settings/kima/debian/compat
diff --git a/debian/_base/applications/kima/debian/control b/debian/_base/applications/settings/kima/debian/control
similarity index 100%
rename from debian/_base/applications/kima/debian/control
rename to debian/_base/applications/settings/kima/debian/control
diff --git a/debian/_base/applications/kima/debian/copyright b/debian/_base/applications/settings/kima/debian/copyright
similarity index 100%
rename from debian/_base/applications/kima/debian/copyright
rename to debian/_base/applications/settings/kima/debian/copyright
diff --git a/debian/_base/applications/kima/debian/docs b/debian/_base/applications/settings/kima/debian/docs
similarity index 100%
rename from debian/_base/applications/kima/debian/docs
rename to debian/_base/applications/settings/kima/debian/docs
diff --git a/debian/_base/applications/kima/debian/rules b/debian/_base/applications/settings/kima/debian/rules
similarity index 100%
rename from debian/_base/applications/kima/debian/rules
rename to debian/_base/applications/settings/kima/debian/rules
diff --git a/debian/_base/applications/kompose/debian/source/format b/debian/_base/applications/settings/kima/debian/source/format
similarity index 100%
rename from debian/_base/applications/kompose/debian/source/format
rename to debian/_base/applications/settings/kima/debian/source/format
diff --git a/debian/_base/applications/kompose/debian/source/options b/debian/_base/applications/settings/kima/debian/source/options
similarity index 100%
rename from debian/_base/applications/kompose/debian/source/options
rename to debian/_base/applications/settings/kima/debian/source/options
diff --git a/debian/_base/applications/koffice/debian/cdbs/debian-tde.mk b/debian/_base/applications/settings/kiosktool/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/koffice/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/settings/kiosktool/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/koffice/debian/cdbs/versions.pl b/debian/_base/applications/settings/kiosktool/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/koffice/debian/cdbs/versions.pl
rename to debian/_base/applications/settings/kiosktool/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kiosktool/debian/changelog b/debian/_base/applications/settings/kiosktool/debian/changelog
similarity index 100%
rename from debian/_base/applications/kiosktool/debian/changelog
rename to debian/_base/applications/settings/kiosktool/debian/changelog
diff --git a/debian/_base/applications/konversation/debian/compat b/debian/_base/applications/settings/kiosktool/debian/compat
similarity index 100%
rename from debian/_base/applications/konversation/debian/compat
rename to debian/_base/applications/settings/kiosktool/debian/compat
diff --git a/debian/_base/applications/kiosktool/debian/control b/debian/_base/applications/settings/kiosktool/debian/control
similarity index 100%
rename from debian/_base/applications/kiosktool/debian/control
rename to debian/_base/applications/settings/kiosktool/debian/control
diff --git a/debian/_base/applications/kiosktool/debian/copyright b/debian/_base/applications/settings/kiosktool/debian/copyright
similarity index 100%
rename from debian/_base/applications/kiosktool/debian/copyright
rename to debian/_base/applications/settings/kiosktool/debian/copyright
diff --git a/debian/_base/applications/ktechlab/debian/docs b/debian/_base/applications/settings/kiosktool/debian/docs
similarity index 100%
rename from debian/_base/applications/ktechlab/debian/docs
rename to debian/_base/applications/settings/kiosktool/debian/docs
diff --git a/debian/_base/applications/kgtk-qt3/debian/patches/series b/debian/_base/applications/settings/kiosktool/debian/patches/series
similarity index 100%
rename from debian/_base/applications/kgtk-qt3/debian/patches/series
rename to debian/_base/applications/settings/kiosktool/debian/patches/series
diff --git a/debian/_base/applications/kpicosim/debian/rules b/debian/_base/applications/settings/kiosktool/debian/rules
similarity index 100%
rename from debian/_base/applications/kpicosim/debian/rules
rename to debian/_base/applications/settings/kiosktool/debian/rules
diff --git a/debian/_base/applications/konversation/debian/source/format b/debian/_base/applications/settings/kiosktool/debian/source/format
similarity index 100%
rename from debian/_base/applications/konversation/debian/source/format
rename to debian/_base/applications/settings/kiosktool/debian/source/format
diff --git a/debian/_base/applications/konversation/debian/source/options b/debian/_base/applications/settings/kiosktool/debian/source/options
similarity index 100%
rename from debian/_base/applications/konversation/debian/source/options
rename to debian/_base/applications/settings/kiosktool/debian/source/options
diff --git a/debian/_base/applications/kompose/debian/cdbs/debian-tde.mk b/debian/_base/applications/settings/kkbswitch/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kompose/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/settings/kkbswitch/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kompose/debian/cdbs/versions.pl b/debian/_base/applications/settings/kkbswitch/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kompose/debian/cdbs/versions.pl
rename to debian/_base/applications/settings/kkbswitch/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kkbswitch/debian/changelog b/debian/_base/applications/settings/kkbswitch/debian/changelog
similarity index 100%
rename from debian/_base/applications/kkbswitch/debian/changelog
rename to debian/_base/applications/settings/kkbswitch/debian/changelog
diff --git a/debian/_base/applications/kooldock/debian/compat b/debian/_base/applications/settings/kkbswitch/debian/compat
similarity index 100%
rename from debian/_base/applications/kooldock/debian/compat
rename to debian/_base/applications/settings/kkbswitch/debian/compat
diff --git a/debian/_base/applications/kkbswitch/debian/control b/debian/_base/applications/settings/kkbswitch/debian/control
similarity index 100%
rename from debian/_base/applications/kkbswitch/debian/control
rename to debian/_base/applications/settings/kkbswitch/debian/control
diff --git a/debian/_base/applications/kkbswitch/debian/copyright b/debian/_base/applications/settings/kkbswitch/debian/copyright
similarity index 100%
rename from debian/_base/applications/kkbswitch/debian/copyright
rename to debian/_base/applications/settings/kkbswitch/debian/copyright
diff --git a/debian/_base/applications/kkbswitch/debian/kkbswitch-trinity.dirs b/debian/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.dirs
similarity index 100%
rename from debian/_base/applications/kkbswitch/debian/kkbswitch-trinity.dirs
rename to debian/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.dirs
diff --git a/debian/_base/applications/kkbswitch/debian/kkbswitch-trinity.docs b/debian/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.docs
similarity index 100%
rename from debian/_base/applications/kkbswitch/debian/kkbswitch-trinity.docs
rename to debian/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.docs
diff --git a/debian/_base/applications/kkbswitch/debian/kkbswitch-trinity.install b/debian/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.install
similarity index 100%
rename from debian/_base/applications/kkbswitch/debian/kkbswitch-trinity.install
rename to debian/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.install
diff --git a/debian/_base/applications/kkbswitch/debian/kkbswitch-trinity.menu b/debian/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.menu
similarity index 100%
rename from debian/_base/applications/kkbswitch/debian/kkbswitch-trinity.menu
rename to debian/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.menu
diff --git a/debian/_base/applications/kkbswitch/debian/rules b/debian/_base/applications/settings/kkbswitch/debian/rules
similarity index 100%
rename from debian/_base/applications/kkbswitch/debian/rules
rename to debian/_base/applications/settings/kkbswitch/debian/rules
diff --git a/debian/_base/applications/kooldock/debian/source/format b/debian/_base/applications/settings/kkbswitch/debian/source/format
similarity index 100%
rename from debian/_base/applications/kooldock/debian/source/format
rename to debian/_base/applications/settings/kkbswitch/debian/source/format
diff --git a/debian/_base/applications/kooldock/debian/source/options b/debian/_base/applications/settings/kkbswitch/debian/source/options
similarity index 100%
rename from debian/_base/applications/kooldock/debian/source/options
rename to debian/_base/applications/settings/kkbswitch/debian/source/options
diff --git a/debian/_base/applications/kkbswitch/debian/xkb-data-extra-trinity.dirs b/debian/_base/applications/settings/kkbswitch/debian/xkb-data-extra-trinity.dirs
similarity index 100%
rename from debian/_base/applications/kkbswitch/debian/xkb-data-extra-trinity.dirs
rename to debian/_base/applications/settings/kkbswitch/debian/xkb-data-extra-trinity.dirs
diff --git a/debian/_base/applications/kkbswitch/debian/xkb-data-extra-trinity.install b/debian/_base/applications/settings/kkbswitch/debian/xkb-data-extra-trinity.install
similarity index 100%
rename from debian/_base/applications/kkbswitch/debian/xkb-data-extra-trinity.install
rename to debian/_base/applications/settings/kkbswitch/debian/xkb-data-extra-trinity.install
diff --git a/debian/_base/applications/konversation/debian/cdbs/debian-tde.mk b/debian/_base/applications/settings/klcddimmer/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/konversation/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/settings/klcddimmer/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/konversation/debian/cdbs/versions.pl b/debian/_base/applications/settings/klcddimmer/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/konversation/debian/cdbs/versions.pl
rename to debian/_base/applications/settings/klcddimmer/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/klcddimmer/debian/changelog b/debian/_base/applications/settings/klcddimmer/debian/changelog
similarity index 100%
rename from debian/_base/applications/klcddimmer/debian/changelog
rename to debian/_base/applications/settings/klcddimmer/debian/changelog
diff --git a/debian/_base/applications/kopete-otr/debian/compat b/debian/_base/applications/settings/klcddimmer/debian/compat
similarity index 100%
rename from debian/_base/applications/kopete-otr/debian/compat
rename to debian/_base/applications/settings/klcddimmer/debian/compat
diff --git a/debian/_base/applications/klcddimmer/debian/control b/debian/_base/applications/settings/klcddimmer/debian/control
similarity index 100%
rename from debian/_base/applications/klcddimmer/debian/control
rename to debian/_base/applications/settings/klcddimmer/debian/control
diff --git a/debian/_base/applications/klcddimmer/debian/copyright b/debian/_base/applications/settings/klcddimmer/debian/copyright
similarity index 100%
rename from debian/_base/applications/klcddimmer/debian/copyright
rename to debian/_base/applications/settings/klcddimmer/debian/copyright
diff --git a/debian/_base/applications/klcddimmer/debian/docs b/debian/_base/applications/settings/klcddimmer/debian/docs
similarity index 100%
rename from debian/_base/applications/klcddimmer/debian/docs
rename to debian/_base/applications/settings/klcddimmer/debian/docs
diff --git a/debian/_base/applications/kplayer/debian/rules b/debian/_base/applications/settings/klcddimmer/debian/rules
similarity index 100%
rename from debian/_base/applications/kplayer/debian/rules
rename to debian/_base/applications/settings/klcddimmer/debian/rules
diff --git a/debian/_base/applications/kopete-otr/debian/source/format b/debian/_base/applications/settings/klcddimmer/debian/source/format
similarity index 100%
rename from debian/_base/applications/kopete-otr/debian/source/format
rename to debian/_base/applications/settings/klcddimmer/debian/source/format
diff --git a/debian/_base/applications/kopete-otr/debian/source/options b/debian/_base/applications/settings/klcddimmer/debian/source/options
similarity index 100%
rename from debian/_base/applications/kopete-otr/debian/source/options
rename to debian/_base/applications/settings/klcddimmer/debian/source/options
diff --git a/debian/_base/applications/kooldock/debian/cdbs/debian-tde.mk b/debian/_base/applications/settings/kmyfirewall/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kooldock/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/settings/kmyfirewall/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kooldock/debian/cdbs/versions.pl b/debian/_base/applications/settings/kmyfirewall/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kooldock/debian/cdbs/versions.pl
rename to debian/_base/applications/settings/kmyfirewall/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kmyfirewall/debian/changelog b/debian/_base/applications/settings/kmyfirewall/debian/changelog
similarity index 100%
rename from debian/_base/applications/kmyfirewall/debian/changelog
rename to debian/_base/applications/settings/kmyfirewall/debian/changelog
diff --git a/debian/_base/applications/kpicosim/debian/compat b/debian/_base/applications/settings/kmyfirewall/debian/compat
similarity index 100%
rename from debian/_base/applications/kpicosim/debian/compat
rename to debian/_base/applications/settings/kmyfirewall/debian/compat
diff --git a/debian/_base/applications/kmyfirewall/debian/control b/debian/_base/applications/settings/kmyfirewall/debian/control
similarity index 100%
rename from debian/_base/applications/kmyfirewall/debian/control
rename to debian/_base/applications/settings/kmyfirewall/debian/control
diff --git a/debian/_base/applications/kmyfirewall/debian/copyright b/debian/_base/applications/settings/kmyfirewall/debian/copyright
similarity index 100%
rename from debian/_base/applications/kmyfirewall/debian/copyright
rename to debian/_base/applications/settings/kmyfirewall/debian/copyright
diff --git a/debian/_base/applications/koffice-i18n/debian/debiandirs b/debian/_base/applications/settings/kmyfirewall/debian/debiandirs
similarity index 100%
rename from debian/_base/applications/koffice-i18n/debian/debiandirs
rename to debian/_base/applications/settings/kmyfirewall/debian/debiandirs
diff --git a/debian/_base/applications/kmyfirewall/debian/dirs b/debian/_base/applications/settings/kmyfirewall/debian/dirs
similarity index 100%
rename from debian/_base/applications/kmyfirewall/debian/dirs
rename to debian/_base/applications/settings/kmyfirewall/debian/dirs
diff --git a/debian/_base/applications/piklab/debian/docs b/debian/_base/applications/settings/kmyfirewall/debian/docs
similarity index 100%
rename from debian/_base/applications/piklab/debian/docs
rename to debian/_base/applications/settings/kmyfirewall/debian/docs
diff --git a/debian/_base/applications/kmyfirewall/debian/install b/debian/_base/applications/settings/kmyfirewall/debian/install
similarity index 100%
rename from debian/_base/applications/kmyfirewall/debian/install
rename to debian/_base/applications/settings/kmyfirewall/debian/install
diff --git a/debian/_base/applications/kmyfirewall/debian/kmfinstallerplugin.desktop b/debian/_base/applications/settings/kmyfirewall/debian/kmfinstallerplugin.desktop
similarity index 100%
rename from debian/_base/applications/kmyfirewall/debian/kmfinstallerplugin.desktop
rename to debian/_base/applications/settings/kmyfirewall/debian/kmfinstallerplugin.desktop
diff --git a/debian/_base/applications/kmyfirewall/debian/kmyfirewall.1 b/debian/_base/applications/settings/kmyfirewall/debian/kmyfirewall.1
similarity index 100%
rename from debian/_base/applications/kmyfirewall/debian/kmyfirewall.1
rename to debian/_base/applications/settings/kmyfirewall/debian/kmyfirewall.1
diff --git a/debian/_base/applications/kmyfirewall/debian/kmyfirewall.desktop b/debian/_base/applications/settings/kmyfirewall/debian/kmyfirewall.desktop
similarity index 100%
rename from debian/_base/applications/kmyfirewall/debian/kmyfirewall.desktop
rename to debian/_base/applications/settings/kmyfirewall/debian/kmyfirewall.desktop
diff --git a/debian/_base/applications/kmyfirewall/debian/kmyfirewall.xpm b/debian/_base/applications/settings/kmyfirewall/debian/kmyfirewall.xpm
similarity index 100%
rename from debian/_base/applications/kmyfirewall/debian/kmyfirewall.xpm
rename to debian/_base/applications/settings/kmyfirewall/debian/kmyfirewall.xpm
diff --git a/debian/_base/applications/kmyfirewall/debian/manpages b/debian/_base/applications/settings/kmyfirewall/debian/manpages
similarity index 100%
rename from debian/_base/applications/kmyfirewall/debian/manpages
rename to debian/_base/applications/settings/kmyfirewall/debian/manpages
diff --git a/debian/_base/applications/kmyfirewall/debian/menu b/debian/_base/applications/settings/kmyfirewall/debian/menu
similarity index 100%
rename from debian/_base/applications/kmyfirewall/debian/menu
rename to debian/_base/applications/settings/kmyfirewall/debian/menu
diff --git a/debian/_base/applications/kmyfirewall/debian/rules b/debian/_base/applications/settings/kmyfirewall/debian/rules
similarity index 100%
rename from debian/_base/applications/kmyfirewall/debian/rules
rename to debian/_base/applications/settings/kmyfirewall/debian/rules
diff --git a/debian/_base/applications/kpicosim/debian/source/format b/debian/_base/applications/settings/kmyfirewall/debian/source/format
similarity index 100%
rename from debian/_base/applications/kpicosim/debian/source/format
rename to debian/_base/applications/settings/kmyfirewall/debian/source/format
diff --git a/debian/_base/applications/kpicosim/debian/source/options b/debian/_base/applications/settings/kmyfirewall/debian/source/options
similarity index 100%
rename from debian/_base/applications/kpicosim/debian/source/options
rename to debian/_base/applications/settings/kmyfirewall/debian/source/options
diff --git a/debian/_base/applications/kmyfirewall/debian/watch b/debian/_base/applications/settings/kmyfirewall/debian/watch
similarity index 100%
rename from debian/_base/applications/kmyfirewall/debian/watch
rename to debian/_base/applications/settings/kmyfirewall/debian/watch
diff --git a/debian/_base/applications/knetworkmanager8/debian/README.source b/debian/_base/applications/settings/knetworkmanager8/debian/README.source
similarity index 100%
rename from debian/_base/applications/knetworkmanager8/debian/README.source
rename to debian/_base/applications/settings/knetworkmanager8/debian/README.source
diff --git a/debian/_base/applications/kopete-otr/debian/cdbs/debian-tde.mk b/debian/_base/applications/settings/knetworkmanager8/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kopete-otr/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/settings/knetworkmanager8/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kopete-otr/debian/cdbs/versions.pl b/debian/_base/applications/settings/knetworkmanager8/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kopete-otr/debian/cdbs/versions.pl
rename to debian/_base/applications/settings/knetworkmanager8/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/knetworkmanager8/debian/changelog b/debian/_base/applications/settings/knetworkmanager8/debian/changelog
similarity index 100%
rename from debian/_base/applications/knetworkmanager8/debian/changelog
rename to debian/_base/applications/settings/knetworkmanager8/debian/changelog
diff --git a/debian/_base/applications/kpilot/debian/compat b/debian/_base/applications/settings/knetworkmanager8/debian/compat
similarity index 100%
rename from debian/_base/applications/kpilot/debian/compat
rename to debian/_base/applications/settings/knetworkmanager8/debian/compat
diff --git a/debian/_base/applications/knetworkmanager8/debian/control b/debian/_base/applications/settings/knetworkmanager8/debian/control
similarity index 100%
rename from debian/_base/applications/knetworkmanager8/debian/control
rename to debian/_base/applications/settings/knetworkmanager8/debian/control
diff --git a/debian/_base/applications/knetworkmanager8/debian/copyright b/debian/_base/applications/settings/knetworkmanager8/debian/copyright
similarity index 100%
rename from debian/_base/applications/knetworkmanager8/debian/copyright
rename to debian/_base/applications/settings/knetworkmanager8/debian/copyright
diff --git a/debian/_base/applications/knetworkmanager8/debian/knetworkmanager.1 b/debian/_base/applications/settings/knetworkmanager8/debian/knetworkmanager.1
similarity index 100%
rename from debian/_base/applications/knetworkmanager8/debian/knetworkmanager.1
rename to debian/_base/applications/settings/knetworkmanager8/debian/knetworkmanager.1
diff --git a/debian/_base/applications/knetworkmanager8/debian/manpages b/debian/_base/applications/settings/knetworkmanager8/debian/manpages
similarity index 100%
rename from debian/_base/applications/knetworkmanager8/debian/manpages
rename to debian/_base/applications/settings/knetworkmanager8/debian/manpages
diff --git a/debian/_base/applications/knetworkmanager8/debian/menu b/debian/_base/applications/settings/knetworkmanager8/debian/menu
similarity index 100%
rename from debian/_base/applications/knetworkmanager8/debian/menu
rename to debian/_base/applications/settings/knetworkmanager8/debian/menu
diff --git a/debian/_base/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides b/debian/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
similarity index 100%
rename from debian/_base/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
rename to debian/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
diff --git a/debian/_base/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst b/debian/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.postinst
similarity index 100%
rename from debian/_base/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst
rename to debian/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.postinst
diff --git a/debian/_base/applications/kiosktool/debian/patches/series b/debian/_base/applications/settings/knetworkmanager8/debian/patches/series
similarity index 100%
rename from debian/_base/applications/kiosktool/debian/patches/series
rename to debian/_base/applications/settings/knetworkmanager8/debian/patches/series
diff --git a/debian/_base/applications/knetworkmanager8/debian/rules b/debian/_base/applications/settings/knetworkmanager8/debian/rules
similarity index 100%
rename from debian/_base/applications/knetworkmanager8/debian/rules
rename to debian/_base/applications/settings/knetworkmanager8/debian/rules
diff --git a/debian/_base/applications/kpilot/debian/source/format b/debian/_base/applications/settings/knetworkmanager8/debian/source/format
similarity index 100%
rename from debian/_base/applications/kpilot/debian/source/format
rename to debian/_base/applications/settings/knetworkmanager8/debian/source/format
diff --git a/debian/_base/applications/kpilot/debian/source/options b/debian/_base/applications/settings/knetworkmanager8/debian/source/options
similarity index 100%
rename from debian/_base/applications/kpilot/debian/source/options
rename to debian/_base/applications/settings/knetworkmanager8/debian/source/options
diff --git a/debian/_base/applications/knetworkmanager8/debian/watch b/debian/_base/applications/settings/knetworkmanager8/debian/watch
similarity index 100%
rename from debian/_base/applications/knetworkmanager8/debian/watch
rename to debian/_base/applications/settings/knetworkmanager8/debian/watch
diff --git a/debian/_base/applications/kftpgrabber/debian/README.Debian b/debian/_base/applications/settings/tde-guidance/debian/README.Debian
similarity index 100%
rename from debian/_base/applications/kftpgrabber/debian/README.Debian
rename to debian/_base/applications/settings/tde-guidance/debian/README.Debian
diff --git a/debian/_base/applications/tde-guidance/debian/changelog b/debian/_base/applications/settings/tde-guidance/debian/changelog
similarity index 100%
rename from debian/_base/applications/tde-guidance/debian/changelog
rename to debian/_base/applications/settings/tde-guidance/debian/changelog
diff --git a/debian/_base/applications/kplayer/debian/compat b/debian/_base/applications/settings/tde-guidance/debian/compat
similarity index 100%
rename from debian/_base/applications/kplayer/debian/compat
rename to debian/_base/applications/settings/tde-guidance/debian/compat
diff --git a/debian/_base/applications/tde-guidance/debian/control b/debian/_base/applications/settings/tde-guidance/debian/control
similarity index 100%
rename from debian/_base/applications/tde-guidance/debian/control
rename to debian/_base/applications/settings/tde-guidance/debian/control
diff --git a/debian/_base/applications/tde-guidance/debian/copyright b/debian/_base/applications/settings/tde-guidance/debian/copyright
similarity index 100%
rename from debian/_base/applications/tde-guidance/debian/copyright
rename to debian/_base/applications/settings/tde-guidance/debian/copyright
diff --git a/debian/_base/applications/tde-guidance/debian/docs b/debian/_base/applications/settings/tde-guidance/debian/docs
similarity index 100%
rename from debian/_base/applications/tde-guidance/debian/docs
rename to debian/_base/applications/settings/tde-guidance/debian/docs
diff --git a/debian/_base/applications/tde-guidance/debian/guidance-backends-trinity.install b/debian/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.install
similarity index 100%
rename from debian/_base/applications/tde-guidance/debian/guidance-backends-trinity.install
rename to debian/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.install
diff --git a/debian/_base/applications/tde-guidance/debian/mountconfig-trinity.1 b/debian/_base/applications/settings/tde-guidance/debian/mountconfig-trinity.1
similarity index 100%
rename from debian/_base/applications/tde-guidance/debian/mountconfig-trinity.1
rename to debian/_base/applications/settings/tde-guidance/debian/mountconfig-trinity.1
diff --git a/debian/_base/applications/klamav/debian/patches/series b/debian/_base/applications/settings/tde-guidance/debian/patches/series
similarity index 100%
rename from debian/_base/applications/klamav/debian/patches/series
rename to debian/_base/applications/settings/tde-guidance/debian/patches/series
diff --git a/debian/_base/applications/tde-guidance/debian/pycompat b/debian/_base/applications/settings/tde-guidance/debian/pycompat
similarity index 100%
rename from debian/_base/applications/tde-guidance/debian/pycompat
rename to debian/_base/applications/settings/tde-guidance/debian/pycompat
diff --git a/debian/_base/applications/tde-guidance/debian/python-distutils-jaunty.mk b/debian/_base/applications/settings/tde-guidance/debian/python-distutils-jaunty.mk
similarity index 100%
rename from debian/_base/applications/tde-guidance/debian/python-distutils-jaunty.mk
rename to debian/_base/applications/settings/tde-guidance/debian/python-distutils-jaunty.mk
diff --git a/debian/_base/applications/tde-guidance/debian/pyversions b/debian/_base/applications/settings/tde-guidance/debian/pyversions
similarity index 100%
rename from debian/_base/applications/tde-guidance/debian/pyversions
rename to debian/_base/applications/settings/tde-guidance/debian/pyversions
diff --git a/debian/_base/applications/tde-guidance/debian/rules b/debian/_base/applications/settings/tde-guidance/debian/rules
similarity index 100%
rename from debian/_base/applications/tde-guidance/debian/rules
rename to debian/_base/applications/settings/tde-guidance/debian/rules
diff --git a/debian/_base/applications/tde-guidance/debian/serviceconfig-trinity.1 b/debian/_base/applications/settings/tde-guidance/debian/serviceconfig-trinity.1
similarity index 100%
rename from debian/_base/applications/tde-guidance/debian/serviceconfig-trinity.1
rename to debian/_base/applications/settings/tde-guidance/debian/serviceconfig-trinity.1
diff --git a/debian/_base/applications/kplayer/debian/source/format b/debian/_base/applications/settings/tde-guidance/debian/source/format
similarity index 100%
rename from debian/_base/applications/kplayer/debian/source/format
rename to debian/_base/applications/settings/tde-guidance/debian/source/format
diff --git a/debian/_base/applications/kplayer/debian/source/options b/debian/_base/applications/settings/tde-guidance/debian/source/options
similarity index 100%
rename from debian/_base/applications/kplayer/debian/source/options
rename to debian/_base/applications/settings/tde-guidance/debian/source/options
diff --git a/debian/_base/applications/tde-guidance/debian/tde-guidance-trinity.install b/debian/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.install
similarity index 100%
rename from debian/_base/applications/tde-guidance/debian/tde-guidance-trinity.install
rename to debian/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.install
diff --git a/debian/_base/applications/tde-guidance/debian/tde-guidance-trinity.lintian-overrides b/debian/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.lintian-overrides
similarity index 100%
rename from debian/_base/applications/tde-guidance/debian/tde-guidance-trinity.lintian-overrides
rename to debian/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.lintian-overrides
diff --git a/debian/_base/applications/tde-guidance/debian/tde-guidance-trinity.postinst b/debian/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.postinst
similarity index 100%
rename from debian/_base/applications/tde-guidance/debian/tde-guidance-trinity.postinst
rename to debian/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.postinst
diff --git a/debian/_base/applications/tde-guidance/debian/userconfig-trinity.1 b/debian/_base/applications/settings/tde-guidance/debian/userconfig-trinity.1
similarity index 100%
rename from debian/_base/applications/tde-guidance/debian/userconfig-trinity.1
rename to debian/_base/applications/settings/tde-guidance/debian/userconfig-trinity.1
diff --git a/debian/_base/applications/tde-guidance/debian/watch b/debian/_base/applications/settings/tde-guidance/debian/watch
similarity index 100%
rename from debian/_base/applications/tde-guidance/debian/watch
rename to debian/_base/applications/settings/tde-guidance/debian/watch
diff --git a/debian/_base/applications/kpicosim/debian/cdbs/debian-tde.mk b/debian/_base/applications/settings/tde-systemsettings/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kpicosim/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/settings/tde-systemsettings/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kpicosim/debian/cdbs/versions.pl b/debian/_base/applications/settings/tde-systemsettings/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kpicosim/debian/cdbs/versions.pl
rename to debian/_base/applications/settings/tde-systemsettings/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/tde-systemsettings/debian/changelog b/debian/_base/applications/settings/tde-systemsettings/debian/changelog
similarity index 100%
rename from debian/_base/applications/tde-systemsettings/debian/changelog
rename to debian/_base/applications/settings/tde-systemsettings/debian/changelog
diff --git a/debian/_base/applications/kpowersave/debian/compat b/debian/_base/applications/settings/tde-systemsettings/debian/compat
similarity index 100%
rename from debian/_base/applications/kpowersave/debian/compat
rename to debian/_base/applications/settings/tde-systemsettings/debian/compat
diff --git a/debian/_base/applications/tde-systemsettings/debian/control b/debian/_base/applications/settings/tde-systemsettings/debian/control
similarity index 100%
rename from debian/_base/applications/tde-systemsettings/debian/control
rename to debian/_base/applications/settings/tde-systemsettings/debian/control
diff --git a/debian/_base/applications/tde-systemsettings/debian/copyright b/debian/_base/applications/settings/tde-systemsettings/debian/copyright
similarity index 100%
rename from debian/_base/applications/tde-systemsettings/debian/copyright
rename to debian/_base/applications/settings/tde-systemsettings/debian/copyright
diff --git a/debian/_base/applications/tde-systemsettings/debian/docs b/debian/_base/applications/settings/tde-systemsettings/debian/docs
similarity index 100%
rename from debian/_base/applications/tde-systemsettings/debian/docs
rename to debian/_base/applications/settings/tde-systemsettings/debian/docs
diff --git a/debian/_base/applications/kmplayer/debian/patches/series b/debian/_base/applications/settings/tde-systemsettings/debian/patches/series
similarity index 100%
rename from debian/_base/applications/kmplayer/debian/patches/series
rename to debian/_base/applications/settings/tde-systemsettings/debian/patches/series
diff --git a/debian/_base/applications/krename/debian/rules b/debian/_base/applications/settings/tde-systemsettings/debian/rules
similarity index 100%
rename from debian/_base/applications/krename/debian/rules
rename to debian/_base/applications/settings/tde-systemsettings/debian/rules
diff --git a/debian/_base/applications/kpowersave/debian/source/format b/debian/_base/applications/settings/tde-systemsettings/debian/source/format
similarity index 100%
rename from debian/_base/applications/kpowersave/debian/source/format
rename to debian/_base/applications/settings/tde-systemsettings/debian/source/format
diff --git a/debian/_base/applications/kpowersave/debian/source/options b/debian/_base/applications/settings/tde-systemsettings/debian/source/options
similarity index 100%
rename from debian/_base/applications/kpowersave/debian/source/options
rename to debian/_base/applications/settings/tde-systemsettings/debian/source/options
diff --git a/debian/_base/applications/tde-systemsettings/debian/tde-systemsettings-trinity.preinst b/debian/_base/applications/settings/tde-systemsettings/debian/tde-systemsettings-trinity.preinst
similarity index 100%
rename from debian/_base/applications/tde-systemsettings/debian/tde-systemsettings-trinity.preinst
rename to debian/_base/applications/settings/tde-systemsettings/debian/tde-systemsettings-trinity.preinst
diff --git a/debian/_base/applications/kpilot/debian/cdbs/debian-tde.mk b/debian/_base/applications/settings/tdenetworkmanager/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kpilot/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/settings/tdenetworkmanager/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kpilot/debian/cdbs/versions.pl b/debian/_base/applications/settings/tdenetworkmanager/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kpilot/debian/cdbs/versions.pl
rename to debian/_base/applications/settings/tdenetworkmanager/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/tdenetworkmanager/debian/changelog b/debian/_base/applications/settings/tdenetworkmanager/debian/changelog
similarity index 100%
rename from debian/_base/applications/tdenetworkmanager/debian/changelog
rename to debian/_base/applications/settings/tdenetworkmanager/debian/changelog
diff --git a/debian/_base/applications/krecipes/debian/compat b/debian/_base/applications/settings/tdenetworkmanager/debian/compat
similarity index 100%
rename from debian/_base/applications/krecipes/debian/compat
rename to debian/_base/applications/settings/tdenetworkmanager/debian/compat
diff --git a/debian/_base/applications/tdenetworkmanager/debian/control b/debian/_base/applications/settings/tdenetworkmanager/debian/control
similarity index 100%
rename from debian/_base/applications/tdenetworkmanager/debian/control
rename to debian/_base/applications/settings/tdenetworkmanager/debian/control
diff --git a/debian/_base/applications/tdenetworkmanager/debian/copyright b/debian/_base/applications/settings/tdenetworkmanager/debian/copyright
similarity index 100%
rename from debian/_base/applications/tdenetworkmanager/debian/copyright
rename to debian/_base/applications/settings/tdenetworkmanager/debian/copyright
diff --git a/debian/_base/applications/tdenetworkmanager/debian/menu b/debian/_base/applications/settings/tdenetworkmanager/debian/menu
similarity index 100%
rename from debian/_base/applications/tdenetworkmanager/debian/menu
rename to debian/_base/applications/settings/tdenetworkmanager/debian/menu
diff --git a/debian/_base/applications/tdenetworkmanager/debian/network-manager-tde.lintian b/debian/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.lintian
similarity index 100%
rename from debian/_base/applications/tdenetworkmanager/debian/network-manager-tde.lintian
rename to debian/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.lintian
diff --git a/debian/_base/applications/tdenetworkmanager/debian/network-manager-tde.postinst b/debian/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.postinst
similarity index 100%
rename from debian/_base/applications/tdenetworkmanager/debian/network-manager-tde.postinst
rename to debian/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.postinst
diff --git a/debian/_base/applications/kmymoney/debian/patches/series b/debian/_base/applications/settings/tdenetworkmanager/debian/patches/series
similarity index 100%
rename from debian/_base/applications/kmymoney/debian/patches/series
rename to debian/_base/applications/settings/tdenetworkmanager/debian/patches/series
diff --git a/debian/_base/applications/klamav/debian/rules b/debian/_base/applications/settings/tdenetworkmanager/debian/rules
similarity index 100%
rename from debian/_base/applications/klamav/debian/rules
rename to debian/_base/applications/settings/tdenetworkmanager/debian/rules
diff --git a/debian/_base/applications/krecipes/debian/source/format b/debian/_base/applications/settings/tdenetworkmanager/debian/source/format
similarity index 100%
rename from debian/_base/applications/krecipes/debian/source/format
rename to debian/_base/applications/settings/tdenetworkmanager/debian/source/format
diff --git a/debian/_base/applications/krecipes/debian/source/options b/debian/_base/applications/settings/tdenetworkmanager/debian/source/options
similarity index 100%
rename from debian/_base/applications/krecipes/debian/source/options
rename to debian/_base/applications/settings/tdenetworkmanager/debian/source/options
diff --git a/debian/_base/applications/kplayer/debian/cdbs/debian-tde.mk b/debian/_base/applications/settings/tdesudo/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kplayer/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/settings/tdesudo/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kplayer/debian/cdbs/versions.pl b/debian/_base/applications/settings/tdesudo/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kplayer/debian/cdbs/versions.pl
rename to debian/_base/applications/settings/tdesudo/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/tdesudo/debian/changelog b/debian/_base/applications/settings/tdesudo/debian/changelog
similarity index 100%
rename from debian/_base/applications/tdesudo/debian/changelog
rename to debian/_base/applications/settings/tdesudo/debian/changelog
diff --git a/debian/_base/applications/krename/debian/compat b/debian/_base/applications/settings/tdesudo/debian/compat
similarity index 100%
rename from debian/_base/applications/krename/debian/compat
rename to debian/_base/applications/settings/tdesudo/debian/compat
diff --git a/debian/_base/applications/tdesudo/debian/control b/debian/_base/applications/settings/tdesudo/debian/control
similarity index 100%
rename from debian/_base/applications/tdesudo/debian/control
rename to debian/_base/applications/settings/tdesudo/debian/control
diff --git a/debian/_base/applications/tdesudo/debian/copyright b/debian/_base/applications/settings/tdesudo/debian/copyright
similarity index 100%
rename from debian/_base/applications/tdesudo/debian/copyright
rename to debian/_base/applications/settings/tdesudo/debian/copyright
diff --git a/debian/_base/applications/ksensors/debian/docs b/debian/_base/applications/settings/tdesudo/debian/docs
similarity index 100%
rename from debian/_base/applications/ksensors/debian/docs
rename to debian/_base/applications/settings/tdesudo/debian/docs
diff --git a/debian/_base/applications/tdesudo/debian/links b/debian/_base/applications/settings/tdesudo/debian/links
similarity index 100%
rename from debian/_base/applications/tdesudo/debian/links
rename to debian/_base/applications/settings/tdesudo/debian/links
diff --git a/debian/_base/applications/knemo/debian/patches/series b/debian/_base/applications/settings/tdesudo/debian/patches/series
similarity index 100%
rename from debian/_base/applications/knemo/debian/patches/series
rename to debian/_base/applications/settings/tdesudo/debian/patches/series
diff --git a/debian/_base/applications/tdesudo/debian/postinst b/debian/_base/applications/settings/tdesudo/debian/postinst
similarity index 100%
rename from debian/_base/applications/tdesudo/debian/postinst
rename to debian/_base/applications/settings/tdesudo/debian/postinst
diff --git a/debian/_base/applications/tdesudo/debian/postrm b/debian/_base/applications/settings/tdesudo/debian/postrm
similarity index 100%
rename from debian/_base/applications/tdesudo/debian/postrm
rename to debian/_base/applications/settings/tdesudo/debian/postrm
diff --git a/debian/_base/applications/tdesudo/debian/preinst b/debian/_base/applications/settings/tdesudo/debian/preinst
similarity index 100%
rename from debian/_base/applications/tdesudo/debian/preinst
rename to debian/_base/applications/settings/tdesudo/debian/preinst
diff --git a/debian/_base/applications/kscope/debian/rules b/debian/_base/applications/settings/tdesudo/debian/rules
similarity index 100%
rename from debian/_base/applications/kscope/debian/rules
rename to debian/_base/applications/settings/tdesudo/debian/rules
diff --git a/debian/_base/applications/krename/debian/source/format b/debian/_base/applications/settings/tdesudo/debian/source/format
similarity index 100%
rename from debian/_base/applications/krename/debian/source/format
rename to debian/_base/applications/settings/tdesudo/debian/source/format
diff --git a/debian/_base/applications/krename/debian/source/options b/debian/_base/applications/settings/tdesudo/debian/source/options
similarity index 100%
rename from debian/_base/applications/krename/debian/source/options
rename to debian/_base/applications/settings/tdesudo/debian/source/options
diff --git a/debian/_base/applications/kmplayer/debian/README.Debian b/debian/_base/applications/settings/wlassistant/debian/README.Debian
similarity index 100%
rename from debian/_base/applications/kmplayer/debian/README.Debian
rename to debian/_base/applications/settings/wlassistant/debian/README.Debian
diff --git a/debian/_base/applications/kpowersave/debian/cdbs/debian-tde.mk b/debian/_base/applications/settings/wlassistant/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kpowersave/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/settings/wlassistant/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kpowersave/debian/cdbs/versions.pl b/debian/_base/applications/settings/wlassistant/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kpowersave/debian/cdbs/versions.pl
rename to debian/_base/applications/settings/wlassistant/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/wlassistant/debian/changelog b/debian/_base/applications/settings/wlassistant/debian/changelog
similarity index 100%
rename from debian/_base/applications/wlassistant/debian/changelog
rename to debian/_base/applications/settings/wlassistant/debian/changelog
diff --git a/debian/_base/applications/krusader/debian/compat b/debian/_base/applications/settings/wlassistant/debian/compat
similarity index 100%
rename from debian/_base/applications/krusader/debian/compat
rename to debian/_base/applications/settings/wlassistant/debian/compat
diff --git a/debian/_base/applications/wlassistant/debian/control b/debian/_base/applications/settings/wlassistant/debian/control
similarity index 100%
rename from debian/_base/applications/wlassistant/debian/control
rename to debian/_base/applications/settings/wlassistant/debian/control
diff --git a/debian/_base/applications/wlassistant/debian/copyright b/debian/_base/applications/settings/wlassistant/debian/copyright
similarity index 100%
rename from debian/_base/applications/wlassistant/debian/copyright
rename to debian/_base/applications/settings/wlassistant/debian/copyright
diff --git a/debian/_base/applications/knetstats/debian/patches/series b/debian/_base/applications/settings/wlassistant/debian/patches/series
similarity index 100%
rename from debian/_base/applications/knetstats/debian/patches/series
rename to debian/_base/applications/settings/wlassistant/debian/patches/series
diff --git a/debian/_base/applications/wlassistant/debian/rules b/debian/_base/applications/settings/wlassistant/debian/rules
similarity index 100%
rename from debian/_base/applications/wlassistant/debian/rules
rename to debian/_base/applications/settings/wlassistant/debian/rules
diff --git a/debian/_base/applications/krusader/debian/source/format b/debian/_base/applications/settings/wlassistant/debian/source/format
similarity index 100%
rename from debian/_base/applications/krusader/debian/source/format
rename to debian/_base/applications/settings/wlassistant/debian/source/format
diff --git a/debian/_base/applications/krusader/debian/source/options b/debian/_base/applications/settings/wlassistant/debian/source/options
similarity index 100%
rename from debian/_base/applications/krusader/debian/source/options
rename to debian/_base/applications/settings/wlassistant/debian/source/options
diff --git a/debian/_base/applications/wlassistant/debian/watch b/debian/_base/applications/settings/wlassistant/debian/watch
similarity index 100%
rename from debian/_base/applications/wlassistant/debian/watch
rename to debian/_base/applications/settings/wlassistant/debian/watch
diff --git a/debian/_base/applications/wlassistant/debian/wlassistant-16.xpm b/debian/_base/applications/settings/wlassistant/debian/wlassistant-16.xpm
similarity index 100%
rename from debian/_base/applications/wlassistant/debian/wlassistant-16.xpm
rename to debian/_base/applications/settings/wlassistant/debian/wlassistant-16.xpm
diff --git a/debian/_base/applications/wlassistant/debian/wlassistant-trinity.dirs b/debian/_base/applications/settings/wlassistant/debian/wlassistant-trinity.dirs
similarity index 100%
rename from debian/_base/applications/wlassistant/debian/wlassistant-trinity.dirs
rename to debian/_base/applications/settings/wlassistant/debian/wlassistant-trinity.dirs
diff --git a/debian/_base/applications/wlassistant/debian/wlassistant-trinity.docs b/debian/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs
similarity index 100%
rename from debian/_base/applications/wlassistant/debian/wlassistant-trinity.docs
rename to debian/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs
diff --git a/debian/_base/applications/wlassistant/debian/wlassistant-trinity.install b/debian/_base/applications/settings/wlassistant/debian/wlassistant-trinity.install
similarity index 100%
rename from debian/_base/applications/wlassistant/debian/wlassistant-trinity.install
rename to debian/_base/applications/settings/wlassistant/debian/wlassistant-trinity.install
diff --git a/debian/_base/applications/wlassistant/debian/wlassistant-trinity.manpage b/debian/_base/applications/settings/wlassistant/debian/wlassistant-trinity.manpage
similarity index 100%
rename from debian/_base/applications/wlassistant/debian/wlassistant-trinity.manpage
rename to debian/_base/applications/settings/wlassistant/debian/wlassistant-trinity.manpage
diff --git a/debian/_base/applications/wlassistant/debian/wlassistant-trinity.menu b/debian/_base/applications/settings/wlassistant/debian/wlassistant-trinity.menu
similarity index 100%
rename from debian/_base/applications/wlassistant/debian/wlassistant-trinity.menu
rename to debian/_base/applications/settings/wlassistant/debian/wlassistant-trinity.menu
diff --git a/debian/_base/applications/wlassistant/debian/wlassistant.xpm b/debian/_base/applications/settings/wlassistant/debian/wlassistant.xpm
similarity index 100%
rename from debian/_base/applications/wlassistant/debian/wlassistant.xpm
rename to debian/_base/applications/settings/wlassistant/debian/wlassistant.xpm
diff --git a/debian/_base/applications/krecipes/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/dolphin/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/krecipes/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/system/dolphin/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/krecipes/debian/cdbs/versions.pl b/debian/_base/applications/system/dolphin/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/krecipes/debian/cdbs/versions.pl
rename to debian/_base/applications/system/dolphin/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/dolphin/debian/changelog b/debian/_base/applications/system/dolphin/debian/changelog
similarity index 100%
rename from debian/_base/applications/dolphin/debian/changelog
rename to debian/_base/applications/system/dolphin/debian/changelog
diff --git a/debian/_base/applications/kscope/debian/compat b/debian/_base/applications/system/dolphin/debian/compat
similarity index 100%
rename from debian/_base/applications/kscope/debian/compat
rename to debian/_base/applications/system/dolphin/debian/compat
diff --git a/debian/_base/applications/dolphin/debian/control b/debian/_base/applications/system/dolphin/debian/control
similarity index 100%
rename from debian/_base/applications/dolphin/debian/control
rename to debian/_base/applications/system/dolphin/debian/control
diff --git a/debian/_base/applications/dolphin/debian/copyright b/debian/_base/applications/system/dolphin/debian/copyright
similarity index 100%
rename from debian/_base/applications/dolphin/debian/copyright
rename to debian/_base/applications/system/dolphin/debian/copyright
diff --git a/debian/_base/applications/knetworkmanager8/debian/patches/series b/debian/_base/applications/system/dolphin/debian/patches/series
similarity index 100%
rename from debian/_base/applications/knetworkmanager8/debian/patches/series
rename to debian/_base/applications/system/dolphin/debian/patches/series
diff --git a/debian/_base/applications/dolphin/debian/rules b/debian/_base/applications/system/dolphin/debian/rules
similarity index 100%
rename from debian/_base/applications/dolphin/debian/rules
rename to debian/_base/applications/system/dolphin/debian/rules
diff --git a/debian/_base/applications/kscope/debian/source/format b/debian/_base/applications/system/dolphin/debian/source/format
similarity index 100%
rename from debian/_base/applications/kscope/debian/source/format
rename to debian/_base/applications/system/dolphin/debian/source/format
diff --git a/debian/_base/applications/kscope/debian/source/options b/debian/_base/applications/system/dolphin/debian/source/options
similarity index 100%
rename from debian/_base/applications/kscope/debian/source/options
rename to debian/_base/applications/system/dolphin/debian/source/options
diff --git a/debian/_base/applications/krename/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/katapult/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/krename/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/system/katapult/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/krename/debian/cdbs/versions.pl b/debian/_base/applications/system/katapult/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/krename/debian/cdbs/versions.pl
rename to debian/_base/applications/system/katapult/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/katapult/debian/changelog b/debian/_base/applications/system/katapult/debian/changelog
similarity index 100%
rename from debian/_base/applications/katapult/debian/changelog
rename to debian/_base/applications/system/katapult/debian/changelog
diff --git a/debian/_base/applications/ksensors/debian/compat b/debian/_base/applications/system/katapult/debian/compat
similarity index 100%
rename from debian/_base/applications/ksensors/debian/compat
rename to debian/_base/applications/system/katapult/debian/compat
diff --git a/debian/_base/applications/katapult/debian/control b/debian/_base/applications/system/katapult/debian/control
similarity index 100%
rename from debian/_base/applications/katapult/debian/control
rename to debian/_base/applications/system/katapult/debian/control
diff --git a/debian/_base/applications/katapult/debian/copyright b/debian/_base/applications/system/katapult/debian/copyright
similarity index 100%
rename from debian/_base/applications/katapult/debian/copyright
rename to debian/_base/applications/system/katapult/debian/copyright
diff --git a/debian/_base/applications/katapult/debian/docs b/debian/_base/applications/system/katapult/debian/docs
similarity index 100%
rename from debian/_base/applications/katapult/debian/docs
rename to debian/_base/applications/system/katapult/debian/docs
diff --git a/debian/_base/applications/katapult/debian/katapult-trinity.lintian b/debian/_base/applications/system/katapult/debian/katapult-trinity.lintian
similarity index 100%
rename from debian/_base/applications/katapult/debian/katapult-trinity.lintian
rename to debian/_base/applications/system/katapult/debian/katapult-trinity.lintian
diff --git a/debian/_base/applications/katapult/debian/menu b/debian/_base/applications/system/katapult/debian/menu
similarity index 100%
rename from debian/_base/applications/katapult/debian/menu
rename to debian/_base/applications/system/katapult/debian/menu
diff --git a/debian/_base/applications/knmap/debian/patches/series b/debian/_base/applications/system/katapult/debian/patches/series
similarity index 100%
rename from debian/_base/applications/knmap/debian/patches/series
rename to debian/_base/applications/system/katapult/debian/patches/series
diff --git a/debian/_base/applications/katapult/debian/rules b/debian/_base/applications/system/katapult/debian/rules
similarity index 100%
rename from debian/_base/applications/katapult/debian/rules
rename to debian/_base/applications/system/katapult/debian/rules
diff --git a/debian/_base/applications/ksensors/debian/source/format b/debian/_base/applications/system/katapult/debian/source/format
similarity index 100%
rename from debian/_base/applications/ksensors/debian/source/format
rename to debian/_base/applications/system/katapult/debian/source/format
diff --git a/debian/_base/applications/ksensors/debian/source/options b/debian/_base/applications/system/katapult/debian/source/options
similarity index 100%
rename from debian/_base/applications/ksensors/debian/source/options
rename to debian/_base/applications/system/katapult/debian/source/options
diff --git a/debian/_base/applications/knemo/debian/README.Debian b/debian/_base/applications/system/kbfx/debian/README.Debian
similarity index 100%
rename from debian/_base/applications/knemo/debian/README.Debian
rename to debian/_base/applications/system/kbfx/debian/README.Debian
diff --git a/debian/_base/applications/krusader/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/kbfx/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/krusader/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/system/kbfx/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/krusader/debian/cdbs/versions.pl b/debian/_base/applications/system/kbfx/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/krusader/debian/cdbs/versions.pl
rename to debian/_base/applications/system/kbfx/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kbfx/debian/changelog b/debian/_base/applications/system/kbfx/debian/changelog
similarity index 100%
rename from debian/_base/applications/kbfx/debian/changelog
rename to debian/_base/applications/system/kbfx/debian/changelog
diff --git a/debian/_base/applications/kshowmail/debian/compat b/debian/_base/applications/system/kbfx/debian/compat
similarity index 100%
rename from debian/_base/applications/kshowmail/debian/compat
rename to debian/_base/applications/system/kbfx/debian/compat
diff --git a/debian/_base/applications/kbfx/debian/control b/debian/_base/applications/system/kbfx/debian/control
similarity index 100%
rename from debian/_base/applications/kbfx/debian/control
rename to debian/_base/applications/system/kbfx/debian/control
diff --git a/debian/_base/applications/kbfx/debian/copyright b/debian/_base/applications/system/kbfx/debian/copyright
similarity index 100%
rename from debian/_base/applications/kbfx/debian/copyright
rename to debian/_base/applications/system/kbfx/debian/copyright
diff --git a/debian/_base/applications/kbfx/debian/docs b/debian/_base/applications/system/kbfx/debian/docs
similarity index 100%
rename from debian/_base/applications/kbfx/debian/docs
rename to debian/_base/applications/system/kbfx/debian/docs
diff --git a/debian/_base/applications/kbfx/debian/kbfx-trinity.lintian b/debian/_base/applications/system/kbfx/debian/kbfx-trinity.lintian
similarity index 100%
rename from debian/_base/applications/kbfx/debian/kbfx-trinity.lintian
rename to debian/_base/applications/system/kbfx/debian/kbfx-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/patches/series b/debian/_base/applications/system/kbfx/debian/patches/series
similarity index 100%
rename from debian/_base/applications/koffice/debian/patches/series
rename to debian/_base/applications/system/kbfx/debian/patches/series
diff --git a/debian/_base/applications/kbfx/debian/postinst b/debian/_base/applications/system/kbfx/debian/postinst
similarity index 100%
rename from debian/_base/applications/kbfx/debian/postinst
rename to debian/_base/applications/system/kbfx/debian/postinst
diff --git a/debian/_base/applications/kbfx/debian/rules b/debian/_base/applications/system/kbfx/debian/rules
similarity index 100%
rename from debian/_base/applications/kbfx/debian/rules
rename to debian/_base/applications/system/kbfx/debian/rules
diff --git a/debian/_base/applications/kshowmail/debian/source/format b/debian/_base/applications/system/kbfx/debian/source/format
similarity index 100%
rename from debian/_base/applications/kshowmail/debian/source/format
rename to debian/_base/applications/system/kbfx/debian/source/format
diff --git a/debian/_base/applications/kshowmail/debian/source/options b/debian/_base/applications/system/kbfx/debian/source/options
similarity index 100%
rename from debian/_base/applications/kshowmail/debian/source/options
rename to debian/_base/applications/system/kbfx/debian/source/options
diff --git a/debian/_base/applications/kbfx/debian/watch b/debian/_base/applications/system/kbfx/debian/watch
similarity index 100%
rename from debian/_base/applications/kbfx/debian/watch
rename to debian/_base/applications/system/kbfx/debian/watch
diff --git a/debian/_base/applications/kscope/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/kcmautostart/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kscope/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/system/kcmautostart/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kscope/debian/cdbs/versions.pl b/debian/_base/applications/system/kcmautostart/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kscope/debian/cdbs/versions.pl
rename to debian/_base/applications/system/kcmautostart/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kcmautostart/debian/changelog b/debian/_base/applications/system/kcmautostart/debian/changelog
similarity index 100%
rename from debian/_base/applications/kcmautostart/debian/changelog
rename to debian/_base/applications/system/kcmautostart/debian/changelog
diff --git a/debian/_base/applications/kshutdown/debian/compat b/debian/_base/applications/system/kcmautostart/debian/compat
similarity index 100%
rename from debian/_base/applications/kshutdown/debian/compat
rename to debian/_base/applications/system/kcmautostart/debian/compat
diff --git a/debian/_base/applications/kcmautostart/debian/control b/debian/_base/applications/system/kcmautostart/debian/control
similarity index 100%
rename from debian/_base/applications/kcmautostart/debian/control
rename to debian/_base/applications/system/kcmautostart/debian/control
diff --git a/debian/_base/applications/kcmautostart/debian/copyright b/debian/_base/applications/system/kcmautostart/debian/copyright
similarity index 100%
rename from debian/_base/applications/kcmautostart/debian/copyright
rename to debian/_base/applications/system/kcmautostart/debian/copyright
diff --git a/debian/_base/applications/kerberostray/debian/docs b/debian/_base/applications/system/kcmautostart/debian/docs
similarity index 100%
rename from debian/_base/applications/kerberostray/debian/docs
rename to debian/_base/applications/system/kcmautostart/debian/docs
diff --git a/debian/_base/applications/kompose/debian/patches/series b/debian/_base/applications/system/kcmautostart/debian/patches/series
similarity index 100%
rename from debian/_base/applications/kompose/debian/patches/series
rename to debian/_base/applications/system/kcmautostart/debian/patches/series
diff --git a/debian/_base/applications/kshutdown/debian/rules b/debian/_base/applications/system/kcmautostart/debian/rules
similarity index 100%
rename from debian/_base/applications/kshutdown/debian/rules
rename to debian/_base/applications/system/kcmautostart/debian/rules
diff --git a/debian/_base/applications/kshutdown/debian/source/format b/debian/_base/applications/system/kcmautostart/debian/source/format
similarity index 100%
rename from debian/_base/applications/kshutdown/debian/source/format
rename to debian/_base/applications/system/kcmautostart/debian/source/format
diff --git a/debian/_base/applications/kshutdown/debian/source/options b/debian/_base/applications/system/kcmautostart/debian/source/options
similarity index 100%
rename from debian/_base/applications/kshutdown/debian/source/options
rename to debian/_base/applications/system/kcmautostart/debian/source/options
diff --git a/debian/_base/applications/ksensors/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/kdbusnotification/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/ksensors/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/system/kdbusnotification/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/ksensors/debian/cdbs/versions.pl b/debian/_base/applications/system/kdbusnotification/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/ksensors/debian/cdbs/versions.pl
rename to debian/_base/applications/system/kdbusnotification/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kdbusnotification/debian/changelog b/debian/_base/applications/system/kdbusnotification/debian/changelog
similarity index 100%
rename from debian/_base/applications/kdbusnotification/debian/changelog
rename to debian/_base/applications/system/kdbusnotification/debian/changelog
diff --git a/debian/_base/applications/ksplash-engine-moodin/debian/compat b/debian/_base/applications/system/kdbusnotification/debian/compat
similarity index 100%
rename from debian/_base/applications/ksplash-engine-moodin/debian/compat
rename to debian/_base/applications/system/kdbusnotification/debian/compat
diff --git a/debian/_base/applications/kdbusnotification/debian/control b/debian/_base/applications/system/kdbusnotification/debian/control
similarity index 100%
rename from debian/_base/applications/kdbusnotification/debian/control
rename to debian/_base/applications/system/kdbusnotification/debian/control
diff --git a/debian/_base/applications/kdbusnotification/debian/copyright b/debian/_base/applications/system/kdbusnotification/debian/copyright
similarity index 100%
rename from debian/_base/applications/kdbusnotification/debian/copyright
rename to debian/_base/applications/system/kdbusnotification/debian/copyright
diff --git a/debian/_base/applications/knetstats/debian/docs b/debian/_base/applications/system/kdbusnotification/debian/docs
similarity index 100%
rename from debian/_base/applications/knetstats/debian/docs
rename to debian/_base/applications/system/kdbusnotification/debian/docs
diff --git a/debian/_base/applications/knemo/debian/rules b/debian/_base/applications/system/kdbusnotification/debian/rules
similarity index 100%
rename from debian/_base/applications/knemo/debian/rules
rename to debian/_base/applications/system/kdbusnotification/debian/rules
diff --git a/debian/_base/applications/ksplash-engine-moodin/debian/source/format b/debian/_base/applications/system/kdbusnotification/debian/source/format
similarity index 100%
rename from debian/_base/applications/ksplash-engine-moodin/debian/source/format
rename to debian/_base/applications/system/kdbusnotification/debian/source/format
diff --git a/debian/_base/applications/ksplash-engine-moodin/debian/source/options b/debian/_base/applications/system/kdbusnotification/debian/source/options
similarity index 100%
rename from debian/_base/applications/ksplash-engine-moodin/debian/source/options
rename to debian/_base/applications/system/kdbusnotification/debian/source/options
diff --git a/debian/_base/applications/kshowmail/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/klamav/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kshowmail/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/system/klamav/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kshowmail/debian/cdbs/versions.pl b/debian/_base/applications/system/klamav/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kshowmail/debian/cdbs/versions.pl
rename to debian/_base/applications/system/klamav/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/klamav/debian/changelog b/debian/_base/applications/system/klamav/debian/changelog
similarity index 100%
rename from debian/_base/applications/klamav/debian/changelog
rename to debian/_base/applications/system/klamav/debian/changelog
diff --git a/debian/_base/applications/ksquirrel/debian/compat b/debian/_base/applications/system/klamav/debian/compat
similarity index 100%
rename from debian/_base/applications/ksquirrel/debian/compat
rename to debian/_base/applications/system/klamav/debian/compat
diff --git a/debian/_base/applications/klamav/debian/control b/debian/_base/applications/system/klamav/debian/control
similarity index 100%
rename from debian/_base/applications/klamav/debian/control
rename to debian/_base/applications/system/klamav/debian/control
diff --git a/debian/_base/applications/klamav/debian/copyright b/debian/_base/applications/system/klamav/debian/copyright
similarity index 100%
rename from debian/_base/applications/klamav/debian/copyright
rename to debian/_base/applications/system/klamav/debian/copyright
diff --git a/debian/_base/applications/kstreamripper/debian/docs b/debian/_base/applications/system/klamav/debian/docs
similarity index 100%
rename from debian/_base/applications/kstreamripper/debian/docs
rename to debian/_base/applications/system/klamav/debian/docs
diff --git a/debian/_base/applications/klamav/debian/klamav-trinity.menu b/debian/_base/applications/system/klamav/debian/klamav-trinity.menu
similarity index 100%
rename from debian/_base/applications/klamav/debian/klamav-trinity.menu
rename to debian/_base/applications/system/klamav/debian/klamav-trinity.menu
diff --git a/debian/_base/applications/kpowersave/debian/patches/series b/debian/_base/applications/system/klamav/debian/patches/series
similarity index 100%
rename from debian/_base/applications/kpowersave/debian/patches/series
rename to debian/_base/applications/system/klamav/debian/patches/series
diff --git a/debian/_base/applications/knetload/debian/rules b/debian/_base/applications/system/klamav/debian/rules
similarity index 100%
rename from debian/_base/applications/knetload/debian/rules
rename to debian/_base/applications/system/klamav/debian/rules
diff --git a/debian/_base/applications/ksquirrel/debian/source/format b/debian/_base/applications/system/klamav/debian/source/format
similarity index 100%
rename from debian/_base/applications/ksquirrel/debian/source/format
rename to debian/_base/applications/system/klamav/debian/source/format
diff --git a/debian/_base/applications/ksquirrel/debian/source/options b/debian/_base/applications/system/klamav/debian/source/options
similarity index 100%
rename from debian/_base/applications/ksquirrel/debian/source/options
rename to debian/_base/applications/system/klamav/debian/source/options
diff --git a/debian/_base/applications/krusader/debian/README.Debian b/debian/_base/applications/system/knemo/debian/README.Debian
similarity index 100%
rename from debian/_base/applications/krusader/debian/README.Debian
rename to debian/_base/applications/system/knemo/debian/README.Debian
diff --git a/debian/_base/applications/kshutdown/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/knemo/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kshutdown/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/system/knemo/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kshutdown/debian/cdbs/versions.pl b/debian/_base/applications/system/knemo/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kshutdown/debian/cdbs/versions.pl
rename to debian/_base/applications/system/knemo/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/knemo/debian/changelog b/debian/_base/applications/system/knemo/debian/changelog
similarity index 100%
rename from debian/_base/applications/knemo/debian/changelog
rename to debian/_base/applications/system/knemo/debian/changelog
diff --git a/debian/_base/applications/kstreamripper/debian/compat b/debian/_base/applications/system/knemo/debian/compat
similarity index 100%
rename from debian/_base/applications/kstreamripper/debian/compat
rename to debian/_base/applications/system/knemo/debian/compat
diff --git a/debian/_base/applications/knemo/debian/control b/debian/_base/applications/system/knemo/debian/control
similarity index 100%
rename from debian/_base/applications/knemo/debian/control
rename to debian/_base/applications/system/knemo/debian/control
diff --git a/debian/_base/applications/knemo/debian/copyright b/debian/_base/applications/system/knemo/debian/copyright
similarity index 100%
rename from debian/_base/applications/knemo/debian/copyright
rename to debian/_base/applications/system/knemo/debian/copyright
diff --git a/debian/_base/applications/knemo/debian/dirs b/debian/_base/applications/system/knemo/debian/dirs
similarity index 100%
rename from debian/_base/applications/knemo/debian/dirs
rename to debian/_base/applications/system/knemo/debian/dirs
diff --git a/debian/_base/applications/knemo/debian/docs b/debian/_base/applications/system/knemo/debian/docs
similarity index 100%
rename from debian/_base/applications/knemo/debian/docs
rename to debian/_base/applications/system/knemo/debian/docs
diff --git a/debian/_base/applications/krename/debian/patches/series b/debian/_base/applications/system/knemo/debian/patches/series
similarity index 100%
rename from debian/_base/applications/krename/debian/patches/series
rename to debian/_base/applications/system/knemo/debian/patches/series
diff --git a/debian/_base/applications/kompose/debian/rules b/debian/_base/applications/system/knemo/debian/rules
similarity index 100%
rename from debian/_base/applications/kompose/debian/rules
rename to debian/_base/applications/system/knemo/debian/rules
diff --git a/debian/_base/applications/kstreamripper/debian/source/format b/debian/_base/applications/system/knemo/debian/source/format
similarity index 100%
rename from debian/_base/applications/kstreamripper/debian/source/format
rename to debian/_base/applications/system/knemo/debian/source/format
diff --git a/debian/_base/applications/kstreamripper/debian/source/options b/debian/_base/applications/system/knemo/debian/source/options
similarity index 100%
rename from debian/_base/applications/kstreamripper/debian/source/options
rename to debian/_base/applications/system/knemo/debian/source/options
diff --git a/debian/_base/applications/ksplash-engine-moodin/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/knetload/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/ksplash-engine-moodin/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/system/knetload/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/ksplash-engine-moodin/debian/cdbs/versions.pl b/debian/_base/applications/system/knetload/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/ksplash-engine-moodin/debian/cdbs/versions.pl
rename to debian/_base/applications/system/knetload/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/knetload/debian/changelog b/debian/_base/applications/system/knetload/debian/changelog
similarity index 100%
rename from debian/_base/applications/knetload/debian/changelog
rename to debian/_base/applications/system/knetload/debian/changelog
diff --git a/debian/_base/applications/ksystemlog/debian/compat b/debian/_base/applications/system/knetload/debian/compat
similarity index 100%
rename from debian/_base/applications/ksystemlog/debian/compat
rename to debian/_base/applications/system/knetload/debian/compat
diff --git a/debian/_base/applications/knetload/debian/control b/debian/_base/applications/system/knetload/debian/control
similarity index 100%
rename from debian/_base/applications/knetload/debian/control
rename to debian/_base/applications/system/knetload/debian/control
diff --git a/debian/_base/applications/knetload/debian/copyright b/debian/_base/applications/system/knetload/debian/copyright
similarity index 100%
rename from debian/_base/applications/knetload/debian/copyright
rename to debian/_base/applications/system/knetload/debian/copyright
diff --git a/debian/_base/applications/knetload/debian/dirs b/debian/_base/applications/system/knetload/debian/dirs
similarity index 100%
rename from debian/_base/applications/knetload/debian/dirs
rename to debian/_base/applications/system/knetload/debian/dirs
diff --git a/debian/_base/applications/kvpnc/debian/docs b/debian/_base/applications/system/knetload/debian/docs
similarity index 100%
rename from debian/_base/applications/kvpnc/debian/docs
rename to debian/_base/applications/system/knetload/debian/docs
diff --git a/debian/_base/applications/knetload/debian/knetload-trinity.install b/debian/_base/applications/system/knetload/debian/knetload-trinity.install
similarity index 100%
rename from debian/_base/applications/knetload/debian/knetload-trinity.install
rename to debian/_base/applications/system/knetload/debian/knetload-trinity.install
diff --git a/debian/_base/applications/knetload/debian/knetload.xpm b/debian/_base/applications/system/knetload/debian/knetload.xpm
similarity index 100%
rename from debian/_base/applications/knetload/debian/knetload.xpm
rename to debian/_base/applications/system/knetload/debian/knetload.xpm
diff --git a/debian/_base/applications/knetload/debian/menu b/debian/_base/applications/system/knetload/debian/menu
similarity index 100%
rename from debian/_base/applications/knetload/debian/menu
rename to debian/_base/applications/system/knetload/debian/menu
diff --git a/debian/_base/applications/kxmleditor/debian/patches/series b/debian/_base/applications/system/knetload/debian/patches/series
similarity index 100%
rename from debian/_base/applications/kxmleditor/debian/patches/series
rename to debian/_base/applications/system/knetload/debian/patches/series
diff --git a/debian/_base/applications/kooldock/debian/rules b/debian/_base/applications/system/knetload/debian/rules
similarity index 100%
rename from debian/_base/applications/kooldock/debian/rules
rename to debian/_base/applications/system/knetload/debian/rules
diff --git a/debian/_base/applications/ksystemlog/debian/source/format b/debian/_base/applications/system/knetload/debian/source/format
similarity index 100%
rename from debian/_base/applications/ksystemlog/debian/source/format
rename to debian/_base/applications/system/knetload/debian/source/format
diff --git a/debian/_base/applications/ksystemlog/debian/source/options b/debian/_base/applications/system/knetload/debian/source/options
similarity index 100%
rename from debian/_base/applications/ksystemlog/debian/source/options
rename to debian/_base/applications/system/knetload/debian/source/options
diff --git a/debian/_base/applications/kstreamripper/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/knetstats/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kstreamripper/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/system/knetstats/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kstreamripper/debian/cdbs/versions.pl b/debian/_base/applications/system/knetstats/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kstreamripper/debian/cdbs/versions.pl
rename to debian/_base/applications/system/knetstats/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/knetstats/debian/changelog b/debian/_base/applications/system/knetstats/debian/changelog
similarity index 100%
rename from debian/_base/applications/knetstats/debian/changelog
rename to debian/_base/applications/system/knetstats/debian/changelog
diff --git a/debian/_base/applications/ktechlab/debian/compat b/debian/_base/applications/system/knetstats/debian/compat
similarity index 100%
rename from debian/_base/applications/ktechlab/debian/compat
rename to debian/_base/applications/system/knetstats/debian/compat
diff --git a/debian/_base/applications/knetstats/debian/control b/debian/_base/applications/system/knetstats/debian/control
similarity index 100%
rename from debian/_base/applications/knetstats/debian/control
rename to debian/_base/applications/system/knetstats/debian/control
diff --git a/debian/_base/applications/knetstats/debian/copyright b/debian/_base/applications/system/knetstats/debian/copyright
similarity index 100%
rename from debian/_base/applications/knetstats/debian/copyright
rename to debian/_base/applications/system/knetstats/debian/copyright
diff --git a/debian/_base/applications/knutclient/debian/docs b/debian/_base/applications/system/knetstats/debian/docs
similarity index 100%
rename from debian/_base/applications/knutclient/debian/docs
rename to debian/_base/applications/system/knetstats/debian/docs
diff --git a/debian/_base/applications/krusader/debian/patches/series b/debian/_base/applications/system/knetstats/debian/patches/series
similarity index 100%
rename from debian/_base/applications/krusader/debian/patches/series
rename to debian/_base/applications/system/knetstats/debian/patches/series
diff --git a/debian/_base/applications/ksplash-engine-moodin/debian/rules b/debian/_base/applications/system/knetstats/debian/rules
similarity index 100%
rename from debian/_base/applications/ksplash-engine-moodin/debian/rules
rename to debian/_base/applications/system/knetstats/debian/rules
diff --git a/debian/_base/applications/ktechlab/debian/source/format b/debian/_base/applications/system/knetstats/debian/source/format
similarity index 100%
rename from debian/_base/applications/ktechlab/debian/source/format
rename to debian/_base/applications/system/knetstats/debian/source/format
diff --git a/debian/_base/applications/ktechlab/debian/source/options b/debian/_base/applications/system/knetstats/debian/source/options
similarity index 100%
rename from debian/_base/applications/ktechlab/debian/source/options
rename to debian/_base/applications/system/knetstats/debian/source/options
diff --git a/debian/_base/applications/ksystemlog/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/kooldock/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/ksystemlog/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/system/kooldock/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/ksystemlog/debian/cdbs/versions.pl b/debian/_base/applications/system/kooldock/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/ksystemlog/debian/cdbs/versions.pl
rename to debian/_base/applications/system/kooldock/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kooldock/debian/changelog b/debian/_base/applications/system/kooldock/debian/changelog
similarity index 100%
rename from debian/_base/applications/kooldock/debian/changelog
rename to debian/_base/applications/system/kooldock/debian/changelog
diff --git a/debian/_base/applications/ktorrent/debian/compat b/debian/_base/applications/system/kooldock/debian/compat
similarity index 100%
rename from debian/_base/applications/ktorrent/debian/compat
rename to debian/_base/applications/system/kooldock/debian/compat
diff --git a/debian/_base/applications/kooldock/debian/control b/debian/_base/applications/system/kooldock/debian/control
similarity index 100%
rename from debian/_base/applications/kooldock/debian/control
rename to debian/_base/applications/system/kooldock/debian/control
diff --git a/debian/_base/applications/kooldock/debian/copyright b/debian/_base/applications/system/kooldock/debian/copyright
similarity index 100%
rename from debian/_base/applications/kooldock/debian/copyright
rename to debian/_base/applications/system/kooldock/debian/copyright
diff --git a/debian/_base/applications/kooldock/debian/docs b/debian/_base/applications/system/kooldock/debian/docs
similarity index 100%
rename from debian/_base/applications/kooldock/debian/docs
rename to debian/_base/applications/system/kooldock/debian/docs
diff --git a/debian/_base/applications/kooldock/debian/menu b/debian/_base/applications/system/kooldock/debian/menu
similarity index 100%
rename from debian/_base/applications/kooldock/debian/menu
rename to debian/_base/applications/system/kooldock/debian/menu
diff --git a/debian/_base/applications/kshowmail/debian/rules b/debian/_base/applications/system/kooldock/debian/rules
similarity index 100%
rename from debian/_base/applications/kshowmail/debian/rules
rename to debian/_base/applications/system/kooldock/debian/rules
diff --git a/debian/_base/applications/ktorrent/debian/source/format b/debian/_base/applications/system/kooldock/debian/source/format
similarity index 100%
rename from debian/_base/applications/ktorrent/debian/source/format
rename to debian/_base/applications/system/kooldock/debian/source/format
diff --git a/debian/_base/applications/ktorrent/debian/source/options b/debian/_base/applications/system/kooldock/debian/source/options
similarity index 100%
rename from debian/_base/applications/ktorrent/debian/source/options
rename to debian/_base/applications/system/kooldock/debian/source/options
diff --git a/debian/_base/applications/ktechlab/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/kpowersave/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/ktechlab/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/system/kpowersave/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/ktechlab/debian/cdbs/versions.pl b/debian/_base/applications/system/kpowersave/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/ktechlab/debian/cdbs/versions.pl
rename to debian/_base/applications/system/kpowersave/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kpowersave/debian/changelog b/debian/_base/applications/system/kpowersave/debian/changelog
similarity index 100%
rename from debian/_base/applications/kpowersave/debian/changelog
rename to debian/_base/applications/system/kpowersave/debian/changelog
diff --git a/debian/_base/applications/kvirc/debian/compat b/debian/_base/applications/system/kpowersave/debian/compat
similarity index 100%
rename from debian/_base/applications/kvirc/debian/compat
rename to debian/_base/applications/system/kpowersave/debian/compat
diff --git a/debian/_base/applications/kpowersave/debian/control b/debian/_base/applications/system/kpowersave/debian/control
similarity index 100%
rename from debian/_base/applications/kpowersave/debian/control
rename to debian/_base/applications/system/kpowersave/debian/control
diff --git a/debian/_base/applications/kpowersave/debian/copyright b/debian/_base/applications/system/kpowersave/debian/copyright
similarity index 100%
rename from debian/_base/applications/kpowersave/debian/copyright
rename to debian/_base/applications/system/kpowersave/debian/copyright
diff --git a/debian/_base/applications/kpowersave/debian/install b/debian/_base/applications/system/kpowersave/debian/install
similarity index 100%
rename from debian/_base/applications/kpowersave/debian/install
rename to debian/_base/applications/system/kpowersave/debian/install
diff --git a/debian/_base/applications/kpowersave/debian/kpowersave-trinity.linda b/debian/_base/applications/system/kpowersave/debian/kpowersave-trinity.linda
similarity index 100%
rename from debian/_base/applications/kpowersave/debian/kpowersave-trinity.linda
rename to debian/_base/applications/system/kpowersave/debian/kpowersave-trinity.linda
diff --git a/debian/_base/applications/kpowersave/debian/kpowersave-trinity.lintian b/debian/_base/applications/system/kpowersave/debian/kpowersave-trinity.lintian
similarity index 100%
rename from debian/_base/applications/kpowersave/debian/kpowersave-trinity.lintian
rename to debian/_base/applications/system/kpowersave/debian/kpowersave-trinity.lintian
diff --git a/debian/_base/applications/kpowersave/debian/kpowersave.xpm b/debian/_base/applications/system/kpowersave/debian/kpowersave.xpm
similarity index 100%
rename from debian/_base/applications/kpowersave/debian/kpowersave.xpm
rename to debian/_base/applications/system/kpowersave/debian/kpowersave.xpm
diff --git a/debian/_base/applications/kpowersave/debian/menu b/debian/_base/applications/system/kpowersave/debian/menu
similarity index 100%
rename from debian/_base/applications/kpowersave/debian/menu
rename to debian/_base/applications/system/kpowersave/debian/menu
diff --git a/debian/_base/applications/ksensors/debian/patches/series b/debian/_base/applications/system/kpowersave/debian/patches/series
similarity index 100%
rename from debian/_base/applications/ksensors/debian/patches/series
rename to debian/_base/applications/system/kpowersave/debian/patches/series
diff --git a/debian/_base/applications/kpowersave/debian/postinst b/debian/_base/applications/system/kpowersave/debian/postinst
similarity index 100%
rename from debian/_base/applications/kpowersave/debian/postinst
rename to debian/_base/applications/system/kpowersave/debian/postinst
diff --git a/debian/_base/applications/kpowersave/debian/postrm b/debian/_base/applications/system/kpowersave/debian/postrm
similarity index 100%
rename from debian/_base/applications/kpowersave/debian/postrm
rename to debian/_base/applications/system/kpowersave/debian/postrm
diff --git a/debian/_base/applications/kpowersave/debian/preinst b/debian/_base/applications/system/kpowersave/debian/preinst
similarity index 100%
rename from debian/_base/applications/kpowersave/debian/preinst
rename to debian/_base/applications/system/kpowersave/debian/preinst
diff --git a/debian/_base/applications/kpowersave/debian/rules b/debian/_base/applications/system/kpowersave/debian/rules
similarity index 100%
rename from debian/_base/applications/kpowersave/debian/rules
rename to debian/_base/applications/system/kpowersave/debian/rules
diff --git a/debian/_base/applications/kvirc/debian/source/format b/debian/_base/applications/system/kpowersave/debian/source/format
similarity index 100%
rename from debian/_base/applications/kvirc/debian/source/format
rename to debian/_base/applications/system/kpowersave/debian/source/format
diff --git a/debian/_base/applications/kvirc/debian/source/options b/debian/_base/applications/system/kpowersave/debian/source/options
similarity index 100%
rename from debian/_base/applications/kvirc/debian/source/options
rename to debian/_base/applications/system/kpowersave/debian/source/options
diff --git a/debian/_base/applications/tde-guidance/debian/README.Debian b/debian/_base/applications/system/krusader/debian/README.Debian
similarity index 100%
rename from debian/_base/applications/tde-guidance/debian/README.Debian
rename to debian/_base/applications/system/krusader/debian/README.Debian
diff --git a/debian/_base/applications/ktorrent/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/krusader/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/ktorrent/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/system/krusader/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/ktorrent/debian/cdbs/versions.pl b/debian/_base/applications/system/krusader/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/ktorrent/debian/cdbs/versions.pl
rename to debian/_base/applications/system/krusader/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/krusader/debian/changelog b/debian/_base/applications/system/krusader/debian/changelog
similarity index 100%
rename from debian/_base/applications/krusader/debian/changelog
rename to debian/_base/applications/system/krusader/debian/changelog
diff --git a/debian/_base/applications/kvkbd/debian/compat b/debian/_base/applications/system/krusader/debian/compat
similarity index 100%
rename from debian/_base/applications/kvkbd/debian/compat
rename to debian/_base/applications/system/krusader/debian/compat
diff --git a/debian/_base/applications/krusader/debian/control b/debian/_base/applications/system/krusader/debian/control
similarity index 100%
rename from debian/_base/applications/krusader/debian/control
rename to debian/_base/applications/system/krusader/debian/control
diff --git a/debian/_base/applications/krusader/debian/copyright b/debian/_base/applications/system/krusader/debian/copyright
similarity index 100%
rename from debian/_base/applications/krusader/debian/copyright
rename to debian/_base/applications/system/krusader/debian/copyright
diff --git a/debian/_base/applications/krusader/debian/docs b/debian/_base/applications/system/krusader/debian/docs
similarity index 100%
rename from debian/_base/applications/krusader/debian/docs
rename to debian/_base/applications/system/krusader/debian/docs
diff --git a/debian/_base/applications/krusader/debian/krusader.lintian-overrides b/debian/_base/applications/system/krusader/debian/krusader.lintian-overrides
similarity index 100%
rename from debian/_base/applications/krusader/debian/krusader.lintian-overrides
rename to debian/_base/applications/system/krusader/debian/krusader.lintian-overrides
diff --git a/debian/_base/applications/krusader/debian/menu b/debian/_base/applications/system/krusader/debian/menu
similarity index 100%
rename from debian/_base/applications/krusader/debian/menu
rename to debian/_base/applications/system/krusader/debian/menu
diff --git a/debian/_base/applications/ksystemlog/debian/patches/series b/debian/_base/applications/system/krusader/debian/patches/series
similarity index 100%
rename from debian/_base/applications/ksystemlog/debian/patches/series
rename to debian/_base/applications/system/krusader/debian/patches/series
diff --git a/debian/_base/applications/krusader/debian/rules b/debian/_base/applications/system/krusader/debian/rules
similarity index 100%
rename from debian/_base/applications/krusader/debian/rules
rename to debian/_base/applications/system/krusader/debian/rules
diff --git a/debian/_base/applications/krusader/debian/source.lintian-overrides b/debian/_base/applications/system/krusader/debian/source.lintian-overrides
similarity index 100%
rename from debian/_base/applications/krusader/debian/source.lintian-overrides
rename to debian/_base/applications/system/krusader/debian/source.lintian-overrides
diff --git a/debian/_base/applications/kvkbd/debian/source/format b/debian/_base/applications/system/krusader/debian/source/format
similarity index 100%
rename from debian/_base/applications/kvkbd/debian/source/format
rename to debian/_base/applications/system/krusader/debian/source/format
diff --git a/debian/_base/applications/kvkbd/debian/source/options b/debian/_base/applications/system/krusader/debian/source/options
similarity index 100%
rename from debian/_base/applications/kvkbd/debian/source/options
rename to debian/_base/applications/system/krusader/debian/source/options
diff --git a/debian/_base/applications/krusader/debian/watch b/debian/_base/applications/system/krusader/debian/watch
similarity index 100%
rename from debian/_base/applications/krusader/debian/watch
rename to debian/_base/applications/system/krusader/debian/watch
diff --git a/debian/_base/applications/kvkbd/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/kshutdown/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kvkbd/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/system/kshutdown/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kvkbd/debian/cdbs/versions.pl b/debian/_base/applications/system/kshutdown/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kvkbd/debian/cdbs/versions.pl
rename to debian/_base/applications/system/kshutdown/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kshutdown/debian/changelog b/debian/_base/applications/system/kshutdown/debian/changelog
similarity index 100%
rename from debian/_base/applications/kshutdown/debian/changelog
rename to debian/_base/applications/system/kshutdown/debian/changelog
diff --git a/debian/_base/applications/kvpnc/debian/compat b/debian/_base/applications/system/kshutdown/debian/compat
similarity index 100%
rename from debian/_base/applications/kvpnc/debian/compat
rename to debian/_base/applications/system/kshutdown/debian/compat
diff --git a/debian/_base/applications/kshutdown/debian/control b/debian/_base/applications/system/kshutdown/debian/control
similarity index 100%
rename from debian/_base/applications/kshutdown/debian/control
rename to debian/_base/applications/system/kshutdown/debian/control
diff --git a/debian/_base/applications/kshutdown/debian/copyright b/debian/_base/applications/system/kshutdown/debian/copyright
similarity index 100%
rename from debian/_base/applications/kshutdown/debian/copyright
rename to debian/_base/applications/system/kshutdown/debian/copyright
diff --git a/debian/_base/applications/kshutdown/debian/dirs b/debian/_base/applications/system/kshutdown/debian/dirs
similarity index 100%
rename from debian/_base/applications/kshutdown/debian/dirs
rename to debian/_base/applications/system/kshutdown/debian/dirs
diff --git a/debian/_base/applications/kshutdown/debian/docs b/debian/_base/applications/system/kshutdown/debian/docs
similarity index 100%
rename from debian/_base/applications/kshutdown/debian/docs
rename to debian/_base/applications/system/kshutdown/debian/docs
diff --git a/debian/_base/applications/kstreamripper/debian/rules b/debian/_base/applications/system/kshutdown/debian/rules
similarity index 100%
rename from debian/_base/applications/kstreamripper/debian/rules
rename to debian/_base/applications/system/kshutdown/debian/rules
diff --git a/debian/_base/applications/kvpnc/debian/source/format b/debian/_base/applications/system/kshutdown/debian/source/format
similarity index 100%
rename from debian/_base/applications/kvpnc/debian/source/format
rename to debian/_base/applications/system/kshutdown/debian/source/format
diff --git a/debian/_base/applications/kvpnc/debian/source/options b/debian/_base/applications/system/kshutdown/debian/source/options
similarity index 100%
rename from debian/_base/applications/kvpnc/debian/source/options
rename to debian/_base/applications/system/kshutdown/debian/source/options
diff --git a/debian/_base/applications/kvpnc/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/ksystemlog/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kvpnc/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/system/ksystemlog/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kvpnc/debian/cdbs/versions.pl b/debian/_base/applications/system/ksystemlog/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kvpnc/debian/cdbs/versions.pl
rename to debian/_base/applications/system/ksystemlog/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/ksystemlog/debian/changelog b/debian/_base/applications/system/ksystemlog/debian/changelog
similarity index 100%
rename from debian/_base/applications/ksystemlog/debian/changelog
rename to debian/_base/applications/system/ksystemlog/debian/changelog
diff --git a/debian/_base/applications/kxmleditor/debian/compat b/debian/_base/applications/system/ksystemlog/debian/compat
similarity index 100%
rename from debian/_base/applications/kxmleditor/debian/compat
rename to debian/_base/applications/system/ksystemlog/debian/compat
diff --git a/debian/_base/applications/ksystemlog/debian/control b/debian/_base/applications/system/ksystemlog/debian/control
similarity index 100%
rename from debian/_base/applications/ksystemlog/debian/control
rename to debian/_base/applications/system/ksystemlog/debian/control
diff --git a/debian/_base/applications/ksystemlog/debian/copyright b/debian/_base/applications/system/ksystemlog/debian/copyright
similarity index 100%
rename from debian/_base/applications/ksystemlog/debian/copyright
rename to debian/_base/applications/system/ksystemlog/debian/copyright
diff --git a/debian/_base/applications/ksystemlog/debian/docs b/debian/_base/applications/system/ksystemlog/debian/docs
similarity index 100%
rename from debian/_base/applications/ksystemlog/debian/docs
rename to debian/_base/applications/system/ksystemlog/debian/docs
diff --git a/debian/_base/applications/ksystemlog/debian/menu b/debian/_base/applications/system/ksystemlog/debian/menu
similarity index 100%
rename from debian/_base/applications/ksystemlog/debian/menu
rename to debian/_base/applications/system/ksystemlog/debian/menu
diff --git a/debian/_base/applications/ktorrent/debian/patches/series b/debian/_base/applications/system/ksystemlog/debian/patches/series
similarity index 100%
rename from debian/_base/applications/ktorrent/debian/patches/series
rename to debian/_base/applications/system/ksystemlog/debian/patches/series
diff --git a/debian/_base/applications/ksystemlog/debian/rules b/debian/_base/applications/system/ksystemlog/debian/rules
similarity index 100%
rename from debian/_base/applications/ksystemlog/debian/rules
rename to debian/_base/applications/system/ksystemlog/debian/rules
diff --git a/debian/_base/applications/kxmleditor/debian/source/format b/debian/_base/applications/system/ksystemlog/debian/source/format
similarity index 100%
rename from debian/_base/applications/kxmleditor/debian/source/format
rename to debian/_base/applications/system/ksystemlog/debian/source/format
diff --git a/debian/_base/applications/kxmleditor/debian/source/options b/debian/_base/applications/system/ksystemlog/debian/source/options
similarity index 100%
rename from debian/_base/applications/kxmleditor/debian/source/options
rename to debian/_base/applications/system/ksystemlog/debian/source/options
diff --git a/debian/_base/applications/kxmleditor/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/kvkbd/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/kxmleditor/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/system/kvkbd/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kxmleditor/debian/cdbs/versions.pl b/debian/_base/applications/system/kvkbd/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/kxmleditor/debian/cdbs/versions.pl
rename to debian/_base/applications/system/kvkbd/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kvkbd/debian/changelog b/debian/_base/applications/system/kvkbd/debian/changelog
similarity index 100%
rename from debian/_base/applications/kvkbd/debian/changelog
rename to debian/_base/applications/system/kvkbd/debian/changelog
diff --git a/debian/_base/applications/mathemagics/debian/compat b/debian/_base/applications/system/kvkbd/debian/compat
similarity index 100%
rename from debian/_base/applications/mathemagics/debian/compat
rename to debian/_base/applications/system/kvkbd/debian/compat
diff --git a/debian/_base/applications/kvkbd/debian/control b/debian/_base/applications/system/kvkbd/debian/control
similarity index 100%
rename from debian/_base/applications/kvkbd/debian/control
rename to debian/_base/applications/system/kvkbd/debian/control
diff --git a/debian/_base/applications/kvkbd/debian/copyright b/debian/_base/applications/system/kvkbd/debian/copyright
similarity index 100%
rename from debian/_base/applications/kvkbd/debian/copyright
rename to debian/_base/applications/system/kvkbd/debian/copyright
diff --git a/debian/_base/applications/kvkbd/debian/docs b/debian/_base/applications/system/kvkbd/debian/docs
similarity index 100%
rename from debian/_base/applications/kvkbd/debian/docs
rename to debian/_base/applications/system/kvkbd/debian/docs
diff --git a/debian/_base/applications/kvirc/debian/patches/series b/debian/_base/applications/system/kvkbd/debian/patches/series
similarity index 100%
rename from debian/_base/applications/kvirc/debian/patches/series
rename to debian/_base/applications/system/kvkbd/debian/patches/series
diff --git a/debian/_base/applications/kvkbd/debian/rules b/debian/_base/applications/system/kvkbd/debian/rules
similarity index 100%
rename from debian/_base/applications/kvkbd/debian/rules
rename to debian/_base/applications/system/kvkbd/debian/rules
diff --git a/debian/_base/applications/mathemagics/debian/source/format b/debian/_base/applications/system/kvkbd/debian/source/format
similarity index 100%
rename from debian/_base/applications/mathemagics/debian/source/format
rename to debian/_base/applications/system/kvkbd/debian/source/format
diff --git a/debian/_base/applications/mathemagics/debian/source/options b/debian/_base/applications/system/kvkbd/debian/source/options
similarity index 100%
rename from debian/_base/applications/mathemagics/debian/source/options
rename to debian/_base/applications/system/kvkbd/debian/source/options
diff --git a/debian/_base/applications/smartcardauth/debian/changelog b/debian/_base/applications/system/smartcardauth/debian/changelog
similarity index 100%
rename from debian/_base/applications/smartcardauth/debian/changelog
rename to debian/_base/applications/system/smartcardauth/debian/changelog
diff --git a/debian/_base/applications/mplayerthumbs/debian/compat b/debian/_base/applications/system/smartcardauth/debian/compat
similarity index 100%
rename from debian/_base/applications/mplayerthumbs/debian/compat
rename to debian/_base/applications/system/smartcardauth/debian/compat
diff --git a/debian/_base/applications/smartcardauth/debian/control b/debian/_base/applications/system/smartcardauth/debian/control
similarity index 100%
rename from debian/_base/applications/smartcardauth/debian/control
rename to debian/_base/applications/system/smartcardauth/debian/control
diff --git a/debian/_base/applications/smartcardauth/debian/dirs b/debian/_base/applications/system/smartcardauth/debian/dirs
similarity index 100%
rename from debian/_base/applications/smartcardauth/debian/dirs
rename to debian/_base/applications/system/smartcardauth/debian/dirs
diff --git a/debian/_base/applications/smartcardauth/debian/rules b/debian/_base/applications/system/smartcardauth/debian/rules
similarity index 100%
rename from debian/_base/applications/smartcardauth/debian/rules
rename to debian/_base/applications/system/smartcardauth/debian/rules
diff --git a/debian/_base/applications/mplayerthumbs/debian/source/format b/debian/_base/applications/system/smartcardauth/debian/source/format
similarity index 100%
rename from debian/_base/applications/mplayerthumbs/debian/source/format
rename to debian/_base/applications/system/smartcardauth/debian/source/format
diff --git a/debian/_base/applications/mplayerthumbs/debian/source/options b/debian/_base/applications/system/smartcardauth/debian/source/options
similarity index 100%
rename from debian/_base/applications/mplayerthumbs/debian/source/options
rename to debian/_base/applications/system/smartcardauth/debian/source/options
diff --git a/debian/_base/applications/smartcardauth/debian/triggers b/debian/_base/applications/system/smartcardauth/debian/triggers
similarity index 100%
rename from debian/_base/applications/smartcardauth/debian/triggers
rename to debian/_base/applications/system/smartcardauth/debian/triggers
diff --git a/debian/_base/applications/mathemagics/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/tastymenu/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/mathemagics/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/system/tastymenu/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/mathemagics/debian/cdbs/versions.pl b/debian/_base/applications/system/tastymenu/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/mathemagics/debian/cdbs/versions.pl
rename to debian/_base/applications/system/tastymenu/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/tastymenu/debian/changelog b/debian/_base/applications/system/tastymenu/debian/changelog
similarity index 100%
rename from debian/_base/applications/tastymenu/debian/changelog
rename to debian/_base/applications/system/tastymenu/debian/changelog
diff --git a/debian/_base/applications/piklab/debian/compat b/debian/_base/applications/system/tastymenu/debian/compat
similarity index 100%
rename from debian/_base/applications/piklab/debian/compat
rename to debian/_base/applications/system/tastymenu/debian/compat
diff --git a/debian/_base/applications/tastymenu/debian/control b/debian/_base/applications/system/tastymenu/debian/control
similarity index 100%
rename from debian/_base/applications/tastymenu/debian/control
rename to debian/_base/applications/system/tastymenu/debian/control
diff --git a/debian/_base/applications/tastymenu/debian/copyright b/debian/_base/applications/system/tastymenu/debian/copyright
similarity index 100%
rename from debian/_base/applications/tastymenu/debian/copyright
rename to debian/_base/applications/system/tastymenu/debian/copyright
diff --git a/debian/_base/applications/qalculate-tde/debian/patches/series b/debian/_base/applications/system/tastymenu/debian/patches/series
similarity index 100%
rename from debian/_base/applications/qalculate-tde/debian/patches/series
rename to debian/_base/applications/system/tastymenu/debian/patches/series
diff --git a/debian/_base/applications/kxmleditor/debian/rules b/debian/_base/applications/system/tastymenu/debian/rules
similarity index 100%
rename from debian/_base/applications/kxmleditor/debian/rules
rename to debian/_base/applications/system/tastymenu/debian/rules
diff --git a/debian/_base/applications/piklab/debian/source/format b/debian/_base/applications/system/tastymenu/debian/source/format
similarity index 100%
rename from debian/_base/applications/piklab/debian/source/format
rename to debian/_base/applications/system/tastymenu/debian/source/format
diff --git a/debian/_base/applications/piklab/debian/source/options b/debian/_base/applications/system/tastymenu/debian/source/options
similarity index 100%
rename from debian/_base/applications/piklab/debian/source/options
rename to debian/_base/applications/system/tastymenu/debian/source/options
diff --git a/debian/_base/applications/mplayerthumbs/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/tdedocker/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/mplayerthumbs/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/system/tdedocker/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/tdedocker/debian/cdbs/versions.pl b/debian/_base/applications/system/tdedocker/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/tdedocker/debian/cdbs/versions.pl
rename to debian/_base/applications/system/tdedocker/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/tdedocker/debian/changelog b/debian/_base/applications/system/tdedocker/debian/changelog
similarity index 100%
rename from debian/_base/applications/tdedocker/debian/changelog
rename to debian/_base/applications/system/tdedocker/debian/changelog
diff --git a/debian/_base/applications/potracegui/debian/compat b/debian/_base/applications/system/tdedocker/debian/compat
similarity index 100%
rename from debian/_base/applications/potracegui/debian/compat
rename to debian/_base/applications/system/tdedocker/debian/compat
diff --git a/debian/_base/applications/tdedocker/debian/control b/debian/_base/applications/system/tdedocker/debian/control
similarity index 100%
rename from debian/_base/applications/tdedocker/debian/control
rename to debian/_base/applications/system/tdedocker/debian/control
diff --git a/debian/_base/applications/tdedocker/debian/copyright b/debian/_base/applications/system/tdedocker/debian/copyright
similarity index 100%
rename from debian/_base/applications/tdedocker/debian/copyright
rename to debian/_base/applications/system/tdedocker/debian/copyright
diff --git a/debian/_base/applications/tdedocker/debian/docs b/debian/_base/applications/system/tdedocker/debian/docs
similarity index 100%
rename from debian/_base/applications/tdedocker/debian/docs
rename to debian/_base/applications/system/tdedocker/debian/docs
diff --git a/debian/_base/applications/kvpnc/debian/rules b/debian/_base/applications/system/tdedocker/debian/rules
similarity index 100%
rename from debian/_base/applications/kvpnc/debian/rules
rename to debian/_base/applications/system/tdedocker/debian/rules
diff --git a/debian/_base/applications/potracegui/debian/source/format b/debian/_base/applications/system/tdedocker/debian/source/format
similarity index 100%
rename from debian/_base/applications/potracegui/debian/source/format
rename to debian/_base/applications/system/tdedocker/debian/source/format
diff --git a/debian/_base/applications/potracegui/debian/source/options b/debian/_base/applications/system/tdedocker/debian/source/options
similarity index 100%
rename from debian/_base/applications/potracegui/debian/source/options
rename to debian/_base/applications/system/tdedocker/debian/source/options
diff --git a/debian/_base/applications/tdedocker/debian/tdedocker-trinity.menu b/debian/_base/applications/system/tdedocker/debian/tdedocker-trinity.menu
similarity index 100%
rename from debian/_base/applications/tdedocker/debian/tdedocker-trinity.menu
rename to debian/_base/applications/system/tdedocker/debian/tdedocker-trinity.menu
diff --git a/debian/_base/applications/tdepowersave/debian/acpi-support/policy-funcs b/debian/_base/applications/system/tdepowersave/debian/acpi-support/policy-funcs
similarity index 100%
rename from debian/_base/applications/tdepowersave/debian/acpi-support/policy-funcs
rename to debian/_base/applications/system/tdepowersave/debian/acpi-support/policy-funcs
diff --git a/debian/_base/applications/piklab/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/tdepowersave/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/piklab/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/system/tdepowersave/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/mplayerthumbs/debian/cdbs/versions.pl b/debian/_base/applications/system/tdepowersave/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/mplayerthumbs/debian/cdbs/versions.pl
rename to debian/_base/applications/system/tdepowersave/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/tdepowersave/debian/changelog b/debian/_base/applications/system/tdepowersave/debian/changelog
similarity index 100%
rename from debian/_base/applications/tdepowersave/debian/changelog
rename to debian/_base/applications/system/tdepowersave/debian/changelog
diff --git a/debian/_base/applications/qalculate-tde/debian/compat b/debian/_base/applications/system/tdepowersave/debian/compat
similarity index 100%
rename from debian/_base/applications/qalculate-tde/debian/compat
rename to debian/_base/applications/system/tdepowersave/debian/compat
diff --git a/debian/_base/applications/tdepowersave/debian/control b/debian/_base/applications/system/tdepowersave/debian/control
similarity index 100%
rename from debian/_base/applications/tdepowersave/debian/control
rename to debian/_base/applications/system/tdepowersave/debian/control
diff --git a/debian/_base/applications/tdepowersave/debian/copyright b/debian/_base/applications/system/tdepowersave/debian/copyright
similarity index 100%
rename from debian/_base/applications/tdepowersave/debian/copyright
rename to debian/_base/applications/system/tdepowersave/debian/copyright
diff --git a/debian/_base/applications/tdepowersave/debian/install b/debian/_base/applications/system/tdepowersave/debian/install
similarity index 100%
rename from debian/_base/applications/tdepowersave/debian/install
rename to debian/_base/applications/system/tdepowersave/debian/install
diff --git a/debian/_base/applications/tdepowersave/debian/menu b/debian/_base/applications/system/tdepowersave/debian/menu
similarity index 100%
rename from debian/_base/applications/tdepowersave/debian/menu
rename to debian/_base/applications/system/tdepowersave/debian/menu
diff --git a/debian/_base/applications/kvkbd/debian/patches/series b/debian/_base/applications/system/tdepowersave/debian/patches/series
similarity index 100%
rename from debian/_base/applications/kvkbd/debian/patches/series
rename to debian/_base/applications/system/tdepowersave/debian/patches/series
diff --git a/debian/_base/applications/tdepowersave/debian/postrm b/debian/_base/applications/system/tdepowersave/debian/postrm
similarity index 100%
rename from debian/_base/applications/tdepowersave/debian/postrm
rename to debian/_base/applications/system/tdepowersave/debian/postrm
diff --git a/debian/_base/applications/tdepowersave/debian/preinst b/debian/_base/applications/system/tdepowersave/debian/preinst
similarity index 100%
rename from debian/_base/applications/tdepowersave/debian/preinst
rename to debian/_base/applications/system/tdepowersave/debian/preinst
diff --git a/debian/_base/applications/tdepowersave/debian/rules b/debian/_base/applications/system/tdepowersave/debian/rules
similarity index 100%
rename from debian/_base/applications/tdepowersave/debian/rules
rename to debian/_base/applications/system/tdepowersave/debian/rules
diff --git a/debian/_base/applications/qalculate-tde/debian/source/format b/debian/_base/applications/system/tdepowersave/debian/source/format
similarity index 100%
rename from debian/_base/applications/qalculate-tde/debian/source/format
rename to debian/_base/applications/system/tdepowersave/debian/source/format
diff --git a/debian/_base/applications/qalculate-tde/debian/source/options b/debian/_base/applications/system/tdepowersave/debian/source/options
similarity index 100%
rename from debian/_base/applications/qalculate-tde/debian/source/options
rename to debian/_base/applications/system/tdepowersave/debian/source/options
diff --git a/debian/_base/applications/tdepowersave/debian/tdepowersave-trinity.linda b/debian/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.linda
similarity index 100%
rename from debian/_base/applications/tdepowersave/debian/tdepowersave-trinity.linda
rename to debian/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.linda
diff --git a/debian/_base/applications/tdepowersave/debian/tdepowersave-trinity.lintian b/debian/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.lintian
similarity index 100%
rename from debian/_base/applications/tdepowersave/debian/tdepowersave-trinity.lintian
rename to debian/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.lintian
diff --git a/debian/_base/applications/tdepowersave/debian/tdepowersave-trinity.postinst b/debian/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.postinst
similarity index 100%
rename from debian/_base/applications/tdepowersave/debian/tdepowersave-trinity.postinst
rename to debian/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.postinst
diff --git a/debian/_base/applications/tdepowersave/debian/tdepowersave.xpm b/debian/_base/applications/system/tdepowersave/debian/tdepowersave.xpm
similarity index 100%
rename from debian/_base/applications/tdepowersave/debian/tdepowersave.xpm
rename to debian/_base/applications/system/tdepowersave/debian/tdepowersave.xpm
diff --git a/debian/_base/applications/yakuake/debian/README b/debian/_base/applications/system/yakuake/debian/README
similarity index 100%
rename from debian/_base/applications/yakuake/debian/README
rename to debian/_base/applications/system/yakuake/debian/README
diff --git a/debian/_base/applications/potracegui/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/yakuake/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/potracegui/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/system/yakuake/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/piklab/debian/cdbs/versions.pl b/debian/_base/applications/system/yakuake/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/piklab/debian/cdbs/versions.pl
rename to debian/_base/applications/system/yakuake/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/yakuake/debian/changelog b/debian/_base/applications/system/yakuake/debian/changelog
similarity index 100%
rename from debian/_base/applications/yakuake/debian/changelog
rename to debian/_base/applications/system/yakuake/debian/changelog
diff --git a/debian/_base/applications/qt4-tqt-theme-engine/debian/compat b/debian/_base/applications/system/yakuake/debian/compat
similarity index 100%
rename from debian/_base/applications/qt4-tqt-theme-engine/debian/compat
rename to debian/_base/applications/system/yakuake/debian/compat
diff --git a/debian/_base/applications/yakuake/debian/control b/debian/_base/applications/system/yakuake/debian/control
similarity index 100%
rename from debian/_base/applications/yakuake/debian/control
rename to debian/_base/applications/system/yakuake/debian/control
diff --git a/debian/_base/applications/yakuake/debian/copyright b/debian/_base/applications/system/yakuake/debian/copyright
similarity index 100%
rename from debian/_base/applications/yakuake/debian/copyright
rename to debian/_base/applications/system/yakuake/debian/copyright
diff --git a/debian/_base/applications/kxmleditor/debian/docs b/debian/_base/applications/system/yakuake/debian/docs
similarity index 100%
rename from debian/_base/applications/kxmleditor/debian/docs
rename to debian/_base/applications/system/yakuake/debian/docs
diff --git a/debian/_base/applications/yakuake/debian/icons/yakuake-16.xpm b/debian/_base/applications/system/yakuake/debian/icons/yakuake-16.xpm
similarity index 100%
rename from debian/_base/applications/yakuake/debian/icons/yakuake-16.xpm
rename to debian/_base/applications/system/yakuake/debian/icons/yakuake-16.xpm
diff --git a/debian/_base/applications/yakuake/debian/icons/yakuake.xpm b/debian/_base/applications/system/yakuake/debian/icons/yakuake.xpm
similarity index 100%
rename from debian/_base/applications/yakuake/debian/icons/yakuake.xpm
rename to debian/_base/applications/system/yakuake/debian/icons/yakuake.xpm
diff --git a/debian/_base/applications/kstreamripper/debian/patches/.gitignore b/debian/_base/applications/system/yakuake/debian/patches/.gitignore
similarity index 100%
rename from debian/_base/applications/kstreamripper/debian/patches/.gitignore
rename to debian/_base/applications/system/yakuake/debian/patches/.gitignore
diff --git a/debian/_base/applications/mathemagics/debian/rules b/debian/_base/applications/system/yakuake/debian/rules
similarity index 100%
rename from debian/_base/applications/mathemagics/debian/rules
rename to debian/_base/applications/system/yakuake/debian/rules
diff --git a/debian/_base/applications/qt4-tqt-theme-engine/debian/source/format b/debian/_base/applications/system/yakuake/debian/source/format
similarity index 100%
rename from debian/_base/applications/qt4-tqt-theme-engine/debian/source/format
rename to debian/_base/applications/system/yakuake/debian/source/format
diff --git a/debian/_base/applications/qt4-tqt-theme-engine/debian/source/options b/debian/_base/applications/system/yakuake/debian/source/options
similarity index 100%
rename from debian/_base/applications/qt4-tqt-theme-engine/debian/source/options
rename to debian/_base/applications/system/yakuake/debian/source/options
diff --git a/debian/_base/applications/yakuake/debian/yakuake-trinity.install b/debian/_base/applications/system/yakuake/debian/yakuake-trinity.install
similarity index 100%
rename from debian/_base/applications/yakuake/debian/yakuake-trinity.install
rename to debian/_base/applications/system/yakuake/debian/yakuake-trinity.install
diff --git a/debian/_base/applications/yakuake/debian/yakuake-trinity.menu b/debian/_base/applications/system/yakuake/debian/yakuake-trinity.menu
similarity index 100%
rename from debian/_base/applications/yakuake/debian/yakuake-trinity.menu
rename to debian/_base/applications/system/yakuake/debian/yakuake-trinity.menu
diff --git a/debian/_base/applications/qalculate-tde/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio/tdeio-apt/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/qalculate-tde/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/tdeio/tdeio-apt/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/potracegui/debian/cdbs/versions.pl b/debian/_base/applications/tdeio/tdeio-apt/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/potracegui/debian/cdbs/versions.pl
rename to debian/_base/applications/tdeio/tdeio-apt/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/tdeio-apt/debian/changelog b/debian/_base/applications/tdeio/tdeio-apt/debian/changelog
similarity index 100%
rename from debian/_base/applications/tdeio-apt/debian/changelog
rename to debian/_base/applications/tdeio/tdeio-apt/debian/changelog
diff --git a/debian/_base/applications/rosegarden/debian/compat b/debian/_base/applications/tdeio/tdeio-apt/debian/compat
similarity index 100%
rename from debian/_base/applications/rosegarden/debian/compat
rename to debian/_base/applications/tdeio/tdeio-apt/debian/compat
diff --git a/debian/_base/applications/tdeio-apt/debian/control b/debian/_base/applications/tdeio/tdeio-apt/debian/control
similarity index 100%
rename from debian/_base/applications/tdeio-apt/debian/control
rename to debian/_base/applications/tdeio/tdeio-apt/debian/control
diff --git a/debian/_base/applications/tdeio-apt/debian/copyright b/debian/_base/applications/tdeio/tdeio-apt/debian/copyright
similarity index 100%
rename from debian/_base/applications/tdeio-apt/debian/copyright
rename to debian/_base/applications/tdeio/tdeio-apt/debian/copyright
diff --git a/debian/_base/applications/mathemagics/debian/docs b/debian/_base/applications/tdeio/tdeio-apt/debian/docs
similarity index 100%
rename from debian/_base/applications/mathemagics/debian/docs
rename to debian/_base/applications/tdeio/tdeio-apt/debian/docs
diff --git a/debian/_base/applications/mathemagics/debian/patches/series b/debian/_base/applications/tdeio/tdeio-apt/debian/patches/series
similarity index 100%
rename from debian/_base/applications/mathemagics/debian/patches/series
rename to debian/_base/applications/tdeio/tdeio-apt/debian/patches/series
diff --git a/debian/_base/applications/potracegui/debian/rules b/debian/_base/applications/tdeio/tdeio-apt/debian/rules
similarity index 100%
rename from debian/_base/applications/potracegui/debian/rules
rename to debian/_base/applications/tdeio/tdeio-apt/debian/rules
diff --git a/debian/_base/applications/rosegarden/debian/source/format b/debian/_base/applications/tdeio/tdeio-apt/debian/source/format
similarity index 100%
rename from debian/_base/applications/rosegarden/debian/source/format
rename to debian/_base/applications/tdeio/tdeio-apt/debian/source/format
diff --git a/debian/_base/applications/rosegarden/debian/source/options b/debian/_base/applications/tdeio/tdeio-apt/debian/source/options
similarity index 100%
rename from debian/_base/applications/rosegarden/debian/source/options
rename to debian/_base/applications/tdeio/tdeio-apt/debian/source/options
diff --git a/debian/_base/applications/rosegarden/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio/tdeio-ftps/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/rosegarden/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/tdeio/tdeio-ftps/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/qalculate-tde/debian/cdbs/versions.pl b/debian/_base/applications/tdeio/tdeio-ftps/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/qalculate-tde/debian/cdbs/versions.pl
rename to debian/_base/applications/tdeio/tdeio-ftps/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/tdeio-ftps/debian/changelog b/debian/_base/applications/tdeio/tdeio-ftps/debian/changelog
similarity index 100%
rename from debian/_base/applications/tdeio-ftps/debian/changelog
rename to debian/_base/applications/tdeio/tdeio-ftps/debian/changelog
diff --git a/debian/_base/applications/smartcardauth/debian/compat b/debian/_base/applications/tdeio/tdeio-ftps/debian/compat
similarity index 100%
rename from debian/_base/applications/smartcardauth/debian/compat
rename to debian/_base/applications/tdeio/tdeio-ftps/debian/compat
diff --git a/debian/_base/applications/tdeio-ftps/debian/control b/debian/_base/applications/tdeio/tdeio-ftps/debian/control
similarity index 100%
rename from debian/_base/applications/tdeio-ftps/debian/control
rename to debian/_base/applications/tdeio/tdeio-ftps/debian/control
diff --git a/debian/_base/applications/tdeio-ftps/debian/copyright b/debian/_base/applications/tdeio/tdeio-ftps/debian/copyright
similarity index 100%
rename from debian/_base/applications/tdeio-ftps/debian/copyright
rename to debian/_base/applications/tdeio/tdeio-ftps/debian/copyright
diff --git a/debian/_base/applications/tdeio-ftps/debian/docs b/debian/_base/applications/tdeio/tdeio-ftps/debian/docs
similarity index 100%
rename from debian/_base/applications/tdeio-ftps/debian/docs
rename to debian/_base/applications/tdeio/tdeio-ftps/debian/docs
diff --git a/debian/_base/applications/tde-style-baghira/debian/rules b/debian/_base/applications/tdeio/tdeio-ftps/debian/rules
similarity index 100%
rename from debian/_base/applications/tde-style-baghira/debian/rules
rename to debian/_base/applications/tdeio/tdeio-ftps/debian/rules
diff --git a/debian/_base/applications/smartcardauth/debian/source/format b/debian/_base/applications/tdeio/tdeio-ftps/debian/source/format
similarity index 100%
rename from debian/_base/applications/smartcardauth/debian/source/format
rename to debian/_base/applications/tdeio/tdeio-ftps/debian/source/format
diff --git a/debian/_base/applications/smartcardauth/debian/source/options b/debian/_base/applications/tdeio/tdeio-ftps/debian/source/options
similarity index 100%
rename from debian/_base/applications/smartcardauth/debian/source/options
rename to debian/_base/applications/tdeio/tdeio-ftps/debian/source/options
diff --git a/debian/_base/applications/smb4k/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio/tdeio-gopher/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/smb4k/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/tdeio/tdeio-gopher/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/rosegarden/debian/cdbs/versions.pl b/debian/_base/applications/tdeio/tdeio-gopher/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/rosegarden/debian/cdbs/versions.pl
rename to debian/_base/applications/tdeio/tdeio-gopher/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/tdeio-gopher/debian/changelog b/debian/_base/applications/tdeio/tdeio-gopher/debian/changelog
similarity index 100%
rename from debian/_base/applications/tdeio-gopher/debian/changelog
rename to debian/_base/applications/tdeio/tdeio-gopher/debian/changelog
diff --git a/debian/_base/applications/smb4k/debian/compat b/debian/_base/applications/tdeio/tdeio-gopher/debian/compat
similarity index 100%
rename from debian/_base/applications/smb4k/debian/compat
rename to debian/_base/applications/tdeio/tdeio-gopher/debian/compat
diff --git a/debian/_base/applications/tdeio-gopher/debian/control b/debian/_base/applications/tdeio/tdeio-gopher/debian/control
similarity index 100%
rename from debian/_base/applications/tdeio-gopher/debian/control
rename to debian/_base/applications/tdeio/tdeio-gopher/debian/control
diff --git a/debian/_base/applications/tdeio-gopher/debian/copyright b/debian/_base/applications/tdeio/tdeio-gopher/debian/copyright
similarity index 100%
rename from debian/_base/applications/tdeio-gopher/debian/copyright
rename to debian/_base/applications/tdeio/tdeio-gopher/debian/copyright
diff --git a/debian/_base/applications/piklab/debian/patches/series b/debian/_base/applications/tdeio/tdeio-gopher/debian/patches/series
similarity index 100%
rename from debian/_base/applications/piklab/debian/patches/series
rename to debian/_base/applications/tdeio/tdeio-gopher/debian/patches/series
diff --git a/debian/_base/applications/tdeio-gopher/debian/rules b/debian/_base/applications/tdeio/tdeio-gopher/debian/rules
similarity index 100%
rename from debian/_base/applications/tdeio-gopher/debian/rules
rename to debian/_base/applications/tdeio/tdeio-gopher/debian/rules
diff --git a/debian/_base/applications/smb4k/debian/source/format b/debian/_base/applications/tdeio/tdeio-gopher/debian/source/format
similarity index 100%
rename from debian/_base/applications/smb4k/debian/source/format
rename to debian/_base/applications/tdeio/tdeio-gopher/debian/source/format
diff --git a/debian/_base/applications/smb4k/debian/source/options b/debian/_base/applications/tdeio/tdeio-gopher/debian/source/options
similarity index 100%
rename from debian/_base/applications/smb4k/debian/source/options
rename to debian/_base/applications/tdeio/tdeio-gopher/debian/source/options
diff --git a/debian/_base/applications/soundkonverter/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio/tdeio-locate/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/soundkonverter/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/tdeio/tdeio-locate/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/smb4k/debian/cdbs/versions.pl b/debian/_base/applications/tdeio/tdeio-locate/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/smb4k/debian/cdbs/versions.pl
rename to debian/_base/applications/tdeio/tdeio-locate/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/tdeio-locate/debian/changelog b/debian/_base/applications/tdeio/tdeio-locate/debian/changelog
similarity index 100%
rename from debian/_base/applications/tdeio-locate/debian/changelog
rename to debian/_base/applications/tdeio/tdeio-locate/debian/changelog
diff --git a/debian/_base/applications/soundkonverter/debian/compat b/debian/_base/applications/tdeio/tdeio-locate/debian/compat
similarity index 100%
rename from debian/_base/applications/soundkonverter/debian/compat
rename to debian/_base/applications/tdeio/tdeio-locate/debian/compat
diff --git a/debian/_base/applications/tdeio-locate/debian/control b/debian/_base/applications/tdeio/tdeio-locate/debian/control
similarity index 100%
rename from debian/_base/applications/tdeio-locate/debian/control
rename to debian/_base/applications/tdeio/tdeio-locate/debian/control
diff --git a/debian/_base/applications/tdeio-locate/debian/copyright b/debian/_base/applications/tdeio/tdeio-locate/debian/copyright
similarity index 100%
rename from debian/_base/applications/tdeio-locate/debian/copyright
rename to debian/_base/applications/tdeio/tdeio-locate/debian/copyright
diff --git a/debian/_base/applications/qt4-tqt-theme-engine/debian/patches/series b/debian/_base/applications/tdeio/tdeio-locate/debian/patches/series
similarity index 100%
rename from debian/_base/applications/qt4-tqt-theme-engine/debian/patches/series
rename to debian/_base/applications/tdeio/tdeio-locate/debian/patches/series
diff --git a/debian/_base/applications/tdeio-locate/debian/rules b/debian/_base/applications/tdeio/tdeio-locate/debian/rules
similarity index 100%
rename from debian/_base/applications/tdeio-locate/debian/rules
rename to debian/_base/applications/tdeio/tdeio-locate/debian/rules
diff --git a/debian/_base/applications/soundkonverter/debian/source/format b/debian/_base/applications/tdeio/tdeio-locate/debian/source/format
similarity index 100%
rename from debian/_base/applications/soundkonverter/debian/source/format
rename to debian/_base/applications/tdeio/tdeio-locate/debian/source/format
diff --git a/debian/_base/applications/soundkonverter/debian/source/options b/debian/_base/applications/tdeio/tdeio-locate/debian/source/options
similarity index 100%
rename from debian/_base/applications/soundkonverter/debian/source/options
rename to debian/_base/applications/tdeio/tdeio-locate/debian/source/options
diff --git a/debian/_base/applications/tastymenu/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio/tdeio-sword/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/tastymenu/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/tdeio/tdeio-sword/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/soundkonverter/debian/cdbs/versions.pl b/debian/_base/applications/tdeio/tdeio-sword/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/soundkonverter/debian/cdbs/versions.pl
rename to debian/_base/applications/tdeio/tdeio-sword/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/tdeio-sword/debian/changelog b/debian/_base/applications/tdeio/tdeio-sword/debian/changelog
similarity index 100%
rename from debian/_base/applications/tdeio-sword/debian/changelog
rename to debian/_base/applications/tdeio/tdeio-sword/debian/changelog
diff --git a/debian/_base/applications/tastymenu/debian/compat b/debian/_base/applications/tdeio/tdeio-sword/debian/compat
similarity index 100%
rename from debian/_base/applications/tastymenu/debian/compat
rename to debian/_base/applications/tdeio/tdeio-sword/debian/compat
diff --git a/debian/_base/applications/tdeio-sword/debian/control b/debian/_base/applications/tdeio/tdeio-sword/debian/control
similarity index 100%
rename from debian/_base/applications/tdeio-sword/debian/control
rename to debian/_base/applications/tdeio/tdeio-sword/debian/control
diff --git a/debian/_base/applications/tdeio-sword/debian/copyright b/debian/_base/applications/tdeio/tdeio-sword/debian/copyright
similarity index 100%
rename from debian/_base/applications/tdeio-sword/debian/copyright
rename to debian/_base/applications/tdeio/tdeio-sword/debian/copyright
diff --git a/debian/_base/applications/tdeio-sword/debian/docs b/debian/_base/applications/tdeio/tdeio-sword/debian/docs
similarity index 100%
rename from debian/_base/applications/tdeio-sword/debian/docs
rename to debian/_base/applications/tdeio/tdeio-sword/debian/docs
diff --git a/debian/_base/applications/tde-style-domino/debian/rules b/debian/_base/applications/tdeio/tdeio-sword/debian/rules
similarity index 100%
rename from debian/_base/applications/tde-style-domino/debian/rules
rename to debian/_base/applications/tdeio/tdeio-sword/debian/rules
diff --git a/debian/_base/applications/tastymenu/debian/source/format b/debian/_base/applications/tdeio/tdeio-sword/debian/source/format
similarity index 100%
rename from debian/_base/applications/tastymenu/debian/source/format
rename to debian/_base/applications/tdeio/tdeio-sword/debian/source/format
diff --git a/debian/_base/applications/tastymenu/debian/source/options b/debian/_base/applications/tdeio/tdeio-sword/debian/source/options
similarity index 100%
rename from debian/_base/applications/tastymenu/debian/source/options
rename to debian/_base/applications/tdeio/tdeio-sword/debian/source/options
diff --git a/debian/_base/applications/tde-style-baghira/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/tde-style-baghira/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/tdeio/tdeio-umountwrapper/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/tastymenu/debian/cdbs/versions.pl b/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/tastymenu/debian/cdbs/versions.pl
rename to debian/_base/applications/tdeio/tdeio-umountwrapper/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/tdeio-umountwrapper/debian/changelog b/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/changelog
similarity index 100%
rename from debian/_base/applications/tdeio-umountwrapper/debian/changelog
rename to debian/_base/applications/tdeio/tdeio-umountwrapper/debian/changelog
diff --git a/debian/_base/applications/tde-guidance/debian/compat b/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/compat
similarity index 100%
rename from debian/_base/applications/tde-guidance/debian/compat
rename to debian/_base/applications/tdeio/tdeio-umountwrapper/debian/compat
diff --git a/debian/_base/applications/tdeio-umountwrapper/debian/control b/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/control
similarity index 100%
rename from debian/_base/applications/tdeio-umountwrapper/debian/control
rename to debian/_base/applications/tdeio/tdeio-umountwrapper/debian/control
diff --git a/debian/_base/applications/tdeio-umountwrapper/debian/copyright b/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/copyright
similarity index 100%
rename from debian/_base/applications/tdeio-umountwrapper/debian/copyright
rename to debian/_base/applications/tdeio/tdeio-umountwrapper/debian/copyright
diff --git a/debian/_base/applications/mplayerthumbs/debian/docs b/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/docs
similarity index 100%
rename from debian/_base/applications/mplayerthumbs/debian/docs
rename to debian/_base/applications/tdeio/tdeio-umountwrapper/debian/docs
diff --git a/debian/_base/applications/rosegarden/debian/patches/series b/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/patches/series
similarity index 100%
rename from debian/_base/applications/rosegarden/debian/patches/series
rename to debian/_base/applications/tdeio/tdeio-umountwrapper/debian/patches/series
diff --git a/debian/_base/applications/tdeio-umountwrapper/debian/postinst b/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/postinst
similarity index 100%
rename from debian/_base/applications/tdeio-umountwrapper/debian/postinst
rename to debian/_base/applications/tdeio/tdeio-umountwrapper/debian/postinst
diff --git a/debian/_base/applications/tde-systemsettings/debian/rules b/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/rules
similarity index 100%
rename from debian/_base/applications/tde-systemsettings/debian/rules
rename to debian/_base/applications/tdeio/tdeio-umountwrapper/debian/rules
diff --git a/debian/_base/applications/tde-guidance/debian/source/format b/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/source/format
similarity index 100%
rename from debian/_base/applications/tde-guidance/debian/source/format
rename to debian/_base/applications/tdeio/tdeio-umountwrapper/debian/source/format
diff --git a/debian/_base/applications/tde-guidance/debian/source/options b/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/source/options
similarity index 100%
rename from debian/_base/applications/tde-guidance/debian/source/options
rename to debian/_base/applications/tdeio/tdeio-umountwrapper/debian/source/options
diff --git a/debian/_base/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4 b/debian/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
similarity index 100%
rename from debian/_base/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
rename to debian/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
diff --git a/debian/_base/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde4 b/debian/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde4
similarity index 100%
rename from debian/_base/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde4
rename to debian/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde4
diff --git a/debian/_base/applications/tde-style-domino/debian/cdbs/debian-tde.mk b/debian/_base/applications/themes/gtk-qt-engine/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/tde-style-domino/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/themes/gtk-qt-engine/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/tde-style-baghira/debian/cdbs/versions.pl b/debian/_base/applications/themes/gtk-qt-engine/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/tde-style-baghira/debian/cdbs/versions.pl
rename to debian/_base/applications/themes/gtk-qt-engine/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/gtk-qt-engine/debian/changelog b/debian/_base/applications/themes/gtk-qt-engine/debian/changelog
similarity index 100%
rename from debian/_base/applications/gtk-qt-engine/debian/changelog
rename to debian/_base/applications/themes/gtk-qt-engine/debian/changelog
diff --git a/debian/_base/applications/tde-style-baghira/debian/compat b/debian/_base/applications/themes/gtk-qt-engine/debian/compat
similarity index 100%
rename from debian/_base/applications/tde-style-baghira/debian/compat
rename to debian/_base/applications/themes/gtk-qt-engine/debian/compat
diff --git a/debian/_base/applications/gtk-qt-engine/debian/control b/debian/_base/applications/themes/gtk-qt-engine/debian/control
similarity index 100%
rename from debian/_base/applications/gtk-qt-engine/debian/control
rename to debian/_base/applications/themes/gtk-qt-engine/debian/control
diff --git a/debian/_base/applications/gtk-qt-engine/debian/copyright b/debian/_base/applications/themes/gtk-qt-engine/debian/copyright
similarity index 100%
rename from debian/_base/applications/gtk-qt-engine/debian/copyright
rename to debian/_base/applications/themes/gtk-qt-engine/debian/copyright
diff --git a/debian/_base/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs b/debian/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs
similarity index 100%
rename from debian/_base/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs
rename to debian/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs
diff --git a/debian/_base/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.install b/debian/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.install
similarity index 100%
rename from debian/_base/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.install
rename to debian/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.install
diff --git a/debian/_base/applications/gtk-qt-engine/debian/gtk-qt-engine.rc.sh b/debian/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
similarity index 100%
rename from debian/_base/applications/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
rename to debian/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
diff --git a/debian/_base/applications/tde-guidance/debian/patches/series b/debian/_base/applications/themes/gtk-qt-engine/debian/patches/series
similarity index 100%
rename from debian/_base/applications/tde-guidance/debian/patches/series
rename to debian/_base/applications/themes/gtk-qt-engine/debian/patches/series
diff --git a/debian/_base/applications/gtk-qt-engine/debian/rules b/debian/_base/applications/themes/gtk-qt-engine/debian/rules
similarity index 100%
rename from debian/_base/applications/gtk-qt-engine/debian/rules
rename to debian/_base/applications/themes/gtk-qt-engine/debian/rules
diff --git a/debian/_base/applications/tde-style-baghira/debian/source/format b/debian/_base/applications/themes/gtk-qt-engine/debian/source/format
similarity index 100%
rename from debian/_base/applications/tde-style-baghira/debian/source/format
rename to debian/_base/applications/themes/gtk-qt-engine/debian/source/format
diff --git a/debian/_base/applications/tde-style-baghira/debian/source/options b/debian/_base/applications/themes/gtk-qt-engine/debian/source/options
similarity index 100%
rename from debian/_base/applications/tde-style-baghira/debian/source/options
rename to debian/_base/applications/themes/gtk-qt-engine/debian/source/options
diff --git a/debian/_base/applications/gtk3-tqt-engine/debian/changelog b/debian/_base/applications/themes/gtk3-tqt-engine/debian/changelog
similarity index 100%
rename from debian/_base/applications/gtk3-tqt-engine/debian/changelog
rename to debian/_base/applications/themes/gtk3-tqt-engine/debian/changelog
diff --git a/debian/_base/applications/tde-style-domino/debian/compat b/debian/_base/applications/themes/gtk3-tqt-engine/debian/compat
similarity index 100%
rename from debian/_base/applications/tde-style-domino/debian/compat
rename to debian/_base/applications/themes/gtk3-tqt-engine/debian/compat
diff --git a/debian/_base/applications/gtk3-tqt-engine/debian/control b/debian/_base/applications/themes/gtk3-tqt-engine/debian/control
similarity index 100%
rename from debian/_base/applications/gtk3-tqt-engine/debian/control
rename to debian/_base/applications/themes/gtk3-tqt-engine/debian/control
diff --git a/debian/_base/applications/kerberostray/debian/copyright b/debian/_base/applications/themes/gtk3-tqt-engine/debian/copyright
similarity index 100%
rename from debian/_base/applications/kerberostray/debian/copyright
rename to debian/_base/applications/themes/gtk3-tqt-engine/debian/copyright
diff --git a/debian/_base/applications/tde-style-qtcurve/debian/patches/series b/debian/_base/applications/themes/gtk3-tqt-engine/debian/patches/series
similarity index 100%
rename from debian/_base/applications/tde-style-qtcurve/debian/patches/series
rename to debian/_base/applications/themes/gtk3-tqt-engine/debian/patches/series
diff --git a/debian/_base/applications/gtk3-tqt-engine/debian/rules b/debian/_base/applications/themes/gtk3-tqt-engine/debian/rules
similarity index 100%
rename from debian/_base/applications/gtk3-tqt-engine/debian/rules
rename to debian/_base/applications/themes/gtk3-tqt-engine/debian/rules
diff --git a/debian/_base/applications/tde-style-domino/debian/source/format b/debian/_base/applications/themes/gtk3-tqt-engine/debian/source/format
similarity index 100%
rename from debian/_base/applications/tde-style-domino/debian/source/format
rename to debian/_base/applications/themes/gtk3-tqt-engine/debian/source/format
diff --git a/debian/_base/applications/tde-style-domino/debian/source/options b/debian/_base/applications/themes/gtk3-tqt-engine/debian/source/options
similarity index 100%
rename from debian/_base/applications/tde-style-domino/debian/source/options
rename to debian/_base/applications/themes/gtk3-tqt-engine/debian/source/options
diff --git a/debian/_base/applications/tde-style-ia-ora/debian/cdbs/debian-tde.mk b/debian/_base/applications/themes/kgtk-qt3/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/tde-style-ia-ora/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/themes/kgtk-qt3/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/tde-style-domino/debian/cdbs/versions.pl b/debian/_base/applications/themes/kgtk-qt3/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/tde-style-domino/debian/cdbs/versions.pl
rename to debian/_base/applications/themes/kgtk-qt3/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kgtk-qt3/debian/changelog b/debian/_base/applications/themes/kgtk-qt3/debian/changelog
similarity index 100%
rename from debian/_base/applications/kgtk-qt3/debian/changelog
rename to debian/_base/applications/themes/kgtk-qt3/debian/changelog
diff --git a/debian/_base/applications/tde-style-ia-ora/debian/compat b/debian/_base/applications/themes/kgtk-qt3/debian/compat
similarity index 100%
rename from debian/_base/applications/tde-style-ia-ora/debian/compat
rename to debian/_base/applications/themes/kgtk-qt3/debian/compat
diff --git a/debian/_base/applications/kgtk-qt3/debian/control b/debian/_base/applications/themes/kgtk-qt3/debian/control
similarity index 100%
rename from debian/_base/applications/kgtk-qt3/debian/control
rename to debian/_base/applications/themes/kgtk-qt3/debian/control
diff --git a/debian/_base/applications/kgtk-qt3/debian/copyright b/debian/_base/applications/themes/kgtk-qt3/debian/copyright
similarity index 100%
rename from debian/_base/applications/kgtk-qt3/debian/copyright
rename to debian/_base/applications/themes/kgtk-qt3/debian/copyright
diff --git a/debian/_base/applications/kgtk-qt3/debian/kgtk-qt3-trinity.lintian b/debian/_base/applications/themes/kgtk-qt3/debian/kgtk-qt3-trinity.lintian
similarity index 100%
rename from debian/_base/applications/kgtk-qt3/debian/kgtk-qt3-trinity.lintian
rename to debian/_base/applications/themes/kgtk-qt3/debian/kgtk-qt3-trinity.lintian
diff --git a/debian/_base/applications/tde-systemsettings/debian/patches/series b/debian/_base/applications/themes/kgtk-qt3/debian/patches/series
similarity index 100%
rename from debian/_base/applications/tde-systemsettings/debian/patches/series
rename to debian/_base/applications/themes/kgtk-qt3/debian/patches/series
diff --git a/debian/_base/applications/kgtk-qt3/debian/preload b/debian/_base/applications/themes/kgtk-qt3/debian/preload
similarity index 100%
rename from debian/_base/applications/kgtk-qt3/debian/preload
rename to debian/_base/applications/themes/kgtk-qt3/debian/preload
diff --git a/debian/_base/applications/kgtk-qt3/debian/rules b/debian/_base/applications/themes/kgtk-qt3/debian/rules
similarity index 100%
rename from debian/_base/applications/kgtk-qt3/debian/rules
rename to debian/_base/applications/themes/kgtk-qt3/debian/rules
diff --git a/debian/_base/applications/tde-style-ia-ora/debian/source/format b/debian/_base/applications/themes/kgtk-qt3/debian/source/format
similarity index 100%
rename from debian/_base/applications/tde-style-ia-ora/debian/source/format
rename to debian/_base/applications/themes/kgtk-qt3/debian/source/format
diff --git a/debian/_base/applications/tde-style-ia-ora/debian/source/options b/debian/_base/applications/themes/kgtk-qt3/debian/source/options
similarity index 100%
rename from debian/_base/applications/tde-style-ia-ora/debian/source/options
rename to debian/_base/applications/themes/kgtk-qt3/debian/source/options
diff --git a/debian/_base/applications/tde-style-lipstik/debian/cdbs/debian-tde.mk b/debian/_base/applications/themes/ksplash-engine-moodin/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/tde-style-lipstik/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/themes/ksplash-engine-moodin/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/tde-style-ia-ora/debian/cdbs/versions.pl b/debian/_base/applications/themes/ksplash-engine-moodin/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/tde-style-ia-ora/debian/cdbs/versions.pl
rename to debian/_base/applications/themes/ksplash-engine-moodin/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/ksplash-engine-moodin/debian/changelog b/debian/_base/applications/themes/ksplash-engine-moodin/debian/changelog
similarity index 100%
rename from debian/_base/applications/ksplash-engine-moodin/debian/changelog
rename to debian/_base/applications/themes/ksplash-engine-moodin/debian/changelog
diff --git a/debian/_base/applications/tde-style-lipstik/debian/compat b/debian/_base/applications/themes/ksplash-engine-moodin/debian/compat
similarity index 100%
rename from debian/_base/applications/tde-style-lipstik/debian/compat
rename to debian/_base/applications/themes/ksplash-engine-moodin/debian/compat
diff --git a/debian/_base/applications/ksplash-engine-moodin/debian/control b/debian/_base/applications/themes/ksplash-engine-moodin/debian/control
similarity index 100%
rename from debian/_base/applications/ksplash-engine-moodin/debian/control
rename to debian/_base/applications/themes/ksplash-engine-moodin/debian/control
diff --git a/debian/_base/applications/ksplash-engine-moodin/debian/copyright b/debian/_base/applications/themes/ksplash-engine-moodin/debian/copyright
similarity index 100%
rename from debian/_base/applications/ksplash-engine-moodin/debian/copyright
rename to debian/_base/applications/themes/ksplash-engine-moodin/debian/copyright
diff --git a/debian/_base/applications/ksplash-engine-moodin/debian/dirs b/debian/_base/applications/themes/ksplash-engine-moodin/debian/dirs
similarity index 100%
rename from debian/_base/applications/ksplash-engine-moodin/debian/dirs
rename to debian/_base/applications/themes/ksplash-engine-moodin/debian/dirs
diff --git a/debian/_base/applications/ktechlab/debian/patches/.gitignore b/debian/_base/applications/themes/ksplash-engine-moodin/debian/patches/.gitignore
similarity index 100%
rename from debian/_base/applications/ktechlab/debian/patches/.gitignore
rename to debian/_base/applications/themes/ksplash-engine-moodin/debian/patches/.gitignore
diff --git a/debian/_base/applications/tdedocker/debian/rules b/debian/_base/applications/themes/ksplash-engine-moodin/debian/rules
similarity index 100%
rename from debian/_base/applications/tdedocker/debian/rules
rename to debian/_base/applications/themes/ksplash-engine-moodin/debian/rules
diff --git a/debian/_base/applications/tde-style-lipstik/debian/source/format b/debian/_base/applications/themes/ksplash-engine-moodin/debian/source/format
similarity index 100%
rename from debian/_base/applications/tde-style-lipstik/debian/source/format
rename to debian/_base/applications/themes/ksplash-engine-moodin/debian/source/format
diff --git a/debian/_base/applications/tde-style-lipstik/debian/source/options b/debian/_base/applications/themes/ksplash-engine-moodin/debian/source/options
similarity index 100%
rename from debian/_base/applications/tde-style-lipstik/debian/source/options
rename to debian/_base/applications/themes/ksplash-engine-moodin/debian/source/options
diff --git a/debian/_base/applications/qt4-tqt-theme-engine/debian/changelog b/debian/_base/applications/themes/qt4-tqt-theme-engine/debian/changelog
similarity index 100%
rename from debian/_base/applications/qt4-tqt-theme-engine/debian/changelog
rename to debian/_base/applications/themes/qt4-tqt-theme-engine/debian/changelog
diff --git a/debian/_base/applications/tde-style-qtcurve/debian/compat b/debian/_base/applications/themes/qt4-tqt-theme-engine/debian/compat
similarity index 100%
rename from debian/_base/applications/tde-style-qtcurve/debian/compat
rename to debian/_base/applications/themes/qt4-tqt-theme-engine/debian/compat
diff --git a/debian/_base/applications/qt4-tqt-theme-engine/debian/control b/debian/_base/applications/themes/qt4-tqt-theme-engine/debian/control
similarity index 100%
rename from debian/_base/applications/qt4-tqt-theme-engine/debian/control
rename to debian/_base/applications/themes/qt4-tqt-theme-engine/debian/control
diff --git a/debian/_base/applications/qt4-tqt-theme-engine/debian/copyright b/debian/_base/applications/themes/qt4-tqt-theme-engine/debian/copyright
similarity index 100%
rename from debian/_base/applications/qt4-tqt-theme-engine/debian/copyright
rename to debian/_base/applications/themes/qt4-tqt-theme-engine/debian/copyright
diff --git a/debian/_base/applications/tdeio-apt/debian/patches/series b/debian/_base/applications/themes/qt4-tqt-theme-engine/debian/patches/series
similarity index 100%
rename from debian/_base/applications/tdeio-apt/debian/patches/series
rename to debian/_base/applications/themes/qt4-tqt-theme-engine/debian/patches/series
diff --git a/debian/_base/applications/qt4-tqt-theme-engine/debian/rules b/debian/_base/applications/themes/qt4-tqt-theme-engine/debian/rules
similarity index 100%
rename from debian/_base/applications/qt4-tqt-theme-engine/debian/rules
rename to debian/_base/applications/themes/qt4-tqt-theme-engine/debian/rules
diff --git a/debian/_base/applications/tde-style-qtcurve/debian/source/format b/debian/_base/applications/themes/qt4-tqt-theme-engine/debian/source/format
similarity index 100%
rename from debian/_base/applications/tde-style-qtcurve/debian/source/format
rename to debian/_base/applications/themes/qt4-tqt-theme-engine/debian/source/format
diff --git a/debian/_base/applications/tde-style-qtcurve/debian/source/options b/debian/_base/applications/themes/qt4-tqt-theme-engine/debian/source/options
similarity index 100%
rename from debian/_base/applications/tde-style-qtcurve/debian/source/options
rename to debian/_base/applications/themes/qt4-tqt-theme-engine/debian/source/options
diff --git a/debian/_base/applications/tde-style-qtcurve/debian/cdbs/debian-tde.mk b/debian/_base/applications/themes/tde-style-baghira/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/tde-style-qtcurve/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/themes/tde-style-baghira/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/tde-style-lipstik/debian/cdbs/versions.pl b/debian/_base/applications/themes/tde-style-baghira/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/tde-style-lipstik/debian/cdbs/versions.pl
rename to debian/_base/applications/themes/tde-style-baghira/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/tde-style-baghira/debian/changelog b/debian/_base/applications/themes/tde-style-baghira/debian/changelog
similarity index 100%
rename from debian/_base/applications/tde-style-baghira/debian/changelog
rename to debian/_base/applications/themes/tde-style-baghira/debian/changelog
diff --git a/debian/_base/applications/tde-systemsettings/debian/compat b/debian/_base/applications/themes/tde-style-baghira/debian/compat
similarity index 100%
rename from debian/_base/applications/tde-systemsettings/debian/compat
rename to debian/_base/applications/themes/tde-style-baghira/debian/compat
diff --git a/debian/_base/applications/tde-style-baghira/debian/control b/debian/_base/applications/themes/tde-style-baghira/debian/control
similarity index 100%
rename from debian/_base/applications/tde-style-baghira/debian/control
rename to debian/_base/applications/themes/tde-style-baghira/debian/control
diff --git a/debian/_base/applications/tde-style-baghira/debian/copyright b/debian/_base/applications/themes/tde-style-baghira/debian/copyright
similarity index 100%
rename from debian/_base/applications/tde-style-baghira/debian/copyright
rename to debian/_base/applications/themes/tde-style-baghira/debian/copyright
diff --git a/debian/_base/applications/tastymenu/debian/patches/series b/debian/_base/applications/themes/tde-style-baghira/debian/patches/series
similarity index 100%
rename from debian/_base/applications/tastymenu/debian/patches/series
rename to debian/_base/applications/themes/tde-style-baghira/debian/patches/series
diff --git a/debian/_base/applications/tdeio-apt/debian/rules b/debian/_base/applications/themes/tde-style-baghira/debian/rules
similarity index 100%
rename from debian/_base/applications/tdeio-apt/debian/rules
rename to debian/_base/applications/themes/tde-style-baghira/debian/rules
diff --git a/debian/_base/applications/tde-systemsettings/debian/source/format b/debian/_base/applications/themes/tde-style-baghira/debian/source/format
similarity index 100%
rename from debian/_base/applications/tde-systemsettings/debian/source/format
rename to debian/_base/applications/themes/tde-style-baghira/debian/source/format
diff --git a/debian/_base/applications/tde-systemsettings/debian/source/options b/debian/_base/applications/themes/tde-style-baghira/debian/source/options
similarity index 100%
rename from debian/_base/applications/tde-systemsettings/debian/source/options
rename to debian/_base/applications/themes/tde-style-baghira/debian/source/options
diff --git a/debian/_base/applications/tde-style-baghira/debian/tde-style-baghira-trinity.docs b/debian/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.docs
similarity index 100%
rename from debian/_base/applications/tde-style-baghira/debian/tde-style-baghira-trinity.docs
rename to debian/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.docs
diff --git a/debian/_base/applications/tde-style-baghira/debian/tde-style-baghira-trinity.lintian b/debian/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.lintian
similarity index 100%
rename from debian/_base/applications/tde-style-baghira/debian/tde-style-baghira-trinity.lintian
rename to debian/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.lintian
diff --git a/debian/_base/applications/tde-style-baghira/debian/tde-style-baghira-trinity.menu b/debian/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.menu
similarity index 100%
rename from debian/_base/applications/tde-style-baghira/debian/tde-style-baghira-trinity.menu
rename to debian/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.menu
diff --git a/debian/_base/applications/tde-systemsettings/debian/cdbs/debian-tde.mk b/debian/_base/applications/themes/tde-style-domino/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/tde-systemsettings/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/themes/tde-style-domino/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/tde-style-qtcurve/debian/cdbs/versions.pl b/debian/_base/applications/themes/tde-style-domino/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/tde-style-qtcurve/debian/cdbs/versions.pl
rename to debian/_base/applications/themes/tde-style-domino/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/tde-style-domino/debian/changelog b/debian/_base/applications/themes/tde-style-domino/debian/changelog
similarity index 100%
rename from debian/_base/applications/tde-style-domino/debian/changelog
rename to debian/_base/applications/themes/tde-style-domino/debian/changelog
diff --git a/debian/_base/applications/tdedocker/debian/compat b/debian/_base/applications/themes/tde-style-domino/debian/compat
similarity index 100%
rename from debian/_base/applications/tdedocker/debian/compat
rename to debian/_base/applications/themes/tde-style-domino/debian/compat
diff --git a/debian/_base/applications/tde-style-domino/debian/control b/debian/_base/applications/themes/tde-style-domino/debian/control
similarity index 100%
rename from debian/_base/applications/tde-style-domino/debian/control
rename to debian/_base/applications/themes/tde-style-domino/debian/control
diff --git a/debian/_base/applications/tde-style-domino/debian/copyright b/debian/_base/applications/themes/tde-style-domino/debian/copyright
similarity index 100%
rename from debian/_base/applications/tde-style-domino/debian/copyright
rename to debian/_base/applications/themes/tde-style-domino/debian/copyright
diff --git a/debian/_base/applications/tde-style-baghira/debian/patches/series b/debian/_base/applications/themes/tde-style-domino/debian/patches/series
similarity index 100%
rename from debian/_base/applications/tde-style-baghira/debian/patches/series
rename to debian/_base/applications/themes/tde-style-domino/debian/patches/series
diff --git a/debian/_base/applications/tdeio-ftps/debian/rules b/debian/_base/applications/themes/tde-style-domino/debian/rules
similarity index 100%
rename from debian/_base/applications/tdeio-ftps/debian/rules
rename to debian/_base/applications/themes/tde-style-domino/debian/rules
diff --git a/debian/_base/applications/tdedocker/debian/source/format b/debian/_base/applications/themes/tde-style-domino/debian/source/format
similarity index 100%
rename from debian/_base/applications/tdedocker/debian/source/format
rename to debian/_base/applications/themes/tde-style-domino/debian/source/format
diff --git a/debian/_base/applications/tdedocker/debian/source/options b/debian/_base/applications/themes/tde-style-domino/debian/source/options
similarity index 100%
rename from debian/_base/applications/tdedocker/debian/source/options
rename to debian/_base/applications/themes/tde-style-domino/debian/source/options
diff --git a/debian/_base/applications/tdedocker/debian/cdbs/debian-tde.mk b/debian/_base/applications/themes/tde-style-ia-ora/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/tdedocker/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/themes/tde-style-ia-ora/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/tde-systemsettings/debian/cdbs/versions.pl b/debian/_base/applications/themes/tde-style-ia-ora/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/tde-systemsettings/debian/cdbs/versions.pl
rename to debian/_base/applications/themes/tde-style-ia-ora/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/tde-style-ia-ora/debian/changelog b/debian/_base/applications/themes/tde-style-ia-ora/debian/changelog
similarity index 100%
rename from debian/_base/applications/tde-style-ia-ora/debian/changelog
rename to debian/_base/applications/themes/tde-style-ia-ora/debian/changelog
diff --git a/debian/_base/applications/tdeio-apt/debian/compat b/debian/_base/applications/themes/tde-style-ia-ora/debian/compat
similarity index 100%
rename from debian/_base/applications/tdeio-apt/debian/compat
rename to debian/_base/applications/themes/tde-style-ia-ora/debian/compat
diff --git a/debian/_base/applications/tde-style-ia-ora/debian/control b/debian/_base/applications/themes/tde-style-ia-ora/debian/control
similarity index 100%
rename from debian/_base/applications/tde-style-ia-ora/debian/control
rename to debian/_base/applications/themes/tde-style-ia-ora/debian/control
diff --git a/debian/_base/applications/tde-style-ia-ora/debian/copyright b/debian/_base/applications/themes/tde-style-ia-ora/debian/copyright
similarity index 100%
rename from debian/_base/applications/tde-style-ia-ora/debian/copyright
rename to debian/_base/applications/themes/tde-style-ia-ora/debian/copyright
diff --git a/debian/_base/applications/tde-style-domino/debian/patches/series b/debian/_base/applications/themes/tde-style-ia-ora/debian/patches/series
similarity index 100%
rename from debian/_base/applications/tde-style-domino/debian/patches/series
rename to debian/_base/applications/themes/tde-style-ia-ora/debian/patches/series
diff --git a/debian/_base/applications/mplayerthumbs/debian/rules b/debian/_base/applications/themes/tde-style-ia-ora/debian/rules
similarity index 100%
rename from debian/_base/applications/mplayerthumbs/debian/rules
rename to debian/_base/applications/themes/tde-style-ia-ora/debian/rules
diff --git a/debian/_base/applications/tdeio-apt/debian/source/format b/debian/_base/applications/themes/tde-style-ia-ora/debian/source/format
similarity index 100%
rename from debian/_base/applications/tdeio-apt/debian/source/format
rename to debian/_base/applications/themes/tde-style-ia-ora/debian/source/format
diff --git a/debian/_base/applications/tdeio-apt/debian/source/options b/debian/_base/applications/themes/tde-style-ia-ora/debian/source/options
similarity index 100%
rename from debian/_base/applications/tdeio-apt/debian/source/options
rename to debian/_base/applications/themes/tde-style-ia-ora/debian/source/options
diff --git a/debian/_base/applications/tdeio-apt/debian/cdbs/debian-tde.mk b/debian/_base/applications/themes/tde-style-lipstik/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/tdeio-apt/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/themes/tde-style-lipstik/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/tdeio-apt/debian/cdbs/versions.pl b/debian/_base/applications/themes/tde-style-lipstik/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/tdeio-apt/debian/cdbs/versions.pl
rename to debian/_base/applications/themes/tde-style-lipstik/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/tde-style-lipstik/debian/changelog b/debian/_base/applications/themes/tde-style-lipstik/debian/changelog
similarity index 100%
rename from debian/_base/applications/tde-style-lipstik/debian/changelog
rename to debian/_base/applications/themes/tde-style-lipstik/debian/changelog
diff --git a/debian/_base/applications/tdeio-ftps/debian/compat b/debian/_base/applications/themes/tde-style-lipstik/debian/compat
similarity index 100%
rename from debian/_base/applications/tdeio-ftps/debian/compat
rename to debian/_base/applications/themes/tde-style-lipstik/debian/compat
diff --git a/debian/_base/applications/tde-style-lipstik/debian/control b/debian/_base/applications/themes/tde-style-lipstik/debian/control
similarity index 100%
rename from debian/_base/applications/tde-style-lipstik/debian/control
rename to debian/_base/applications/themes/tde-style-lipstik/debian/control
diff --git a/debian/_base/applications/tde-style-lipstik/debian/copyright b/debian/_base/applications/themes/tde-style-lipstik/debian/copyright
similarity index 100%
rename from debian/_base/applications/tde-style-lipstik/debian/copyright
rename to debian/_base/applications/themes/tde-style-lipstik/debian/copyright
diff --git a/debian/_base/applications/tde-style-lipstik/debian/docs b/debian/_base/applications/themes/tde-style-lipstik/debian/docs
similarity index 100%
rename from debian/_base/applications/tde-style-lipstik/debian/docs
rename to debian/_base/applications/themes/tde-style-lipstik/debian/docs
diff --git a/debian/_base/applications/soundkonverter/debian/patches/.gitignore b/debian/_base/applications/themes/tde-style-lipstik/debian/patches/.gitignore
similarity index 100%
rename from debian/_base/applications/soundkonverter/debian/patches/.gitignore
rename to debian/_base/applications/themes/tde-style-lipstik/debian/patches/.gitignore
diff --git a/debian/_base/applications/tastymenu/debian/rules b/debian/_base/applications/themes/tde-style-lipstik/debian/rules
similarity index 100%
rename from debian/_base/applications/tastymenu/debian/rules
rename to debian/_base/applications/themes/tde-style-lipstik/debian/rules
diff --git a/debian/_base/applications/tdeio-ftps/debian/source/format b/debian/_base/applications/themes/tde-style-lipstik/debian/source/format
similarity index 100%
rename from debian/_base/applications/tdeio-ftps/debian/source/format
rename to debian/_base/applications/themes/tde-style-lipstik/debian/source/format
diff --git a/debian/_base/applications/tdeio-ftps/debian/source/options b/debian/_base/applications/themes/tde-style-lipstik/debian/source/options
similarity index 100%
rename from debian/_base/applications/tdeio-ftps/debian/source/options
rename to debian/_base/applications/themes/tde-style-lipstik/debian/source/options
diff --git a/debian/_base/applications/tdeio-ftps/debian/cdbs/debian-tde.mk b/debian/_base/applications/themes/tde-style-qtcurve/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/tdeio-ftps/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/themes/tde-style-qtcurve/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/tdeio-ftps/debian/cdbs/versions.pl b/debian/_base/applications/themes/tde-style-qtcurve/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/tdeio-ftps/debian/cdbs/versions.pl
rename to debian/_base/applications/themes/tde-style-qtcurve/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/tde-style-qtcurve/debian/changelog b/debian/_base/applications/themes/tde-style-qtcurve/debian/changelog
similarity index 100%
rename from debian/_base/applications/tde-style-qtcurve/debian/changelog
rename to debian/_base/applications/themes/tde-style-qtcurve/debian/changelog
diff --git a/debian/_base/applications/tdeio-gopher/debian/compat b/debian/_base/applications/themes/tde-style-qtcurve/debian/compat
similarity index 100%
rename from debian/_base/applications/tdeio-gopher/debian/compat
rename to debian/_base/applications/themes/tde-style-qtcurve/debian/compat
diff --git a/debian/_base/applications/tde-style-qtcurve/debian/control b/debian/_base/applications/themes/tde-style-qtcurve/debian/control
similarity index 100%
rename from debian/_base/applications/tde-style-qtcurve/debian/control
rename to debian/_base/applications/themes/tde-style-qtcurve/debian/control
diff --git a/debian/_base/applications/tde-style-qtcurve/debian/copyright b/debian/_base/applications/themes/tde-style-qtcurve/debian/copyright
similarity index 100%
rename from debian/_base/applications/tde-style-qtcurve/debian/copyright
rename to debian/_base/applications/themes/tde-style-qtcurve/debian/copyright
diff --git a/debian/_base/applications/tde-style-qtcurve/debian/docs b/debian/_base/applications/themes/tde-style-qtcurve/debian/docs
similarity index 100%
rename from debian/_base/applications/tde-style-qtcurve/debian/docs
rename to debian/_base/applications/themes/tde-style-qtcurve/debian/docs
diff --git a/debian/_base/applications/tdeio-gopher/debian/patches/series b/debian/_base/applications/themes/tde-style-qtcurve/debian/patches/series
similarity index 100%
rename from debian/_base/applications/tdeio-gopher/debian/patches/series
rename to debian/_base/applications/themes/tde-style-qtcurve/debian/patches/series
diff --git a/debian/_base/applications/tde-style-qtcurve/debian/rules b/debian/_base/applications/themes/tde-style-qtcurve/debian/rules
similarity index 100%
rename from debian/_base/applications/tde-style-qtcurve/debian/rules
rename to debian/_base/applications/themes/tde-style-qtcurve/debian/rules
diff --git a/debian/_base/applications/tde-style-qtcurve/debian/scan-version b/debian/_base/applications/themes/tde-style-qtcurve/debian/scan-version
similarity index 100%
rename from debian/_base/applications/tde-style-qtcurve/debian/scan-version
rename to debian/_base/applications/themes/tde-style-qtcurve/debian/scan-version
diff --git a/debian/_base/applications/tdeio-gopher/debian/source/format b/debian/_base/applications/themes/tde-style-qtcurve/debian/source/format
similarity index 100%
rename from debian/_base/applications/tdeio-gopher/debian/source/format
rename to debian/_base/applications/themes/tde-style-qtcurve/debian/source/format
diff --git a/debian/_base/applications/tdeio-gopher/debian/source/options b/debian/_base/applications/themes/tde-style-qtcurve/debian/source/options
similarity index 100%
rename from debian/_base/applications/tdeio-gopher/debian/source/options
rename to debian/_base/applications/themes/tde-style-qtcurve/debian/source/options
diff --git a/debian/_base/applications/tde-style-qtcurve/debian/tde-style-qtcurve-trinity.install b/debian/_base/applications/themes/tde-style-qtcurve/debian/tde-style-qtcurve-trinity.install
similarity index 100%
rename from debian/_base/applications/tde-style-qtcurve/debian/tde-style-qtcurve-trinity.install
rename to debian/_base/applications/themes/tde-style-qtcurve/debian/tde-style-qtcurve-trinity.install
diff --git a/debian/_base/applications/tdmtheme/debian/README.Debian b/debian/_base/applications/themes/tdmtheme/debian/README.Debian
similarity index 100%
rename from debian/_base/applications/tdmtheme/debian/README.Debian
rename to debian/_base/applications/themes/tdmtheme/debian/README.Debian
diff --git a/debian/_base/applications/tdeio-gopher/debian/cdbs/debian-tde.mk b/debian/_base/applications/themes/tdmtheme/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/tdeio-gopher/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/themes/tdmtheme/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/tdeio-gopher/debian/cdbs/versions.pl b/debian/_base/applications/themes/tdmtheme/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/tdeio-gopher/debian/cdbs/versions.pl
rename to debian/_base/applications/themes/tdmtheme/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/tdmtheme/debian/changelog b/debian/_base/applications/themes/tdmtheme/debian/changelog
similarity index 100%
rename from debian/_base/applications/tdmtheme/debian/changelog
rename to debian/_base/applications/themes/tdmtheme/debian/changelog
diff --git a/debian/_base/applications/tdeio-locate/debian/compat b/debian/_base/applications/themes/tdmtheme/debian/compat
similarity index 100%
rename from debian/_base/applications/tdeio-locate/debian/compat
rename to debian/_base/applications/themes/tdmtheme/debian/compat
diff --git a/debian/_base/applications/tdmtheme/debian/control b/debian/_base/applications/themes/tdmtheme/debian/control
similarity index 100%
rename from debian/_base/applications/tdmtheme/debian/control
rename to debian/_base/applications/themes/tdmtheme/debian/control
diff --git a/debian/_base/applications/tdmtheme/debian/copyright b/debian/_base/applications/themes/tdmtheme/debian/copyright
similarity index 100%
rename from debian/_base/applications/tdmtheme/debian/copyright
rename to debian/_base/applications/themes/tdmtheme/debian/copyright
diff --git a/debian/_base/applications/tdeio-apt/debian/docs b/debian/_base/applications/themes/tdmtheme/debian/docs
similarity index 100%
rename from debian/_base/applications/tdeio-apt/debian/docs
rename to debian/_base/applications/themes/tdmtheme/debian/docs
diff --git a/debian/_base/applications/tde-style-lipstik/debian/patches/.gitignore b/debian/_base/applications/themes/tdmtheme/debian/patches/.gitignore
similarity index 100%
rename from debian/_base/applications/tde-style-lipstik/debian/patches/.gitignore
rename to debian/_base/applications/themes/tdmtheme/debian/patches/.gitignore
diff --git a/debian/_base/applications/tdeio-sword/debian/rules b/debian/_base/applications/themes/tdmtheme/debian/rules
similarity index 100%
rename from debian/_base/applications/tdeio-sword/debian/rules
rename to debian/_base/applications/themes/tdmtheme/debian/rules
diff --git a/debian/_base/applications/tdeio-locate/debian/source/format b/debian/_base/applications/themes/tdmtheme/debian/source/format
similarity index 100%
rename from debian/_base/applications/tdeio-locate/debian/source/format
rename to debian/_base/applications/themes/tdmtheme/debian/source/format
diff --git a/debian/_base/applications/tdeio-locate/debian/source/options b/debian/_base/applications/themes/tdmtheme/debian/source/options
similarity index 100%
rename from debian/_base/applications/tdeio-locate/debian/source/options
rename to debian/_base/applications/themes/tdmtheme/debian/source/options
diff --git a/debian/_base/applications/tdmtheme/debian/tdmtheme-trinity.lintian b/debian/_base/applications/themes/tdmtheme/debian/tdmtheme-trinity.lintian
similarity index 100%
rename from debian/_base/applications/tdmtheme/debian/tdmtheme-trinity.lintian
rename to debian/_base/applications/themes/tdmtheme/debian/tdmtheme-trinity.lintian
diff --git a/debian/_base/applications/tdeio-locate/debian/cdbs/debian-tde.mk b/debian/_base/applications/themes/twin-style-crystal/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/tdeio-locate/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/themes/twin-style-crystal/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/tdeio-locate/debian/cdbs/versions.pl b/debian/_base/applications/themes/twin-style-crystal/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/tdeio-locate/debian/cdbs/versions.pl
rename to debian/_base/applications/themes/twin-style-crystal/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/twin-style-crystal/debian/changelog b/debian/_base/applications/themes/twin-style-crystal/debian/changelog
similarity index 100%
rename from debian/_base/applications/twin-style-crystal/debian/changelog
rename to debian/_base/applications/themes/twin-style-crystal/debian/changelog
diff --git a/debian/_base/applications/tdeio-sword/debian/compat b/debian/_base/applications/themes/twin-style-crystal/debian/compat
similarity index 100%
rename from debian/_base/applications/tdeio-sword/debian/compat
rename to debian/_base/applications/themes/twin-style-crystal/debian/compat
diff --git a/debian/_base/applications/twin-style-crystal/debian/control b/debian/_base/applications/themes/twin-style-crystal/debian/control
similarity index 100%
rename from debian/_base/applications/twin-style-crystal/debian/control
rename to debian/_base/applications/themes/twin-style-crystal/debian/control
diff --git a/debian/_base/applications/twin-style-crystal/debian/copyright b/debian/_base/applications/themes/twin-style-crystal/debian/copyright
similarity index 100%
rename from debian/_base/applications/twin-style-crystal/debian/copyright
rename to debian/_base/applications/themes/twin-style-crystal/debian/copyright
diff --git a/debian/_base/applications/twin-style-crystal/debian/dirs b/debian/_base/applications/themes/twin-style-crystal/debian/dirs
similarity index 100%
rename from debian/_base/applications/twin-style-crystal/debian/dirs
rename to debian/_base/applications/themes/twin-style-crystal/debian/dirs
diff --git a/debian/_base/applications/kpicosim/debian/docs b/debian/_base/applications/themes/twin-style-crystal/debian/docs
similarity index 100%
rename from debian/_base/applications/kpicosim/debian/docs
rename to debian/_base/applications/themes/twin-style-crystal/debian/docs
diff --git a/debian/_base/applications/tdeio-locate/debian/patches/series b/debian/_base/applications/themes/twin-style-crystal/debian/patches/series
similarity index 100%
rename from debian/_base/applications/tdeio-locate/debian/patches/series
rename to debian/_base/applications/themes/twin-style-crystal/debian/patches/series
diff --git a/debian/_base/applications/tdeio-umountwrapper/debian/rules b/debian/_base/applications/themes/twin-style-crystal/debian/rules
similarity index 100%
rename from debian/_base/applications/tdeio-umountwrapper/debian/rules
rename to debian/_base/applications/themes/twin-style-crystal/debian/rules
diff --git a/debian/_base/applications/tdeio-sword/debian/source/format b/debian/_base/applications/themes/twin-style-crystal/debian/source/format
similarity index 100%
rename from debian/_base/applications/tdeio-sword/debian/source/format
rename to debian/_base/applications/themes/twin-style-crystal/debian/source/format
diff --git a/debian/_base/applications/tdeio-sword/debian/source/options b/debian/_base/applications/themes/twin-style-crystal/debian/source/options
similarity index 100%
rename from debian/_base/applications/tdeio-sword/debian/source/options
rename to debian/_base/applications/themes/twin-style-crystal/debian/source/options
diff --git a/debian/_base/applications/tdeio-sword/debian/cdbs/debian-tde.mk b/debian/_base/applications/themes/twin-style-suse2/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/tdeio-sword/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/themes/twin-style-suse2/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/tdeio-sword/debian/cdbs/versions.pl b/debian/_base/applications/themes/twin-style-suse2/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/tdeio-sword/debian/cdbs/versions.pl
rename to debian/_base/applications/themes/twin-style-suse2/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/twin-style-suse2/debian/changelog b/debian/_base/applications/themes/twin-style-suse2/debian/changelog
similarity index 100%
rename from debian/_base/applications/twin-style-suse2/debian/changelog
rename to debian/_base/applications/themes/twin-style-suse2/debian/changelog
diff --git a/debian/_base/applications/tdeio-umountwrapper/debian/compat b/debian/_base/applications/themes/twin-style-suse2/debian/compat
similarity index 100%
rename from debian/_base/applications/tdeio-umountwrapper/debian/compat
rename to debian/_base/applications/themes/twin-style-suse2/debian/compat
diff --git a/debian/_base/applications/twin-style-suse2/debian/control b/debian/_base/applications/themes/twin-style-suse2/debian/control
similarity index 100%
rename from debian/_base/applications/twin-style-suse2/debian/control
rename to debian/_base/applications/themes/twin-style-suse2/debian/control
diff --git a/debian/_base/applications/twin-style-suse2/debian/copyright b/debian/_base/applications/themes/twin-style-suse2/debian/copyright
similarity index 100%
rename from debian/_base/applications/twin-style-suse2/debian/copyright
rename to debian/_base/applications/themes/twin-style-suse2/debian/copyright
diff --git a/debian/_base/applications/tdeio-umountwrapper/debian/patches/series b/debian/_base/applications/themes/twin-style-suse2/debian/patches/series
similarity index 100%
rename from debian/_base/applications/tdeio-umountwrapper/debian/patches/series
rename to debian/_base/applications/themes/twin-style-suse2/debian/patches/series
diff --git a/debian/_base/applications/tdesudo/debian/rules b/debian/_base/applications/themes/twin-style-suse2/debian/rules
similarity index 100%
rename from debian/_base/applications/tdesudo/debian/rules
rename to debian/_base/applications/themes/twin-style-suse2/debian/rules
diff --git a/debian/_base/applications/tdeio-umountwrapper/debian/source/format b/debian/_base/applications/themes/twin-style-suse2/debian/source/format
similarity index 100%
rename from debian/_base/applications/tdeio-umountwrapper/debian/source/format
rename to debian/_base/applications/themes/twin-style-suse2/debian/source/format
diff --git a/debian/_base/applications/tdeio-umountwrapper/debian/source/options b/debian/_base/applications/themes/twin-style-suse2/debian/source/options
similarity index 100%
rename from debian/_base/applications/tdeio-umountwrapper/debian/source/options
rename to debian/_base/applications/themes/twin-style-suse2/debian/source/options
diff --git a/debian/_base/applications/abakus/debian/abakus-trinity.manpages b/debian/_base/applications/utilities/abakus/debian/abakus-trinity.manpages
similarity index 100%
rename from debian/_base/applications/abakus/debian/abakus-trinity.manpages
rename to debian/_base/applications/utilities/abakus/debian/abakus-trinity.manpages
diff --git a/debian/_base/applications/abakus/debian/abakus-trinity.menu b/debian/_base/applications/utilities/abakus/debian/abakus-trinity.menu
similarity index 100%
rename from debian/_base/applications/abakus/debian/abakus-trinity.menu
rename to debian/_base/applications/utilities/abakus/debian/abakus-trinity.menu
diff --git a/debian/_base/applications/abakus/debian/abakus.1 b/debian/_base/applications/utilities/abakus/debian/abakus.1
similarity index 100%
rename from debian/_base/applications/abakus/debian/abakus.1
rename to debian/_base/applications/utilities/abakus/debian/abakus.1
diff --git a/debian/_base/applications/tdeio-umountwrapper/debian/cdbs/debian-tde.mk b/debian/_base/applications/utilities/abakus/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/tdeio-umountwrapper/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/utilities/abakus/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/tdeio-umountwrapper/debian/cdbs/versions.pl b/debian/_base/applications/utilities/abakus/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/tdeio-umountwrapper/debian/cdbs/versions.pl
rename to debian/_base/applications/utilities/abakus/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/abakus/debian/changelog b/debian/_base/applications/utilities/abakus/debian/changelog
similarity index 100%
rename from debian/_base/applications/abakus/debian/changelog
rename to debian/_base/applications/utilities/abakus/debian/changelog
diff --git a/debian/_base/applications/tdenetworkmanager/debian/compat b/debian/_base/applications/utilities/abakus/debian/compat
similarity index 100%
rename from debian/_base/applications/tdenetworkmanager/debian/compat
rename to debian/_base/applications/utilities/abakus/debian/compat
diff --git a/debian/_base/applications/abakus/debian/control b/debian/_base/applications/utilities/abakus/debian/control
similarity index 100%
rename from debian/_base/applications/abakus/debian/control
rename to debian/_base/applications/utilities/abakus/debian/control
diff --git a/debian/_base/applications/abakus/debian/copyright b/debian/_base/applications/utilities/abakus/debian/copyright
similarity index 100%
rename from debian/_base/applications/abakus/debian/copyright
rename to debian/_base/applications/utilities/abakus/debian/copyright
diff --git a/debian/_base/applications/soundkonverter/debian/docs b/debian/_base/applications/utilities/abakus/debian/docs
similarity index 100%
rename from debian/_base/applications/soundkonverter/debian/docs
rename to debian/_base/applications/utilities/abakus/debian/docs
diff --git a/debian/_base/applications/tdenetworkmanager/debian/patches/series b/debian/_base/applications/utilities/abakus/debian/patches/series
similarity index 100%
rename from debian/_base/applications/tdenetworkmanager/debian/patches/series
rename to debian/_base/applications/utilities/abakus/debian/patches/series
diff --git a/debian/_base/applications/abakus/debian/rules b/debian/_base/applications/utilities/abakus/debian/rules
similarity index 100%
rename from debian/_base/applications/abakus/debian/rules
rename to debian/_base/applications/utilities/abakus/debian/rules
diff --git a/debian/_base/applications/tdenetworkmanager/debian/source/format b/debian/_base/applications/utilities/abakus/debian/source/format
similarity index 100%
rename from debian/_base/applications/tdenetworkmanager/debian/source/format
rename to debian/_base/applications/utilities/abakus/debian/source/format
diff --git a/debian/_base/applications/tdenetworkmanager/debian/source/options b/debian/_base/applications/utilities/abakus/debian/source/options
similarity index 100%
rename from debian/_base/applications/tdenetworkmanager/debian/source/options
rename to debian/_base/applications/utilities/abakus/debian/source/options
diff --git a/debian/_base/applications/tdenetworkmanager/debian/cdbs/debian-tde.mk b/debian/_base/applications/utilities/filelight/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/tdenetworkmanager/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/utilities/filelight/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/tdenetworkmanager/debian/cdbs/versions.pl b/debian/_base/applications/utilities/filelight/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/tdenetworkmanager/debian/cdbs/versions.pl
rename to debian/_base/applications/utilities/filelight/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/filelight/debian/changelog b/debian/_base/applications/utilities/filelight/debian/changelog
similarity index 100%
rename from debian/_base/applications/filelight/debian/changelog
rename to debian/_base/applications/utilities/filelight/debian/changelog
diff --git a/debian/_base/applications/tdepacman/debian/compat b/debian/_base/applications/utilities/filelight/debian/compat
similarity index 100%
rename from debian/_base/applications/tdepacman/debian/compat
rename to debian/_base/applications/utilities/filelight/debian/compat
diff --git a/debian/_base/applications/filelight/debian/control b/debian/_base/applications/utilities/filelight/debian/control
similarity index 100%
rename from debian/_base/applications/filelight/debian/control
rename to debian/_base/applications/utilities/filelight/debian/control
diff --git a/debian/_base/applications/filelight/debian/copyright b/debian/_base/applications/utilities/filelight/debian/copyright
similarity index 100%
rename from debian/_base/applications/filelight/debian/copyright
rename to debian/_base/applications/utilities/filelight/debian/copyright
diff --git a/debian/_base/applications/filelight/debian/menu b/debian/_base/applications/utilities/filelight/debian/menu
similarity index 100%
rename from debian/_base/applications/filelight/debian/menu
rename to debian/_base/applications/utilities/filelight/debian/menu
diff --git a/debian/_base/applications/tdepacman/debian/patches/series b/debian/_base/applications/utilities/filelight/debian/patches/series
similarity index 100%
rename from debian/_base/applications/tdepacman/debian/patches/series
rename to debian/_base/applications/utilities/filelight/debian/patches/series
diff --git a/debian/_base/applications/filelight/debian/rules b/debian/_base/applications/utilities/filelight/debian/rules
similarity index 100%
rename from debian/_base/applications/filelight/debian/rules
rename to debian/_base/applications/utilities/filelight/debian/rules
diff --git a/debian/_base/applications/tdepacman/debian/source/format b/debian/_base/applications/utilities/filelight/debian/source/format
similarity index 100%
rename from debian/_base/applications/tdepacman/debian/source/format
rename to debian/_base/applications/utilities/filelight/debian/source/format
diff --git a/debian/_base/applications/tdepacman/debian/source/options b/debian/_base/applications/utilities/filelight/debian/source/options
similarity index 100%
rename from debian/_base/applications/tdepacman/debian/source/options
rename to debian/_base/applications/utilities/filelight/debian/source/options
diff --git a/debian/_base/applications/wlassistant/debian/README.Debian b/debian/_base/applications/utilities/kbarcode/debian/README.Debian
similarity index 100%
rename from debian/_base/applications/wlassistant/debian/README.Debian
rename to debian/_base/applications/utilities/kbarcode/debian/README.Debian
diff --git a/debian/_base/applications/tdepacman/debian/cdbs/debian-tde.mk b/debian/_base/applications/utilities/kbarcode/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/tdepacman/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/utilities/kbarcode/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/tdepacman/debian/cdbs/versions.pl b/debian/_base/applications/utilities/kbarcode/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/tdepacman/debian/cdbs/versions.pl
rename to debian/_base/applications/utilities/kbarcode/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kbarcode/debian/changelog b/debian/_base/applications/utilities/kbarcode/debian/changelog
similarity index 100%
rename from debian/_base/applications/kbarcode/debian/changelog
rename to debian/_base/applications/utilities/kbarcode/debian/changelog
diff --git a/debian/_base/applications/tdepowersave/debian/compat b/debian/_base/applications/utilities/kbarcode/debian/compat
similarity index 100%
rename from debian/_base/applications/tdepowersave/debian/compat
rename to debian/_base/applications/utilities/kbarcode/debian/compat
diff --git a/debian/_base/applications/kbarcode/debian/control b/debian/_base/applications/utilities/kbarcode/debian/control
similarity index 100%
rename from debian/_base/applications/kbarcode/debian/control
rename to debian/_base/applications/utilities/kbarcode/debian/control
diff --git a/debian/_base/applications/kbarcode/debian/copyright b/debian/_base/applications/utilities/kbarcode/debian/copyright
similarity index 100%
rename from debian/_base/applications/kbarcode/debian/copyright
rename to debian/_base/applications/utilities/kbarcode/debian/copyright
diff --git a/debian/_base/applications/tdepacman/debian/docs b/debian/_base/applications/utilities/kbarcode/debian/docs
similarity index 100%
rename from debian/_base/applications/tdepacman/debian/docs
rename to debian/_base/applications/utilities/kbarcode/debian/docs
diff --git a/debian/_base/applications/kbarcode/debian/menu b/debian/_base/applications/utilities/kbarcode/debian/menu
similarity index 100%
rename from debian/_base/applications/kbarcode/debian/menu
rename to debian/_base/applications/utilities/kbarcode/debian/menu
diff --git a/debian/_base/applications/tdmtheme/debian/patches/.gitignore b/debian/_base/applications/utilities/kbarcode/debian/patches/.gitignore
similarity index 100%
rename from debian/_base/applications/tdmtheme/debian/patches/.gitignore
rename to debian/_base/applications/utilities/kbarcode/debian/patches/.gitignore
diff --git a/debian/_base/applications/tde-style-ia-ora/debian/rules b/debian/_base/applications/utilities/kbarcode/debian/rules
similarity index 100%
rename from debian/_base/applications/tde-style-ia-ora/debian/rules
rename to debian/_base/applications/utilities/kbarcode/debian/rules
diff --git a/debian/_base/applications/tdepowersave/debian/source/format b/debian/_base/applications/utilities/kbarcode/debian/source/format
similarity index 100%
rename from debian/_base/applications/tdepowersave/debian/source/format
rename to debian/_base/applications/utilities/kbarcode/debian/source/format
diff --git a/debian/_base/applications/tdepowersave/debian/source/options b/debian/_base/applications/utilities/kbarcode/debian/source/options
similarity index 100%
rename from debian/_base/applications/tdepowersave/debian/source/options
rename to debian/_base/applications/utilities/kbarcode/debian/source/options
diff --git a/debian/_base/applications/tdepowersave/debian/cdbs/debian-tde.mk b/debian/_base/applications/utilities/kchmviewer/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/tdepowersave/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/utilities/kchmviewer/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/tdepowersave/debian/cdbs/versions.pl b/debian/_base/applications/utilities/kchmviewer/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/tdepowersave/debian/cdbs/versions.pl
rename to debian/_base/applications/utilities/kchmviewer/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kchmviewer/debian/changelog b/debian/_base/applications/utilities/kchmviewer/debian/changelog
similarity index 100%
rename from debian/_base/applications/kchmviewer/debian/changelog
rename to debian/_base/applications/utilities/kchmviewer/debian/changelog
diff --git a/debian/_base/applications/tderadio/debian/compat b/debian/_base/applications/utilities/kchmviewer/debian/compat
similarity index 100%
rename from debian/_base/applications/tderadio/debian/compat
rename to debian/_base/applications/utilities/kchmviewer/debian/compat
diff --git a/debian/_base/applications/kchmviewer/debian/control b/debian/_base/applications/utilities/kchmviewer/debian/control
similarity index 100%
rename from debian/_base/applications/kchmviewer/debian/control
rename to debian/_base/applications/utilities/kchmviewer/debian/control
diff --git a/debian/_base/applications/kchmviewer/debian/copyright b/debian/_base/applications/utilities/kchmviewer/debian/copyright
similarity index 100%
rename from debian/_base/applications/kchmviewer/debian/copyright
rename to debian/_base/applications/utilities/kchmviewer/debian/copyright
diff --git a/debian/_base/applications/kchmviewer/debian/dirs b/debian/_base/applications/utilities/kchmviewer/debian/dirs
similarity index 100%
rename from debian/_base/applications/kchmviewer/debian/dirs
rename to debian/_base/applications/utilities/kchmviewer/debian/dirs
diff --git a/debian/_base/applications/kchmviewer/debian/docs b/debian/_base/applications/utilities/kchmviewer/debian/docs
similarity index 100%
rename from debian/_base/applications/kchmviewer/debian/docs
rename to debian/_base/applications/utilities/kchmviewer/debian/docs
diff --git a/debian/_base/applications/kchmviewer/debian/kchmviewer-trinity.menu b/debian/_base/applications/utilities/kchmviewer/debian/kchmviewer-trinity.menu
similarity index 100%
rename from debian/_base/applications/kchmviewer/debian/kchmviewer-trinity.menu
rename to debian/_base/applications/utilities/kchmviewer/debian/kchmviewer-trinity.menu
diff --git a/debian/_base/applications/yakuake/debian/patches/.gitignore b/debian/_base/applications/utilities/kchmviewer/debian/patches/.gitignore
similarity index 100%
rename from debian/_base/applications/yakuake/debian/patches/.gitignore
rename to debian/_base/applications/utilities/kchmviewer/debian/patches/.gitignore
diff --git a/debian/_base/applications/tde-style-lipstik/debian/rules b/debian/_base/applications/utilities/kchmviewer/debian/rules
similarity index 100%
rename from debian/_base/applications/tde-style-lipstik/debian/rules
rename to debian/_base/applications/utilities/kchmviewer/debian/rules
diff --git a/debian/_base/applications/tderadio/debian/source/format b/debian/_base/applications/utilities/kchmviewer/debian/source/format
similarity index 100%
rename from debian/_base/applications/tderadio/debian/source/format
rename to debian/_base/applications/utilities/kchmviewer/debian/source/format
diff --git a/debian/_base/applications/tderadio/debian/source/options b/debian/_base/applications/utilities/kchmviewer/debian/source/options
similarity index 100%
rename from debian/_base/applications/tderadio/debian/source/options
rename to debian/_base/applications/utilities/kchmviewer/debian/source/options
diff --git a/debian/_base/applications/tdesudo/debian/cdbs/debian-tde.mk b/debian/_base/applications/utilities/kcpuload/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/tdesudo/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/utilities/kcpuload/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/tdesudo/debian/cdbs/versions.pl b/debian/_base/applications/utilities/kcpuload/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/tdesudo/debian/cdbs/versions.pl
rename to debian/_base/applications/utilities/kcpuload/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kcpuload/debian/changelog b/debian/_base/applications/utilities/kcpuload/debian/changelog
similarity index 100%
rename from debian/_base/applications/kcpuload/debian/changelog
rename to debian/_base/applications/utilities/kcpuload/debian/changelog
diff --git a/debian/_base/applications/tdesudo/debian/compat b/debian/_base/applications/utilities/kcpuload/debian/compat
similarity index 100%
rename from debian/_base/applications/tdesudo/debian/compat
rename to debian/_base/applications/utilities/kcpuload/debian/compat
diff --git a/debian/_base/applications/kcpuload/debian/control b/debian/_base/applications/utilities/kcpuload/debian/control
similarity index 100%
rename from debian/_base/applications/kcpuload/debian/control
rename to debian/_base/applications/utilities/kcpuload/debian/control
diff --git a/debian/_base/applications/kcpuload/debian/copyright b/debian/_base/applications/utilities/kcpuload/debian/copyright
similarity index 100%
rename from debian/_base/applications/kcpuload/debian/copyright
rename to debian/_base/applications/utilities/kcpuload/debian/copyright
diff --git a/debian/_base/applications/kcpuload/debian/doc-base b/debian/_base/applications/utilities/kcpuload/debian/doc-base
similarity index 100%
rename from debian/_base/applications/kcpuload/debian/doc-base
rename to debian/_base/applications/utilities/kcpuload/debian/doc-base
diff --git a/debian/_base/applications/tdesudo/debian/docs b/debian/_base/applications/utilities/kcpuload/debian/docs
similarity index 100%
rename from debian/_base/applications/tdesudo/debian/docs
rename to debian/_base/applications/utilities/kcpuload/debian/docs
diff --git a/debian/_base/applications/kcpuload/debian/kcpuload-trinity.install b/debian/_base/applications/utilities/kcpuload/debian/kcpuload-trinity.install
similarity index 100%
rename from debian/_base/applications/kcpuload/debian/kcpuload-trinity.install
rename to debian/_base/applications/utilities/kcpuload/debian/kcpuload-trinity.install
diff --git a/debian/_base/applications/kcpuload/debian/kcpuload-trinity.lintian b/debian/_base/applications/utilities/kcpuload/debian/kcpuload-trinity.lintian
similarity index 100%
rename from debian/_base/applications/kcpuload/debian/kcpuload-trinity.lintian
rename to debian/_base/applications/utilities/kcpuload/debian/kcpuload-trinity.lintian
diff --git a/debian/_base/applications/kcpuload/debian/kcpuload.xpm b/debian/_base/applications/utilities/kcpuload/debian/kcpuload.xpm
similarity index 100%
rename from debian/_base/applications/kcpuload/debian/kcpuload.xpm
rename to debian/_base/applications/utilities/kcpuload/debian/kcpuload.xpm
diff --git a/debian/_base/applications/kcpuload/debian/links b/debian/_base/applications/utilities/kcpuload/debian/links
similarity index 100%
rename from debian/_base/applications/kcpuload/debian/links
rename to debian/_base/applications/utilities/kcpuload/debian/links
diff --git a/debian/_base/applications/kcpuload/debian/menu b/debian/_base/applications/utilities/kcpuload/debian/menu
similarity index 100%
rename from debian/_base/applications/kcpuload/debian/menu
rename to debian/_base/applications/utilities/kcpuload/debian/menu
diff --git a/debian/_base/applications/kcpuload/debian/rules b/debian/_base/applications/utilities/kcpuload/debian/rules
similarity index 100%
rename from debian/_base/applications/kcpuload/debian/rules
rename to debian/_base/applications/utilities/kcpuload/debian/rules
diff --git a/debian/_base/applications/tdesudo/debian/source/format b/debian/_base/applications/utilities/kcpuload/debian/source/format
similarity index 100%
rename from debian/_base/applications/tdesudo/debian/source/format
rename to debian/_base/applications/utilities/kcpuload/debian/source/format
diff --git a/debian/_base/applications/tdesudo/debian/source/options b/debian/_base/applications/utilities/kcpuload/debian/source/options
similarity index 100%
rename from debian/_base/applications/tdesudo/debian/source/options
rename to debian/_base/applications/utilities/kcpuload/debian/source/options
diff --git a/debian/_base/applications/tdesvn/debian/cdbs/debian-tde.mk b/debian/_base/applications/utilities/kdirstat/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/tdesvn/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/utilities/kdirstat/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/tdesvn/debian/cdbs/versions.pl b/debian/_base/applications/utilities/kdirstat/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/tdesvn/debian/cdbs/versions.pl
rename to debian/_base/applications/utilities/kdirstat/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kdirstat/debian/changelog b/debian/_base/applications/utilities/kdirstat/debian/changelog
similarity index 100%
rename from debian/_base/applications/kdirstat/debian/changelog
rename to debian/_base/applications/utilities/kdirstat/debian/changelog
diff --git a/debian/_base/applications/tdesvn/debian/compat b/debian/_base/applications/utilities/kdirstat/debian/compat
similarity index 100%
rename from debian/_base/applications/tdesvn/debian/compat
rename to debian/_base/applications/utilities/kdirstat/debian/compat
diff --git a/debian/_base/applications/kdirstat/debian/control b/debian/_base/applications/utilities/kdirstat/debian/control
similarity index 100%
rename from debian/_base/applications/kdirstat/debian/control
rename to debian/_base/applications/utilities/kdirstat/debian/control
diff --git a/debian/_base/applications/kdirstat/debian/copyright b/debian/_base/applications/utilities/kdirstat/debian/copyright
similarity index 100%
rename from debian/_base/applications/kdirstat/debian/copyright
rename to debian/_base/applications/utilities/kdirstat/debian/copyright
diff --git a/debian/_base/applications/kdirstat/debian/docs b/debian/_base/applications/utilities/kdirstat/debian/docs
similarity index 100%
rename from debian/_base/applications/kdirstat/debian/docs
rename to debian/_base/applications/utilities/kdirstat/debian/docs
diff --git a/debian/_base/applications/tdepowersave/debian/patches/series b/debian/_base/applications/utilities/kdirstat/debian/patches/series
similarity index 100%
rename from debian/_base/applications/tdepowersave/debian/patches/series
rename to debian/_base/applications/utilities/kdirstat/debian/patches/series
diff --git a/debian/_base/applications/tdmtheme/debian/rules b/debian/_base/applications/utilities/kdirstat/debian/rules
similarity index 100%
rename from debian/_base/applications/tdmtheme/debian/rules
rename to debian/_base/applications/utilities/kdirstat/debian/rules
diff --git a/debian/_base/applications/tdesvn/debian/source/format b/debian/_base/applications/utilities/kdirstat/debian/source/format
similarity index 100%
rename from debian/_base/applications/tdesvn/debian/source/format
rename to debian/_base/applications/utilities/kdirstat/debian/source/format
diff --git a/debian/_base/applications/tdesvn/debian/source/options b/debian/_base/applications/utilities/kdirstat/debian/source/options
similarity index 100%
rename from debian/_base/applications/tdesvn/debian/source/options
rename to debian/_base/applications/utilities/kdirstat/debian/source/options
diff --git a/debian/_base/applications/tdmtheme/debian/cdbs/debian-tde.mk b/debian/_base/applications/utilities/keep/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/tdmtheme/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/utilities/keep/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/tdmtheme/debian/cdbs/versions.pl b/debian/_base/applications/utilities/keep/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/tdmtheme/debian/cdbs/versions.pl
rename to debian/_base/applications/utilities/keep/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/keep/debian/changelog b/debian/_base/applications/utilities/keep/debian/changelog
similarity index 100%
rename from debian/_base/applications/keep/debian/changelog
rename to debian/_base/applications/utilities/keep/debian/changelog
diff --git a/debian/_base/applications/tdmtheme/debian/compat b/debian/_base/applications/utilities/keep/debian/compat
similarity index 100%
rename from debian/_base/applications/tdmtheme/debian/compat
rename to debian/_base/applications/utilities/keep/debian/compat
diff --git a/debian/_base/applications/keep/debian/control b/debian/_base/applications/utilities/keep/debian/control
similarity index 100%
rename from debian/_base/applications/keep/debian/control
rename to debian/_base/applications/utilities/keep/debian/control
diff --git a/debian/_base/applications/keep/debian/copyright b/debian/_base/applications/utilities/keep/debian/copyright
similarity index 100%
rename from debian/_base/applications/keep/debian/copyright
rename to debian/_base/applications/utilities/keep/debian/copyright
diff --git a/debian/_base/applications/tdesvn/debian/docs b/debian/_base/applications/utilities/keep/debian/docs
similarity index 100%
rename from debian/_base/applications/tdesvn/debian/docs
rename to debian/_base/applications/utilities/keep/debian/docs
diff --git a/debian/_base/applications/tdesudo/debian/patches/series b/debian/_base/applications/utilities/keep/debian/patches/series
similarity index 100%
rename from debian/_base/applications/tdesudo/debian/patches/series
rename to debian/_base/applications/utilities/keep/debian/patches/series
diff --git a/debian/_base/applications/tdenetworkmanager/debian/rules b/debian/_base/applications/utilities/keep/debian/rules
similarity index 100%
rename from debian/_base/applications/tdenetworkmanager/debian/rules
rename to debian/_base/applications/utilities/keep/debian/rules
diff --git a/debian/_base/applications/tdmtheme/debian/source/format b/debian/_base/applications/utilities/keep/debian/source/format
similarity index 100%
rename from debian/_base/applications/tdmtheme/debian/source/format
rename to debian/_base/applications/utilities/keep/debian/source/format
diff --git a/debian/_base/applications/tdmtheme/debian/source/options b/debian/_base/applications/utilities/keep/debian/source/options
similarity index 100%
rename from debian/_base/applications/tdmtheme/debian/source/options
rename to debian/_base/applications/utilities/keep/debian/source/options
diff --git a/debian/_base/applications/tellico/debian/cdbs/debian-tde.mk b/debian/_base/applications/utilities/knutclient/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/tellico/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/utilities/knutclient/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/tellico/debian/cdbs/versions.pl b/debian/_base/applications/utilities/knutclient/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/tellico/debian/cdbs/versions.pl
rename to debian/_base/applications/utilities/knutclient/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/knutclient/debian/changelog b/debian/_base/applications/utilities/knutclient/debian/changelog
similarity index 100%
rename from debian/_base/applications/knutclient/debian/changelog
rename to debian/_base/applications/utilities/knutclient/debian/changelog
diff --git a/debian/_base/applications/tellico/debian/compat b/debian/_base/applications/utilities/knutclient/debian/compat
similarity index 100%
rename from debian/_base/applications/tellico/debian/compat
rename to debian/_base/applications/utilities/knutclient/debian/compat
diff --git a/debian/_base/applications/knutclient/debian/control b/debian/_base/applications/utilities/knutclient/debian/control
similarity index 100%
rename from debian/_base/applications/knutclient/debian/control
rename to debian/_base/applications/utilities/knutclient/debian/control
diff --git a/debian/_base/applications/knutclient/debian/copyright b/debian/_base/applications/utilities/knutclient/debian/copyright
similarity index 100%
rename from debian/_base/applications/knutclient/debian/copyright
rename to debian/_base/applications/utilities/knutclient/debian/copyright
diff --git a/debian/_base/applications/twin-style-crystal/debian/docs b/debian/_base/applications/utilities/knutclient/debian/docs
similarity index 100%
rename from debian/_base/applications/twin-style-crystal/debian/docs
rename to debian/_base/applications/utilities/knutclient/debian/docs
diff --git a/debian/_base/applications/knutclient/debian/knutclient-trinity.menu b/debian/_base/applications/utilities/knutclient/debian/knutclient-trinity.menu
similarity index 100%
rename from debian/_base/applications/knutclient/debian/knutclient-trinity.menu
rename to debian/_base/applications/utilities/knutclient/debian/knutclient-trinity.menu
diff --git a/debian/_base/applications/twin-style-crystal/debian/rules b/debian/_base/applications/utilities/knutclient/debian/rules
similarity index 100%
rename from debian/_base/applications/twin-style-crystal/debian/rules
rename to debian/_base/applications/utilities/knutclient/debian/rules
diff --git a/debian/_base/applications/tellico/debian/source/format b/debian/_base/applications/utilities/knutclient/debian/source/format
similarity index 100%
rename from debian/_base/applications/tellico/debian/source/format
rename to debian/_base/applications/utilities/knutclient/debian/source/format
diff --git a/debian/_base/applications/tellico/debian/source/options b/debian/_base/applications/utilities/knutclient/debian/source/options
similarity index 100%
rename from debian/_base/applications/tellico/debian/source/options
rename to debian/_base/applications/utilities/knutclient/debian/source/options
diff --git a/debian/_base/applications/tork/debian/cdbs/debian-tde.mk b/debian/_base/applications/utilities/kompose/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/tork/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/utilities/kompose/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/tork/debian/cdbs/versions.pl b/debian/_base/applications/utilities/kompose/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/tork/debian/cdbs/versions.pl
rename to debian/_base/applications/utilities/kompose/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kompose/debian/changelog b/debian/_base/applications/utilities/kompose/debian/changelog
similarity index 100%
rename from debian/_base/applications/kompose/debian/changelog
rename to debian/_base/applications/utilities/kompose/debian/changelog
diff --git a/debian/_base/applications/tork/debian/compat b/debian/_base/applications/utilities/kompose/debian/compat
similarity index 100%
rename from debian/_base/applications/tork/debian/compat
rename to debian/_base/applications/utilities/kompose/debian/compat
diff --git a/debian/_base/applications/kompose/debian/control b/debian/_base/applications/utilities/kompose/debian/control
similarity index 100%
rename from debian/_base/applications/kompose/debian/control
rename to debian/_base/applications/utilities/kompose/debian/control
diff --git a/debian/_base/applications/kompose/debian/copyright b/debian/_base/applications/utilities/kompose/debian/copyright
similarity index 100%
rename from debian/_base/applications/kompose/debian/copyright
rename to debian/_base/applications/utilities/kompose/debian/copyright
diff --git a/debian/_base/applications/tdeio-umountwrapper/debian/docs b/debian/_base/applications/utilities/kompose/debian/docs
similarity index 100%
rename from debian/_base/applications/tdeio-umountwrapper/debian/docs
rename to debian/_base/applications/utilities/kompose/debian/docs
diff --git a/debian/_base/applications/kompose/debian/kompose-trinity.menu b/debian/_base/applications/utilities/kompose/debian/kompose-trinity.menu
similarity index 100%
rename from debian/_base/applications/kompose/debian/kompose-trinity.menu
rename to debian/_base/applications/utilities/kompose/debian/kompose-trinity.menu
diff --git a/debian/_base/applications/tdesvn/debian/patches/series b/debian/_base/applications/utilities/kompose/debian/patches/series
similarity index 100%
rename from debian/_base/applications/tdesvn/debian/patches/series
rename to debian/_base/applications/utilities/kompose/debian/patches/series
diff --git a/debian/_base/applications/tdepacman/debian/rules b/debian/_base/applications/utilities/kompose/debian/rules
similarity index 100%
rename from debian/_base/applications/tdepacman/debian/rules
rename to debian/_base/applications/utilities/kompose/debian/rules
diff --git a/debian/_base/applications/tork/debian/source/format b/debian/_base/applications/utilities/kompose/debian/source/format
similarity index 100%
rename from debian/_base/applications/tork/debian/source/format
rename to debian/_base/applications/utilities/kompose/debian/source/format
diff --git a/debian/_base/applications/tork/debian/source/options b/debian/_base/applications/utilities/kompose/debian/source/options
similarity index 100%
rename from debian/_base/applications/tork/debian/source/options
rename to debian/_base/applications/utilities/kompose/debian/source/options
diff --git a/debian/_base/applications/twin-style-crystal/debian/cdbs/debian-tde.mk b/debian/_base/applications/utilities/krename/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/twin-style-crystal/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/utilities/krename/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/twin-style-crystal/debian/cdbs/versions.pl b/debian/_base/applications/utilities/krename/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/twin-style-crystal/debian/cdbs/versions.pl
rename to debian/_base/applications/utilities/krename/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/krename/debian/changelog b/debian/_base/applications/utilities/krename/debian/changelog
similarity index 100%
rename from debian/_base/applications/krename/debian/changelog
rename to debian/_base/applications/utilities/krename/debian/changelog
diff --git a/debian/_base/applications/twin-style-crystal/debian/compat b/debian/_base/applications/utilities/krename/debian/compat
similarity index 100%
rename from debian/_base/applications/twin-style-crystal/debian/compat
rename to debian/_base/applications/utilities/krename/debian/compat
diff --git a/debian/_base/applications/krename/debian/control b/debian/_base/applications/utilities/krename/debian/control
similarity index 100%
rename from debian/_base/applications/krename/debian/control
rename to debian/_base/applications/utilities/krename/debian/control
diff --git a/debian/_base/applications/krename/debian/copyright b/debian/_base/applications/utilities/krename/debian/copyright
similarity index 100%
rename from debian/_base/applications/krename/debian/copyright
rename to debian/_base/applications/utilities/krename/debian/copyright
diff --git a/debian/_base/applications/tork/debian/docs b/debian/_base/applications/utilities/krename/debian/docs
similarity index 100%
rename from debian/_base/applications/tork/debian/docs
rename to debian/_base/applications/utilities/krename/debian/docs
diff --git a/debian/_base/applications/twin-style-crystal/debian/patches/series b/debian/_base/applications/utilities/krename/debian/patches/series
similarity index 100%
rename from debian/_base/applications/twin-style-crystal/debian/patches/series
rename to debian/_base/applications/utilities/krename/debian/patches/series
diff --git a/debian/_base/applications/twin-style-suse2/debian/rules b/debian/_base/applications/utilities/krename/debian/rules
similarity index 100%
rename from debian/_base/applications/twin-style-suse2/debian/rules
rename to debian/_base/applications/utilities/krename/debian/rules
diff --git a/debian/_base/applications/twin-style-crystal/debian/source/format b/debian/_base/applications/utilities/krename/debian/source/format
similarity index 100%
rename from debian/_base/applications/twin-style-crystal/debian/source/format
rename to debian/_base/applications/utilities/krename/debian/source/format
diff --git a/debian/_base/applications/twin-style-crystal/debian/source/options b/debian/_base/applications/utilities/krename/debian/source/options
similarity index 100%
rename from debian/_base/applications/twin-style-crystal/debian/source/options
rename to debian/_base/applications/utilities/krename/debian/source/options
diff --git a/debian/_base/applications/twin-style-suse2/debian/cdbs/debian-tde.mk b/debian/_base/applications/utilities/ksensors/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/twin-style-suse2/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/utilities/ksensors/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/twin-style-suse2/debian/cdbs/versions.pl b/debian/_base/applications/utilities/ksensors/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/twin-style-suse2/debian/cdbs/versions.pl
rename to debian/_base/applications/utilities/ksensors/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/ksensors/debian/changelog b/debian/_base/applications/utilities/ksensors/debian/changelog
similarity index 100%
rename from debian/_base/applications/ksensors/debian/changelog
rename to debian/_base/applications/utilities/ksensors/debian/changelog
diff --git a/debian/_base/applications/twin-style-suse2/debian/compat b/debian/_base/applications/utilities/ksensors/debian/compat
similarity index 100%
rename from debian/_base/applications/twin-style-suse2/debian/compat
rename to debian/_base/applications/utilities/ksensors/debian/compat
diff --git a/debian/_base/applications/ksensors/debian/control b/debian/_base/applications/utilities/ksensors/debian/control
similarity index 100%
rename from debian/_base/applications/ksensors/debian/control
rename to debian/_base/applications/utilities/ksensors/debian/control
diff --git a/debian/_base/applications/ksensors/debian/copyright b/debian/_base/applications/utilities/ksensors/debian/copyright
similarity index 100%
rename from debian/_base/applications/ksensors/debian/copyright
rename to debian/_base/applications/utilities/ksensors/debian/copyright
diff --git a/debian/_base/applications/ksensors/debian/dirs b/debian/_base/applications/utilities/ksensors/debian/dirs
similarity index 100%
rename from debian/_base/applications/ksensors/debian/dirs
rename to debian/_base/applications/utilities/ksensors/debian/dirs
diff --git a/debian/_base/applications/yakuake/debian/docs b/debian/_base/applications/utilities/ksensors/debian/docs
similarity index 100%
rename from debian/_base/applications/yakuake/debian/docs
rename to debian/_base/applications/utilities/ksensors/debian/docs
diff --git a/debian/_base/applications/ksensors/debian/ksensors-trinity.menu b/debian/_base/applications/utilities/ksensors/debian/ksensors-trinity.menu
similarity index 100%
rename from debian/_base/applications/ksensors/debian/ksensors-trinity.menu
rename to debian/_base/applications/utilities/ksensors/debian/ksensors-trinity.menu
diff --git a/debian/_base/applications/twin-style-suse2/debian/patches/series b/debian/_base/applications/utilities/ksensors/debian/patches/series
similarity index 100%
rename from debian/_base/applications/twin-style-suse2/debian/patches/series
rename to debian/_base/applications/utilities/ksensors/debian/patches/series
diff --git a/debian/_base/applications/ksensors/debian/rules b/debian/_base/applications/utilities/ksensors/debian/rules
similarity index 100%
rename from debian/_base/applications/ksensors/debian/rules
rename to debian/_base/applications/utilities/ksensors/debian/rules
diff --git a/debian/_base/applications/twin-style-suse2/debian/source/format b/debian/_base/applications/utilities/ksensors/debian/source/format
similarity index 100%
rename from debian/_base/applications/twin-style-suse2/debian/source/format
rename to debian/_base/applications/utilities/ksensors/debian/source/format
diff --git a/debian/_base/applications/twin-style-suse2/debian/source/options b/debian/_base/applications/utilities/ksensors/debian/source/options
similarity index 100%
rename from debian/_base/applications/twin-style-suse2/debian/source/options
rename to debian/_base/applications/utilities/ksensors/debian/source/options
diff --git a/debian/_base/applications/wlassistant/debian/cdbs/debian-tde.mk b/debian/_base/applications/utilities/mathemagics/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/wlassistant/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/utilities/mathemagics/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/wlassistant/debian/cdbs/versions.pl b/debian/_base/applications/utilities/mathemagics/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/wlassistant/debian/cdbs/versions.pl
rename to debian/_base/applications/utilities/mathemagics/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/mathemagics/debian/changelog b/debian/_base/applications/utilities/mathemagics/debian/changelog
similarity index 100%
rename from debian/_base/applications/mathemagics/debian/changelog
rename to debian/_base/applications/utilities/mathemagics/debian/changelog
diff --git a/debian/_base/applications/wlassistant/debian/compat b/debian/_base/applications/utilities/mathemagics/debian/compat
similarity index 100%
rename from debian/_base/applications/wlassistant/debian/compat
rename to debian/_base/applications/utilities/mathemagics/debian/compat
diff --git a/debian/_base/applications/mathemagics/debian/control b/debian/_base/applications/utilities/mathemagics/debian/control
similarity index 100%
rename from debian/_base/applications/mathemagics/debian/control
rename to debian/_base/applications/utilities/mathemagics/debian/control
diff --git a/debian/_base/applications/mathemagics/debian/copyright b/debian/_base/applications/utilities/mathemagics/debian/copyright
similarity index 100%
rename from debian/_base/applications/mathemagics/debian/copyright
rename to debian/_base/applications/utilities/mathemagics/debian/copyright
diff --git a/debian/_base/applications/tdmtheme/debian/docs b/debian/_base/applications/utilities/mathemagics/debian/docs
similarity index 100%
rename from debian/_base/applications/tdmtheme/debian/docs
rename to debian/_base/applications/utilities/mathemagics/debian/docs
diff --git a/debian/_base/applications/wlassistant/debian/patches/series b/debian/_base/applications/utilities/mathemagics/debian/patches/series
similarity index 100%
rename from debian/_base/applications/wlassistant/debian/patches/series
rename to debian/_base/applications/utilities/mathemagics/debian/patches/series
diff --git a/debian/_base/applications/yakuake/debian/rules b/debian/_base/applications/utilities/mathemagics/debian/rules
similarity index 100%
rename from debian/_base/applications/yakuake/debian/rules
rename to debian/_base/applications/utilities/mathemagics/debian/rules
diff --git a/debian/_base/applications/wlassistant/debian/source/format b/debian/_base/applications/utilities/mathemagics/debian/source/format
similarity index 100%
rename from debian/_base/applications/wlassistant/debian/source/format
rename to debian/_base/applications/utilities/mathemagics/debian/source/format
diff --git a/debian/_base/applications/wlassistant/debian/source/options b/debian/_base/applications/utilities/mathemagics/debian/source/options
similarity index 100%
rename from debian/_base/applications/wlassistant/debian/source/options
rename to debian/_base/applications/utilities/mathemagics/debian/source/options
diff --git a/debian/_base/applications/yakuake/debian/cdbs/debian-tde.mk b/debian/_base/applications/utilities/qalculate-tde/debian/cdbs/debian-tde.mk
similarity index 100%
rename from debian/_base/applications/yakuake/debian/cdbs/debian-tde.mk
rename to debian/_base/applications/utilities/qalculate-tde/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/yakuake/debian/cdbs/versions.pl b/debian/_base/applications/utilities/qalculate-tde/debian/cdbs/versions.pl
similarity index 100%
rename from debian/_base/applications/yakuake/debian/cdbs/versions.pl
rename to debian/_base/applications/utilities/qalculate-tde/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/qalculate-tde/debian/changelog b/debian/_base/applications/utilities/qalculate-tde/debian/changelog
similarity index 100%
rename from debian/_base/applications/qalculate-tde/debian/changelog
rename to debian/_base/applications/utilities/qalculate-tde/debian/changelog
diff --git a/debian/_base/applications/yakuake/debian/compat b/debian/_base/applications/utilities/qalculate-tde/debian/compat
similarity index 100%
rename from debian/_base/applications/yakuake/debian/compat
rename to debian/_base/applications/utilities/qalculate-tde/debian/compat
diff --git a/debian/_base/applications/qalculate-tde/debian/control b/debian/_base/applications/utilities/qalculate-tde/debian/control
similarity index 100%
rename from debian/_base/applications/qalculate-tde/debian/control
rename to debian/_base/applications/utilities/qalculate-tde/debian/control
diff --git a/debian/_base/applications/qalculate-tde/debian/copyright b/debian/_base/applications/utilities/qalculate-tde/debian/copyright
similarity index 100%
rename from debian/_base/applications/qalculate-tde/debian/copyright
rename to debian/_base/applications/utilities/qalculate-tde/debian/copyright
diff --git a/debian/_base/applications/tde-style-ia-ora/debian/patches/series b/debian/_base/applications/utilities/qalculate-tde/debian/patches/series
similarity index 100%
rename from debian/_base/applications/tde-style-ia-ora/debian/patches/series
rename to debian/_base/applications/utilities/qalculate-tde/debian/patches/series
diff --git a/debian/_base/applications/qalculate-tde/debian/qalculate-tde.1 b/debian/_base/applications/utilities/qalculate-tde/debian/qalculate-tde.1
similarity index 100%
rename from debian/_base/applications/qalculate-tde/debian/qalculate-tde.1
rename to debian/_base/applications/utilities/qalculate-tde/debian/qalculate-tde.1
diff --git a/debian/_base/applications/qalculate-tde/debian/qalculate-trinity.manpages b/debian/_base/applications/utilities/qalculate-tde/debian/qalculate-trinity.manpages
similarity index 100%
rename from debian/_base/applications/qalculate-tde/debian/qalculate-trinity.manpages
rename to debian/_base/applications/utilities/qalculate-tde/debian/qalculate-trinity.manpages
diff --git a/debian/_base/applications/qalculate-tde/debian/qalculate-trinity.menu b/debian/_base/applications/utilities/qalculate-tde/debian/qalculate-trinity.menu
similarity index 100%
rename from debian/_base/applications/qalculate-tde/debian/qalculate-trinity.menu
rename to debian/_base/applications/utilities/qalculate-tde/debian/qalculate-trinity.menu
diff --git a/debian/_base/applications/qalculate-tde/debian/qalculate-trinity.postinst b/debian/_base/applications/utilities/qalculate-tde/debian/qalculate-trinity.postinst
similarity index 100%
rename from debian/_base/applications/qalculate-tde/debian/qalculate-trinity.postinst
rename to debian/_base/applications/utilities/qalculate-tde/debian/qalculate-trinity.postinst
diff --git a/debian/_base/applications/qalculate-tde/debian/qalculate-trinity.prerm b/debian/_base/applications/utilities/qalculate-tde/debian/qalculate-trinity.prerm
similarity index 100%
rename from debian/_base/applications/qalculate-tde/debian/qalculate-trinity.prerm
rename to debian/_base/applications/utilities/qalculate-tde/debian/qalculate-trinity.prerm
diff --git a/debian/_base/applications/qalculate-tde/debian/rules b/debian/_base/applications/utilities/qalculate-tde/debian/rules
similarity index 100%
rename from debian/_base/applications/qalculate-tde/debian/rules
rename to debian/_base/applications/utilities/qalculate-tde/debian/rules
diff --git a/debian/_base/applications/yakuake/debian/source/format b/debian/_base/applications/utilities/qalculate-tde/debian/source/format
similarity index 100%
rename from debian/_base/applications/yakuake/debian/source/format
rename to debian/_base/applications/utilities/qalculate-tde/debian/source/format
diff --git a/debian/_base/applications/yakuake/debian/source/options b/debian/_base/applications/utilities/qalculate-tde/debian/source/options
similarity index 100%
rename from debian/_base/applications/yakuake/debian/source/options
rename to debian/_base/applications/utilities/qalculate-tde/debian/source/options
diff --git a/debian/_base/applications/qalculate-tde/debian/watch b/debian/_base/applications/utilities/qalculate-tde/debian/watch
similarity index 100%
rename from debian/_base/applications/qalculate-tde/debian/watch
rename to debian/_base/applications/utilities/qalculate-tde/debian/watch
diff --git a/ubuntu/_base/applications/abakus/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/development/kdbg/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/abakus/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/development/kdbg/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/abakus/debian/cdbs/versions.pl b/ubuntu/_base/applications/development/kdbg/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/abakus/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/development/kdbg/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kdbg/debian/changelog b/ubuntu/_base/applications/development/kdbg/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kdbg/debian/changelog
rename to ubuntu/_base/applications/development/kdbg/debian/changelog
diff --git a/ubuntu/_base/applications/abakus/debian/compat b/ubuntu/_base/applications/development/kdbg/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/abakus/debian/compat
rename to ubuntu/_base/applications/development/kdbg/debian/compat
diff --git a/ubuntu/_base/applications/kdbg/debian/control b/ubuntu/_base/applications/development/kdbg/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kdbg/debian/control
rename to ubuntu/_base/applications/development/kdbg/debian/control
diff --git a/ubuntu/_base/applications/kdbg/debian/copyright b/ubuntu/_base/applications/development/kdbg/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kdbg/debian/copyright
rename to ubuntu/_base/applications/development/kdbg/debian/copyright
diff --git a/ubuntu/_base/applications/kdbg/debian/doc-base b/ubuntu/_base/applications/development/kdbg/debian/doc-base
similarity index 100%
rename from ubuntu/_base/applications/kdbg/debian/doc-base
rename to ubuntu/_base/applications/development/kdbg/debian/doc-base
diff --git a/ubuntu/_base/applications/kdbg/debian/docs b/ubuntu/_base/applications/development/kdbg/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/kdbg/debian/docs
rename to ubuntu/_base/applications/development/kdbg/debian/docs
diff --git a/ubuntu/_base/applications/kdbg/debian/install b/ubuntu/_base/applications/development/kdbg/debian/install
similarity index 100%
rename from ubuntu/_base/applications/kdbg/debian/install
rename to ubuntu/_base/applications/development/kdbg/debian/install
diff --git a/ubuntu/_base/applications/kdbg/debian/menu b/ubuntu/_base/applications/development/kdbg/debian/menu
similarity index 100%
rename from ubuntu/_base/applications/kdbg/debian/menu
rename to ubuntu/_base/applications/development/kdbg/debian/menu
diff --git a/ubuntu/_base/applications/kdbg/debian/rules b/ubuntu/_base/applications/development/kdbg/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kdbg/debian/rules
rename to ubuntu/_base/applications/development/kdbg/debian/rules
diff --git a/ubuntu/_base/applications/abakus/debian/source/format b/ubuntu/_base/applications/development/kdbg/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/abakus/debian/source/format
rename to ubuntu/_base/applications/development/kdbg/debian/source/format
diff --git a/ubuntu/_base/applications/abakus/debian/source/options b/ubuntu/_base/applications/development/kdbg/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/abakus/debian/source/options
rename to ubuntu/_base/applications/development/kdbg/debian/source/options
diff --git a/ubuntu/_base/applications/amarok/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/development/kdiff3/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/amarok/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/development/kdiff3/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/amarok/debian/cdbs/versions.pl b/ubuntu/_base/applications/development/kdiff3/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/amarok/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/development/kdiff3/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kdiff3/debian/changelog b/ubuntu/_base/applications/development/kdiff3/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kdiff3/debian/changelog
rename to ubuntu/_base/applications/development/kdiff3/debian/changelog
diff --git a/ubuntu/_base/applications/amarok/debian/compat b/ubuntu/_base/applications/development/kdiff3/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/amarok/debian/compat
rename to ubuntu/_base/applications/development/kdiff3/debian/compat
diff --git a/ubuntu/_base/applications/kdiff3/debian/control b/ubuntu/_base/applications/development/kdiff3/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kdiff3/debian/control
rename to ubuntu/_base/applications/development/kdiff3/debian/control
diff --git a/ubuntu/_base/applications/kdiff3/debian/copyright b/ubuntu/_base/applications/development/kdiff3/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kdiff3/debian/copyright
rename to ubuntu/_base/applications/development/kdiff3/debian/copyright
diff --git a/ubuntu/_base/applications/abakus/debian/docs b/ubuntu/_base/applications/development/kdiff3/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/abakus/debian/docs
rename to ubuntu/_base/applications/development/kdiff3/debian/docs
diff --git a/ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity-doc.doc-base b/ubuntu/_base/applications/development/kdiff3/debian/kdiff3-trinity-doc.doc-base
similarity index 100%
rename from ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity-doc.doc-base
rename to ubuntu/_base/applications/development/kdiff3/debian/kdiff3-trinity-doc.doc-base
diff --git a/ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity-doc.install b/ubuntu/_base/applications/development/kdiff3/debian/kdiff3-trinity-doc.install
similarity index 100%
rename from ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity-doc.install
rename to ubuntu/_base/applications/development/kdiff3/debian/kdiff3-trinity-doc.install
diff --git a/ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity-doc.links b/ubuntu/_base/applications/development/kdiff3/debian/kdiff3-trinity-doc.links
similarity index 100%
rename from ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity-doc.links
rename to ubuntu/_base/applications/development/kdiff3/debian/kdiff3-trinity-doc.links
diff --git a/ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity.install b/ubuntu/_base/applications/development/kdiff3/debian/kdiff3-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity.install
rename to ubuntu/_base/applications/development/kdiff3/debian/kdiff3-trinity.install
diff --git a/ubuntu/_base/applications/kbarcode/debian/patches/.gitignore b/ubuntu/_base/applications/development/kdiff3/debian/patches/.gitignore
similarity index 100%
rename from ubuntu/_base/applications/kbarcode/debian/patches/.gitignore
rename to ubuntu/_base/applications/development/kdiff3/debian/patches/.gitignore
diff --git a/ubuntu/_base/applications/basket/debian/rules b/ubuntu/_base/applications/development/kdiff3/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/basket/debian/rules
rename to ubuntu/_base/applications/development/kdiff3/debian/rules
diff --git a/ubuntu/_base/applications/amarok/debian/source/format b/ubuntu/_base/applications/development/kdiff3/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/amarok/debian/source/format
rename to ubuntu/_base/applications/development/kdiff3/debian/source/format
diff --git a/ubuntu/_base/applications/amarok/debian/source/options b/ubuntu/_base/applications/development/kdiff3/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/amarok/debian/source/options
rename to ubuntu/_base/applications/development/kdiff3/debian/source/options
diff --git a/ubuntu/_base/applications/basket/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/development/kpicosim/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/basket/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/development/kpicosim/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/basket/debian/cdbs/versions.pl b/ubuntu/_base/applications/development/kpicosim/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/basket/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/development/kpicosim/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kpicosim/debian/changelog b/ubuntu/_base/applications/development/kpicosim/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kpicosim/debian/changelog
rename to ubuntu/_base/applications/development/kpicosim/debian/changelog
diff --git a/ubuntu/_base/applications/basket/debian/compat b/ubuntu/_base/applications/development/kpicosim/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/basket/debian/compat
rename to ubuntu/_base/applications/development/kpicosim/debian/compat
diff --git a/ubuntu/_base/applications/kpicosim/debian/control b/ubuntu/_base/applications/development/kpicosim/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kpicosim/debian/control
rename to ubuntu/_base/applications/development/kpicosim/debian/control
diff --git a/ubuntu/_base/applications/kpicosim/debian/copyright b/ubuntu/_base/applications/development/kpicosim/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kpicosim/debian/copyright
rename to ubuntu/_base/applications/development/kpicosim/debian/copyright
diff --git a/ubuntu/_base/applications/kaffeine-mozilla/debian/docs b/ubuntu/_base/applications/development/kpicosim/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/kaffeine-mozilla/debian/docs
rename to ubuntu/_base/applications/development/kpicosim/debian/docs
diff --git a/ubuntu/_base/applications/kpicosim/debian/kpicosim-trinity.links b/ubuntu/_base/applications/development/kpicosim/debian/kpicosim-trinity.links
similarity index 100%
rename from ubuntu/_base/applications/kpicosim/debian/kpicosim-trinity.links
rename to ubuntu/_base/applications/development/kpicosim/debian/kpicosim-trinity.links
diff --git a/ubuntu/_base/applications/kpicosim/debian/kpicosim-trinity.menu b/ubuntu/_base/applications/development/kpicosim/debian/kpicosim-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/kpicosim/debian/kpicosim-trinity.menu
rename to ubuntu/_base/applications/development/kpicosim/debian/kpicosim-trinity.menu
diff --git a/ubuntu/_base/applications/codeine/debian/rules b/ubuntu/_base/applications/development/kpicosim/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/codeine/debian/rules
rename to ubuntu/_base/applications/development/kpicosim/debian/rules
diff --git a/ubuntu/_base/applications/basket/debian/source/format b/ubuntu/_base/applications/development/kpicosim/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/basket/debian/source/format
rename to ubuntu/_base/applications/development/kpicosim/debian/source/format
diff --git a/ubuntu/_base/applications/basket/debian/source/options b/ubuntu/_base/applications/development/kpicosim/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/basket/debian/source/options
rename to ubuntu/_base/applications/development/kpicosim/debian/source/options
diff --git a/ubuntu/_base/applications/bibletime/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/development/kscope/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/bibletime/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/development/kscope/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/bibletime/debian/cdbs/versions.pl b/ubuntu/_base/applications/development/kscope/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/bibletime/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/development/kscope/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kscope/debian/changelog b/ubuntu/_base/applications/development/kscope/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kscope/debian/changelog
rename to ubuntu/_base/applications/development/kscope/debian/changelog
diff --git a/ubuntu/_base/applications/bibletime/debian/compat b/ubuntu/_base/applications/development/kscope/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/bibletime/debian/compat
rename to ubuntu/_base/applications/development/kscope/debian/compat
diff --git a/ubuntu/_base/applications/kscope/debian/control b/ubuntu/_base/applications/development/kscope/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kscope/debian/control
rename to ubuntu/_base/applications/development/kscope/debian/control
diff --git a/ubuntu/_base/applications/kscope/debian/copyright b/ubuntu/_base/applications/development/kscope/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kscope/debian/copyright
rename to ubuntu/_base/applications/development/kscope/debian/copyright
diff --git a/ubuntu/_base/applications/kscope/debian/docs b/ubuntu/_base/applications/development/kscope/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/kscope/debian/docs
rename to ubuntu/_base/applications/development/kscope/debian/docs
diff --git a/ubuntu/_base/applications/kscope/debian/patches/04_am_maintainer_mode.diff b/ubuntu/_base/applications/development/kscope/debian/patches/04_am_maintainer_mode.diff
similarity index 100%
rename from ubuntu/_base/applications/kscope/debian/patches/04_am_maintainer_mode.diff
rename to ubuntu/_base/applications/development/kscope/debian/patches/04_am_maintainer_mode.diff
diff --git a/ubuntu/_base/applications/kscope/debian/patches/06_disable_no_undefined.diff b/ubuntu/_base/applications/development/kscope/debian/patches/06_disable_no_undefined.diff
similarity index 100%
rename from ubuntu/_base/applications/kscope/debian/patches/06_disable_no_undefined.diff
rename to ubuntu/_base/applications/development/kscope/debian/patches/06_disable_no_undefined.diff
diff --git a/ubuntu/_base/applications/kscope/debian/patches/series b/ubuntu/_base/applications/development/kscope/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/kscope/debian/patches/series
rename to ubuntu/_base/applications/development/kscope/debian/patches/series
diff --git a/ubuntu/_base/applications/gwenview-i18n/debian/rules b/ubuntu/_base/applications/development/kscope/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/gwenview-i18n/debian/rules
rename to ubuntu/_base/applications/development/kscope/debian/rules
diff --git a/ubuntu/_base/applications/bibletime/debian/source/format b/ubuntu/_base/applications/development/kscope/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/bibletime/debian/source/format
rename to ubuntu/_base/applications/development/kscope/debian/source/format
diff --git a/ubuntu/_base/applications/bibletime/debian/source/options b/ubuntu/_base/applications/development/kscope/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/bibletime/debian/source/options
rename to ubuntu/_base/applications/development/kscope/debian/source/options
diff --git a/ubuntu/_base/applications/codeine/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/development/ktechlab/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/codeine/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/development/ktechlab/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/codeine/debian/cdbs/versions.pl b/ubuntu/_base/applications/development/ktechlab/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/codeine/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/development/ktechlab/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/ktechlab/debian/changelog b/ubuntu/_base/applications/development/ktechlab/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/ktechlab/debian/changelog
rename to ubuntu/_base/applications/development/ktechlab/debian/changelog
diff --git a/ubuntu/_base/applications/codeine/debian/compat b/ubuntu/_base/applications/development/ktechlab/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/codeine/debian/compat
rename to ubuntu/_base/applications/development/ktechlab/debian/compat
diff --git a/ubuntu/_base/applications/ktechlab/debian/control b/ubuntu/_base/applications/development/ktechlab/debian/control
similarity index 100%
rename from ubuntu/_base/applications/ktechlab/debian/control
rename to ubuntu/_base/applications/development/ktechlab/debian/control
diff --git a/ubuntu/_base/applications/ktechlab/debian/copyright b/ubuntu/_base/applications/development/ktechlab/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/ktechlab/debian/copyright
rename to ubuntu/_base/applications/development/ktechlab/debian/copyright
diff --git a/ubuntu/_base/applications/kile/debian/docs b/ubuntu/_base/applications/development/ktechlab/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/kile/debian/docs
rename to ubuntu/_base/applications/development/ktechlab/debian/docs
diff --git a/ubuntu/_base/applications/ktechlab/debian/install b/ubuntu/_base/applications/development/ktechlab/debian/install
similarity index 100%
rename from ubuntu/_base/applications/ktechlab/debian/install
rename to ubuntu/_base/applications/development/ktechlab/debian/install
diff --git a/ubuntu/_base/applications/ktechlab/debian/menu b/ubuntu/_base/applications/development/ktechlab/debian/menu
similarity index 100%
rename from ubuntu/_base/applications/ktechlab/debian/menu
rename to ubuntu/_base/applications/development/ktechlab/debian/menu
diff --git a/ubuntu/_base/applications/kchmviewer/debian/patches/.gitignore b/ubuntu/_base/applications/development/ktechlab/debian/patches/.gitignore
similarity index 100%
rename from ubuntu/_base/applications/kchmviewer/debian/patches/.gitignore
rename to ubuntu/_base/applications/development/ktechlab/debian/patches/.gitignore
diff --git a/ubuntu/_base/applications/ktechlab/debian/rules b/ubuntu/_base/applications/development/ktechlab/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/ktechlab/debian/rules
rename to ubuntu/_base/applications/development/ktechlab/debian/rules
diff --git a/ubuntu/_base/applications/codeine/debian/source/format b/ubuntu/_base/applications/development/ktechlab/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/codeine/debian/source/format
rename to ubuntu/_base/applications/development/ktechlab/debian/source/format
diff --git a/ubuntu/_base/applications/codeine/debian/source/options b/ubuntu/_base/applications/development/ktechlab/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/codeine/debian/source/options
rename to ubuntu/_base/applications/development/ktechlab/debian/source/options
diff --git a/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/development/kxmleditor/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/development/kxmleditor/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl b/ubuntu/_base/applications/development/kxmleditor/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/development/kxmleditor/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kxmleditor/debian/changelog b/ubuntu/_base/applications/development/kxmleditor/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kxmleditor/debian/changelog
rename to ubuntu/_base/applications/development/kxmleditor/debian/changelog
diff --git a/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/compat b/ubuntu/_base/applications/development/kxmleditor/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/compat
rename to ubuntu/_base/applications/development/kxmleditor/debian/compat
diff --git a/ubuntu/_base/applications/kxmleditor/debian/control b/ubuntu/_base/applications/development/kxmleditor/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kxmleditor/debian/control
rename to ubuntu/_base/applications/development/kxmleditor/debian/control
diff --git a/ubuntu/_base/applications/kxmleditor/debian/copyright b/ubuntu/_base/applications/development/kxmleditor/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kxmleditor/debian/copyright
rename to ubuntu/_base/applications/development/kxmleditor/debian/copyright
diff --git a/ubuntu/_base/applications/kasablanca/debian/docs b/ubuntu/_base/applications/development/kxmleditor/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/kasablanca/debian/docs
rename to ubuntu/_base/applications/development/kxmleditor/debian/docs
diff --git a/ubuntu/_base/applications/kxmleditor/debian/menu b/ubuntu/_base/applications/development/kxmleditor/debian/menu
similarity index 100%
rename from ubuntu/_base/applications/kxmleditor/debian/menu
rename to ubuntu/_base/applications/development/kxmleditor/debian/menu
diff --git a/ubuntu/_base/applications/codeine/debian/patches/series b/ubuntu/_base/applications/development/kxmleditor/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/codeine/debian/patches/series
rename to ubuntu/_base/applications/development/kxmleditor/debian/patches/series
diff --git a/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/rules b/ubuntu/_base/applications/development/kxmleditor/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/rules
rename to ubuntu/_base/applications/development/kxmleditor/debian/rules
diff --git a/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/source/format b/ubuntu/_base/applications/development/kxmleditor/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/source/format
rename to ubuntu/_base/applications/development/kxmleditor/debian/source/format
diff --git a/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/source/options b/ubuntu/_base/applications/development/kxmleditor/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/source/options
rename to ubuntu/_base/applications/development/kxmleditor/debian/source/options
diff --git a/ubuntu/_base/applications/digikam/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/development/piklab/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/digikam/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/development/piklab/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/digikam/debian/cdbs/versions.pl b/ubuntu/_base/applications/development/piklab/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/digikam/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/development/piklab/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/piklab/debian/changelog b/ubuntu/_base/applications/development/piklab/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/piklab/debian/changelog
rename to ubuntu/_base/applications/development/piklab/debian/changelog
diff --git a/ubuntu/_base/applications/desktop-effects-tde/debian/compat b/ubuntu/_base/applications/development/piklab/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/desktop-effects-tde/debian/compat
rename to ubuntu/_base/applications/development/piklab/debian/compat
diff --git a/ubuntu/_base/applications/piklab/debian/control b/ubuntu/_base/applications/development/piklab/debian/control
similarity index 100%
rename from ubuntu/_base/applications/piklab/debian/control
rename to ubuntu/_base/applications/development/piklab/debian/control
diff --git a/ubuntu/_base/applications/piklab/debian/copyright b/ubuntu/_base/applications/development/piklab/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/piklab/debian/copyright
rename to ubuntu/_base/applications/development/piklab/debian/copyright
diff --git a/ubuntu/_base/applications/kiosktool/debian/docs b/ubuntu/_base/applications/development/piklab/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/kiosktool/debian/docs
rename to ubuntu/_base/applications/development/piklab/debian/docs
diff --git a/ubuntu/_base/applications/piklab/debian/install b/ubuntu/_base/applications/development/piklab/debian/install
similarity index 100%
rename from ubuntu/_base/applications/piklab/debian/install
rename to ubuntu/_base/applications/development/piklab/debian/install
diff --git a/ubuntu/_base/applications/piklab/debian/menu b/ubuntu/_base/applications/development/piklab/debian/menu
similarity index 100%
rename from ubuntu/_base/applications/piklab/debian/menu
rename to ubuntu/_base/applications/development/piklab/debian/menu
diff --git a/ubuntu/_base/applications/abakus/debian/patches/series b/ubuntu/_base/applications/development/piklab/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/abakus/debian/patches/series
rename to ubuntu/_base/applications/development/piklab/debian/patches/series
diff --git a/ubuntu/_base/applications/piklab/debian/piklab.desktop b/ubuntu/_base/applications/development/piklab/debian/piklab.desktop
similarity index 100%
rename from ubuntu/_base/applications/piklab/debian/piklab.desktop
rename to ubuntu/_base/applications/development/piklab/debian/piklab.desktop
diff --git a/ubuntu/_base/applications/piklab/debian/piklab.sng b/ubuntu/_base/applications/development/piklab/debian/piklab.sng
similarity index 100%
rename from ubuntu/_base/applications/piklab/debian/piklab.sng
rename to ubuntu/_base/applications/development/piklab/debian/piklab.sng
diff --git a/ubuntu/_base/applications/piklab/debian/piklab.xpm b/ubuntu/_base/applications/development/piklab/debian/piklab.xpm
similarity index 100%
rename from ubuntu/_base/applications/piklab/debian/piklab.xpm
rename to ubuntu/_base/applications/development/piklab/debian/piklab.xpm
diff --git a/ubuntu/_base/applications/piklab/debian/piklab48.xpm b/ubuntu/_base/applications/development/piklab/debian/piklab48.xpm
similarity index 100%
rename from ubuntu/_base/applications/piklab/debian/piklab48.xpm
rename to ubuntu/_base/applications/development/piklab/debian/piklab48.xpm
diff --git a/ubuntu/_base/applications/piklab/debian/rules b/ubuntu/_base/applications/development/piklab/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/piklab/debian/rules
rename to ubuntu/_base/applications/development/piklab/debian/rules
diff --git a/ubuntu/_base/applications/desktop-effects-tde/debian/source/format b/ubuntu/_base/applications/development/piklab/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/desktop-effects-tde/debian/source/format
rename to ubuntu/_base/applications/development/piklab/debian/source/format
diff --git a/ubuntu/_base/applications/desktop-effects-tde/debian/source/options b/ubuntu/_base/applications/development/piklab/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/desktop-effects-tde/debian/source/options
rename to ubuntu/_base/applications/development/piklab/debian/source/options
diff --git a/ubuntu/_base/applications/dolphin/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/development/tdesvn/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/dolphin/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/development/tdesvn/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/dolphin/debian/cdbs/versions.pl b/ubuntu/_base/applications/development/tdesvn/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/dolphin/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/development/tdesvn/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/tdesvn/debian/changelog b/ubuntu/_base/applications/development/tdesvn/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/tdesvn/debian/changelog
rename to ubuntu/_base/applications/development/tdesvn/debian/changelog
diff --git a/ubuntu/_base/applications/digikam/debian/compat b/ubuntu/_base/applications/development/tdesvn/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/digikam/debian/compat
rename to ubuntu/_base/applications/development/tdesvn/debian/compat
diff --git a/ubuntu/_base/applications/tdesvn/debian/control b/ubuntu/_base/applications/development/tdesvn/debian/control
similarity index 100%
rename from ubuntu/_base/applications/tdesvn/debian/control
rename to ubuntu/_base/applications/development/tdesvn/debian/control
diff --git a/ubuntu/_base/applications/tdesvn/debian/copyright b/ubuntu/_base/applications/development/tdesvn/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/tdesvn/debian/copyright
rename to ubuntu/_base/applications/development/tdesvn/debian/copyright
diff --git a/ubuntu/_base/applications/kbarcode/debian/docs b/ubuntu/_base/applications/development/tdesvn/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/kbarcode/debian/docs
rename to ubuntu/_base/applications/development/tdesvn/debian/docs
diff --git a/ubuntu/_base/applications/tdesvn/debian/icons/tdesvn.xpm b/ubuntu/_base/applications/development/tdesvn/debian/icons/tdesvn.xpm
similarity index 100%
rename from ubuntu/_base/applications/tdesvn/debian/icons/tdesvn.xpm
rename to ubuntu/_base/applications/development/tdesvn/debian/icons/tdesvn.xpm
diff --git a/ubuntu/_base/applications/tdesvn/debian/libsvnqt-trinity-dev.install b/ubuntu/_base/applications/development/tdesvn/debian/libsvnqt-trinity-dev.install
similarity index 100%
rename from ubuntu/_base/applications/tdesvn/debian/libsvnqt-trinity-dev.install
rename to ubuntu/_base/applications/development/tdesvn/debian/libsvnqt-trinity-dev.install
diff --git a/ubuntu/_base/applications/tdesvn/debian/libsvnqt4-trinity.install b/ubuntu/_base/applications/development/tdesvn/debian/libsvnqt4-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/tdesvn/debian/libsvnqt4-trinity.install
rename to ubuntu/_base/applications/development/tdesvn/debian/libsvnqt4-trinity.install
diff --git a/ubuntu/_base/applications/tdesvn/debian/man/tdesvn.1 b/ubuntu/_base/applications/development/tdesvn/debian/man/tdesvn.1
similarity index 100%
rename from ubuntu/_base/applications/tdesvn/debian/man/tdesvn.1
rename to ubuntu/_base/applications/development/tdesvn/debian/man/tdesvn.1
diff --git a/ubuntu/_base/applications/tdesvn/debian/man/tdesvnaskpass.1 b/ubuntu/_base/applications/development/tdesvn/debian/man/tdesvnaskpass.1
similarity index 100%
rename from ubuntu/_base/applications/tdesvn/debian/man/tdesvnaskpass.1
rename to ubuntu/_base/applications/development/tdesvn/debian/man/tdesvnaskpass.1
diff --git a/ubuntu/_base/applications/amarok/debian/patches/series b/ubuntu/_base/applications/development/tdesvn/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/amarok/debian/patches/series
rename to ubuntu/_base/applications/development/tdesvn/debian/patches/series
diff --git a/ubuntu/_base/applications/tdesvn/debian/rules b/ubuntu/_base/applications/development/tdesvn/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/tdesvn/debian/rules
rename to ubuntu/_base/applications/development/tdesvn/debian/rules
diff --git a/ubuntu/_base/applications/digikam/debian/source/format b/ubuntu/_base/applications/development/tdesvn/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/digikam/debian/source/format
rename to ubuntu/_base/applications/development/tdesvn/debian/source/format
diff --git a/ubuntu/_base/applications/digikam/debian/source/options b/ubuntu/_base/applications/development/tdesvn/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/digikam/debian/source/options
rename to ubuntu/_base/applications/development/tdesvn/debian/source/options
diff --git a/ubuntu/_base/applications/tdesvn/debian/tdesvn-tdeio-plugins-trinity.install b/ubuntu/_base/applications/development/tdesvn/debian/tdesvn-tdeio-plugins-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/tdesvn/debian/tdesvn-tdeio-plugins-trinity.install
rename to ubuntu/_base/applications/development/tdesvn/debian/tdesvn-tdeio-plugins-trinity.install
diff --git a/ubuntu/_base/applications/tdesvn/debian/tdesvn-trinity.install b/ubuntu/_base/applications/development/tdesvn/debian/tdesvn-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/tdesvn/debian/tdesvn-trinity.install
rename to ubuntu/_base/applications/development/tdesvn/debian/tdesvn-trinity.install
diff --git a/ubuntu/_base/applications/tdesvn/debian/tdesvn-trinity.manpages b/ubuntu/_base/applications/development/tdesvn/debian/tdesvn-trinity.manpages
similarity index 100%
rename from ubuntu/_base/applications/tdesvn/debian/tdesvn-trinity.manpages
rename to ubuntu/_base/applications/development/tdesvn/debian/tdesvn-trinity.manpages
diff --git a/ubuntu/_base/applications/tdesvn/debian/tdesvn-trinity.menu b/ubuntu/_base/applications/development/tdesvn/debian/tdesvn-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/tdesvn/debian/tdesvn-trinity.menu
rename to ubuntu/_base/applications/development/tdesvn/debian/tdesvn-trinity.menu
diff --git a/ubuntu/_base/applications/tdesvn/debian/watch b/ubuntu/_base/applications/development/tdesvn/debian/watch
similarity index 100%
rename from ubuntu/_base/applications/tdesvn/debian/watch
rename to ubuntu/_base/applications/development/tdesvn/debian/watch
diff --git a/ubuntu/_base/applications/filelight/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/games/knights/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/filelight/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/games/knights/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/filelight/debian/cdbs/versions.pl b/ubuntu/_base/applications/games/knights/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/filelight/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/games/knights/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/knights/debian/changelog b/ubuntu/_base/applications/games/knights/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/knights/debian/changelog
rename to ubuntu/_base/applications/games/knights/debian/changelog
diff --git a/ubuntu/_base/applications/dolphin/debian/compat b/ubuntu/_base/applications/games/knights/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/dolphin/debian/compat
rename to ubuntu/_base/applications/games/knights/debian/compat
diff --git a/ubuntu/_base/applications/knights/debian/control b/ubuntu/_base/applications/games/knights/debian/control
similarity index 100%
rename from ubuntu/_base/applications/knights/debian/control
rename to ubuntu/_base/applications/games/knights/debian/control
diff --git a/ubuntu/_base/applications/knights/debian/copyright b/ubuntu/_base/applications/games/knights/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/knights/debian/copyright
rename to ubuntu/_base/applications/games/knights/debian/copyright
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/docs b/ubuntu/_base/applications/games/knights/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/kmyfirewall/debian/docs
rename to ubuntu/_base/applications/games/knights/debian/docs
diff --git a/ubuntu/_base/applications/knights/debian/knights-themepack-trinity.install b/ubuntu/_base/applications/games/knights/debian/knights-themepack-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/knights/debian/knights-themepack-trinity.install
rename to ubuntu/_base/applications/games/knights/debian/knights-themepack-trinity.install
diff --git a/ubuntu/_base/applications/knights/debian/knights-trinity.install b/ubuntu/_base/applications/games/knights/debian/knights-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/knights/debian/knights-trinity.install
rename to ubuntu/_base/applications/games/knights/debian/knights-trinity.install
diff --git a/ubuntu/_base/applications/knights/debian/knights.xpm b/ubuntu/_base/applications/games/knights/debian/knights.xpm
similarity index 100%
rename from ubuntu/_base/applications/knights/debian/knights.xpm
rename to ubuntu/_base/applications/games/knights/debian/knights.xpm
diff --git a/ubuntu/_base/applications/knights/debian/menu b/ubuntu/_base/applications/games/knights/debian/menu
similarity index 100%
rename from ubuntu/_base/applications/knights/debian/menu
rename to ubuntu/_base/applications/games/knights/debian/menu
diff --git a/ubuntu/_base/applications/kdiff3/debian/patches/.gitignore b/ubuntu/_base/applications/games/knights/debian/patches/.gitignore
similarity index 100%
rename from ubuntu/_base/applications/kdiff3/debian/patches/.gitignore
rename to ubuntu/_base/applications/games/knights/debian/patches/.gitignore
diff --git a/ubuntu/_base/applications/knights/debian/rules b/ubuntu/_base/applications/games/knights/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/knights/debian/rules
rename to ubuntu/_base/applications/games/knights/debian/rules
diff --git a/ubuntu/_base/applications/dolphin/debian/source/format b/ubuntu/_base/applications/games/knights/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/dolphin/debian/source/format
rename to ubuntu/_base/applications/games/knights/debian/source/format
diff --git a/ubuntu/_base/applications/dolphin/debian/source/options b/ubuntu/_base/applications/games/knights/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/dolphin/debian/source/options
rename to ubuntu/_base/applications/games/knights/debian/source/options
diff --git a/ubuntu/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/games/tdepacman/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/games/tdepacman/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/gtk-qt-engine/debian/cdbs/versions.pl b/ubuntu/_base/applications/games/tdepacman/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/gtk-qt-engine/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/games/tdepacman/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/tdepacman/debian/changelog b/ubuntu/_base/applications/games/tdepacman/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/tdepacman/debian/changelog
rename to ubuntu/_base/applications/games/tdepacman/debian/changelog
diff --git a/ubuntu/_base/applications/filelight/debian/compat b/ubuntu/_base/applications/games/tdepacman/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/filelight/debian/compat
rename to ubuntu/_base/applications/games/tdepacman/debian/compat
diff --git a/ubuntu/_base/applications/tdepacman/debian/control b/ubuntu/_base/applications/games/tdepacman/debian/control
similarity index 100%
rename from ubuntu/_base/applications/tdepacman/debian/control
rename to ubuntu/_base/applications/games/tdepacman/debian/control
diff --git a/ubuntu/_base/applications/tdepacman/debian/copyright b/ubuntu/_base/applications/games/tdepacman/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/tdepacman/debian/copyright
rename to ubuntu/_base/applications/games/tdepacman/debian/copyright
diff --git a/ubuntu/_base/applications/kcpuload/debian/docs b/ubuntu/_base/applications/games/tdepacman/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/kcpuload/debian/docs
rename to ubuntu/_base/applications/games/tdepacman/debian/docs
diff --git a/ubuntu/_base/applications/basket/debian/patches/series b/ubuntu/_base/applications/games/tdepacman/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/basket/debian/patches/series
rename to ubuntu/_base/applications/games/tdepacman/debian/patches/series
diff --git a/ubuntu/_base/applications/kasablanca/debian/rules b/ubuntu/_base/applications/games/tdepacman/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kasablanca/debian/rules
rename to ubuntu/_base/applications/games/tdepacman/debian/rules
diff --git a/ubuntu/_base/applications/filelight/debian/source/format b/ubuntu/_base/applications/games/tdepacman/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/filelight/debian/source/format
rename to ubuntu/_base/applications/games/tdepacman/debian/source/format
diff --git a/ubuntu/_base/applications/filelight/debian/source/options b/ubuntu/_base/applications/games/tdepacman/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/filelight/debian/source/options
rename to ubuntu/_base/applications/games/tdepacman/debian/source/options
diff --git a/ubuntu/_base/applications/tdepacman/debian/tdepacman-trinity.menu b/ubuntu/_base/applications/games/tdepacman/debian/tdepacman-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/tdepacman/debian/tdepacman-trinity.menu
rename to ubuntu/_base/applications/games/tdepacman/debian/tdepacman-trinity.menu
diff --git a/ubuntu/_base/applications/digikam/debian/NEWS b/ubuntu/_base/applications/graphics/digikam/debian/NEWS
similarity index 100%
rename from ubuntu/_base/applications/digikam/debian/NEWS
rename to ubuntu/_base/applications/graphics/digikam/debian/NEWS
diff --git a/ubuntu/_base/applications/digikam/debian/README.Debian b/ubuntu/_base/applications/graphics/digikam/debian/README.Debian
similarity index 100%
rename from ubuntu/_base/applications/digikam/debian/README.Debian
rename to ubuntu/_base/applications/graphics/digikam/debian/README.Debian
diff --git a/ubuntu/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/graphics/digikam/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/graphics/digikam/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/gwenview-i18n/debian/cdbs/versions.pl b/ubuntu/_base/applications/graphics/digikam/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/gwenview-i18n/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/graphics/digikam/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/digikam/debian/changelog b/ubuntu/_base/applications/graphics/digikam/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/digikam/debian/changelog
rename to ubuntu/_base/applications/graphics/digikam/debian/changelog
diff --git a/ubuntu/_base/applications/digikam/debian/clean b/ubuntu/_base/applications/graphics/digikam/debian/clean
similarity index 100%
rename from ubuntu/_base/applications/digikam/debian/clean
rename to ubuntu/_base/applications/graphics/digikam/debian/clean
diff --git a/ubuntu/_base/applications/fusion-icon/debian/compat b/ubuntu/_base/applications/graphics/digikam/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/fusion-icon/debian/compat
rename to ubuntu/_base/applications/graphics/digikam/debian/compat
diff --git a/ubuntu/_base/applications/digikam/debian/control b/ubuntu/_base/applications/graphics/digikam/debian/control
similarity index 100%
rename from ubuntu/_base/applications/digikam/debian/control
rename to ubuntu/_base/applications/graphics/digikam/debian/control
diff --git a/ubuntu/_base/applications/digikam/debian/copyright b/ubuntu/_base/applications/graphics/digikam/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/digikam/debian/copyright
rename to ubuntu/_base/applications/graphics/digikam/debian/copyright
diff --git a/ubuntu/_base/applications/digikam/debian/digikam-trinity-doc.install b/ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity-doc.install
similarity index 100%
rename from ubuntu/_base/applications/digikam/debian/digikam-trinity-doc.install
rename to ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity-doc.install
diff --git a/ubuntu/_base/applications/digikam/debian/digikam-trinity.install b/ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/digikam/debian/digikam-trinity.install
rename to ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity.install
diff --git a/ubuntu/_base/applications/digikam/debian/digikam-trinity.lintian-overrides b/ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity.lintian-overrides
similarity index 100%
rename from ubuntu/_base/applications/digikam/debian/digikam-trinity.lintian-overrides
rename to ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity.lintian-overrides
diff --git a/ubuntu/_base/applications/digikam/debian/digikam-trinity.manpages b/ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity.manpages
similarity index 100%
rename from ubuntu/_base/applications/digikam/debian/digikam-trinity.manpages
rename to ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity.manpages
diff --git a/ubuntu/_base/applications/digikam/debian/digikam-trinity.menu b/ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/digikam/debian/digikam-trinity.menu
rename to ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity.menu
diff --git a/ubuntu/_base/applications/digikam/debian/digikam.manpage b/ubuntu/_base/applications/graphics/digikam/debian/digikam.manpage
similarity index 100%
rename from ubuntu/_base/applications/digikam/debian/digikam.manpage
rename to ubuntu/_base/applications/graphics/digikam/debian/digikam.manpage
diff --git a/ubuntu/_base/applications/bibletime/debian/patches/series b/ubuntu/_base/applications/graphics/digikam/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/bibletime/debian/patches/series
rename to ubuntu/_base/applications/graphics/digikam/debian/patches/series
diff --git a/ubuntu/_base/applications/digikam/debian/rules b/ubuntu/_base/applications/graphics/digikam/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/digikam/debian/rules
rename to ubuntu/_base/applications/graphics/digikam/debian/rules
diff --git a/ubuntu/_base/applications/digikam/debian/showfoto-trinity.install b/ubuntu/_base/applications/graphics/digikam/debian/showfoto-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/digikam/debian/showfoto-trinity.install
rename to ubuntu/_base/applications/graphics/digikam/debian/showfoto-trinity.install
diff --git a/ubuntu/_base/applications/digikam/debian/showfoto-trinity.manpage b/ubuntu/_base/applications/graphics/digikam/debian/showfoto-trinity.manpage
similarity index 100%
rename from ubuntu/_base/applications/digikam/debian/showfoto-trinity.manpage
rename to ubuntu/_base/applications/graphics/digikam/debian/showfoto-trinity.manpage
diff --git a/ubuntu/_base/applications/digikam/debian/showfoto-trinity.manpages b/ubuntu/_base/applications/graphics/digikam/debian/showfoto-trinity.manpages
similarity index 100%
rename from ubuntu/_base/applications/digikam/debian/showfoto-trinity.manpages
rename to ubuntu/_base/applications/graphics/digikam/debian/showfoto-trinity.manpages
diff --git a/ubuntu/_base/applications/digikam/debian/showfoto-trinity.menu b/ubuntu/_base/applications/graphics/digikam/debian/showfoto-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/digikam/debian/showfoto-trinity.menu
rename to ubuntu/_base/applications/graphics/digikam/debian/showfoto-trinity.menu
diff --git a/ubuntu/_base/applications/fusion-icon/debian/source/format b/ubuntu/_base/applications/graphics/digikam/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/fusion-icon/debian/source/format
rename to ubuntu/_base/applications/graphics/digikam/debian/source/format
diff --git a/ubuntu/_base/applications/fusion-icon/debian/source/options b/ubuntu/_base/applications/graphics/digikam/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/fusion-icon/debian/source/options
rename to ubuntu/_base/applications/graphics/digikam/debian/source/options
diff --git a/ubuntu/_base/applications/digikam/debian/watch b/ubuntu/_base/applications/graphics/digikam/debian/watch
similarity index 100%
rename from ubuntu/_base/applications/digikam/debian/watch
rename to ubuntu/_base/applications/graphics/digikam/debian/watch
diff --git a/ubuntu/_base/applications/digikam/debian/xpm.d/digikam-16.xpm b/ubuntu/_base/applications/graphics/digikam/debian/xpm.d/digikam-16.xpm
similarity index 100%
rename from ubuntu/_base/applications/digikam/debian/xpm.d/digikam-16.xpm
rename to ubuntu/_base/applications/graphics/digikam/debian/xpm.d/digikam-16.xpm
diff --git a/ubuntu/_base/applications/digikam/debian/xpm.d/digikam.xpm b/ubuntu/_base/applications/graphics/digikam/debian/xpm.d/digikam.xpm
similarity index 100%
rename from ubuntu/_base/applications/digikam/debian/xpm.d/digikam.xpm
rename to ubuntu/_base/applications/graphics/digikam/debian/xpm.d/digikam.xpm
diff --git a/ubuntu/_base/applications/digikam/debian/xpm.d/showfoto-16.xpm b/ubuntu/_base/applications/graphics/digikam/debian/xpm.d/showfoto-16.xpm
similarity index 100%
rename from ubuntu/_base/applications/digikam/debian/xpm.d/showfoto-16.xpm
rename to ubuntu/_base/applications/graphics/digikam/debian/xpm.d/showfoto-16.xpm
diff --git a/ubuntu/_base/applications/digikam/debian/xpm.d/showfoto.xpm b/ubuntu/_base/applications/graphics/digikam/debian/xpm.d/showfoto.xpm
similarity index 100%
rename from ubuntu/_base/applications/digikam/debian/xpm.d/showfoto.xpm
rename to ubuntu/_base/applications/graphics/digikam/debian/xpm.d/showfoto.xpm
diff --git a/ubuntu/_base/applications/gwenview/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/gwenview/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/graphics/gwenview-i18n/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/gwenview/debian/cdbs/versions.pl b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/gwenview/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/graphics/gwenview-i18n/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/gwenview-i18n/debian/changelog b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/gwenview-i18n/debian/changelog
rename to ubuntu/_base/applications/graphics/gwenview-i18n/debian/changelog
diff --git a/ubuntu/_base/applications/gtk-qt-engine/debian/compat b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/gtk-qt-engine/debian/compat
rename to ubuntu/_base/applications/graphics/gwenview-i18n/debian/compat
diff --git a/ubuntu/_base/applications/gwenview-i18n/debian/control b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/control
similarity index 100%
rename from ubuntu/_base/applications/gwenview-i18n/debian/control
rename to ubuntu/_base/applications/graphics/gwenview-i18n/debian/control
diff --git a/ubuntu/_base/applications/gwenview-i18n/debian/copyright b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/gwenview-i18n/debian/copyright
rename to ubuntu/_base/applications/graphics/gwenview-i18n/debian/copyright
diff --git a/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/patches/series b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/patches/series
rename to ubuntu/_base/applications/graphics/gwenview-i18n/debian/patches/series
diff --git a/ubuntu/_base/applications/kaffeine/debian/rules b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kaffeine/debian/rules
rename to ubuntu/_base/applications/graphics/gwenview-i18n/debian/rules
diff --git a/ubuntu/_base/applications/gtk-qt-engine/debian/source/format b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/gtk-qt-engine/debian/source/format
rename to ubuntu/_base/applications/graphics/gwenview-i18n/debian/source/format
diff --git a/ubuntu/_base/applications/gtk-qt-engine/debian/source/options b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/gtk-qt-engine/debian/source/options
rename to ubuntu/_base/applications/graphics/gwenview-i18n/debian/source/options
diff --git a/ubuntu/_base/applications/k3b/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/graphics/gwenview/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/graphics/gwenview/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/k3b/debian/cdbs/versions.pl b/ubuntu/_base/applications/graphics/gwenview/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/graphics/gwenview/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/gwenview/debian/changelog b/ubuntu/_base/applications/graphics/gwenview/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/gwenview/debian/changelog
rename to ubuntu/_base/applications/graphics/gwenview/debian/changelog
diff --git a/ubuntu/_base/applications/gtk3-tqt-engine/debian/compat b/ubuntu/_base/applications/graphics/gwenview/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/gtk3-tqt-engine/debian/compat
rename to ubuntu/_base/applications/graphics/gwenview/debian/compat
diff --git a/ubuntu/_base/applications/gwenview/debian/control b/ubuntu/_base/applications/graphics/gwenview/debian/control
similarity index 100%
rename from ubuntu/_base/applications/gwenview/debian/control
rename to ubuntu/_base/applications/graphics/gwenview/debian/control
diff --git a/ubuntu/_base/applications/gwenview/debian/copyright b/ubuntu/_base/applications/graphics/gwenview/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/gwenview/debian/copyright
rename to ubuntu/_base/applications/graphics/gwenview/debian/copyright
diff --git a/ubuntu/_base/applications/gwenview/debian/gwenview-trinity.doc-base b/ubuntu/_base/applications/graphics/gwenview/debian/gwenview-trinity.doc-base
similarity index 100%
rename from ubuntu/_base/applications/gwenview/debian/gwenview-trinity.doc-base
rename to ubuntu/_base/applications/graphics/gwenview/debian/gwenview-trinity.doc-base
diff --git a/ubuntu/_base/applications/gwenview/debian/gwenview.lintian b/ubuntu/_base/applications/graphics/gwenview/debian/gwenview.lintian
similarity index 100%
rename from ubuntu/_base/applications/gwenview/debian/gwenview.lintian
rename to ubuntu/_base/applications/graphics/gwenview/debian/gwenview.lintian
diff --git a/ubuntu/_base/applications/gwenview/debian/gwenview.xpm b/ubuntu/_base/applications/graphics/gwenview/debian/gwenview.xpm
similarity index 100%
rename from ubuntu/_base/applications/gwenview/debian/gwenview.xpm
rename to ubuntu/_base/applications/graphics/gwenview/debian/gwenview.xpm
diff --git a/ubuntu/_base/applications/gwenview/debian/menu b/ubuntu/_base/applications/graphics/gwenview/debian/menu
similarity index 100%
rename from ubuntu/_base/applications/gwenview/debian/menu
rename to ubuntu/_base/applications/graphics/gwenview/debian/menu
diff --git a/ubuntu/_base/applications/digikam/debian/patches/series b/ubuntu/_base/applications/graphics/gwenview/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/digikam/debian/patches/series
rename to ubuntu/_base/applications/graphics/gwenview/debian/patches/series
diff --git a/ubuntu/_base/applications/gwenview/debian/rules b/ubuntu/_base/applications/graphics/gwenview/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/gwenview/debian/rules
rename to ubuntu/_base/applications/graphics/gwenview/debian/rules
diff --git a/ubuntu/_base/applications/gtk3-tqt-engine/debian/source/format b/ubuntu/_base/applications/graphics/gwenview/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/gtk3-tqt-engine/debian/source/format
rename to ubuntu/_base/applications/graphics/gwenview/debian/source/format
diff --git a/ubuntu/_base/applications/gtk3-tqt-engine/debian/source/options b/ubuntu/_base/applications/graphics/gwenview/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/gtk3-tqt-engine/debian/source/options
rename to ubuntu/_base/applications/graphics/gwenview/debian/source/options
diff --git a/ubuntu/_base/applications/ksquirrel/debian/README.debian b/ubuntu/_base/applications/graphics/ksquirrel/debian/README.debian
similarity index 100%
rename from ubuntu/_base/applications/ksquirrel/debian/README.debian
rename to ubuntu/_base/applications/graphics/ksquirrel/debian/README.debian
diff --git a/ubuntu/_base/applications/ksquirrel/debian/changelog b/ubuntu/_base/applications/graphics/ksquirrel/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/ksquirrel/debian/changelog
rename to ubuntu/_base/applications/graphics/ksquirrel/debian/changelog
diff --git a/ubuntu/_base/applications/gwenview-i18n/debian/compat b/ubuntu/_base/applications/graphics/ksquirrel/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/gwenview-i18n/debian/compat
rename to ubuntu/_base/applications/graphics/ksquirrel/debian/compat
diff --git a/ubuntu/_base/applications/ksquirrel/debian/control b/ubuntu/_base/applications/graphics/ksquirrel/debian/control
similarity index 100%
rename from ubuntu/_base/applications/ksquirrel/debian/control
rename to ubuntu/_base/applications/graphics/ksquirrel/debian/control
diff --git a/ubuntu/_base/applications/ksquirrel/debian/copyright b/ubuntu/_base/applications/graphics/ksquirrel/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/ksquirrel/debian/copyright
rename to ubuntu/_base/applications/graphics/ksquirrel/debian/copyright
diff --git a/ubuntu/_base/applications/knights/debian/docs b/ubuntu/_base/applications/graphics/ksquirrel/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/knights/debian/docs
rename to ubuntu/_base/applications/graphics/ksquirrel/debian/docs
diff --git a/ubuntu/_base/applications/ksquirrel/debian/ksquirrel-libs-configurator.1 b/ubuntu/_base/applications/graphics/ksquirrel/debian/ksquirrel-libs-configurator.1
similarity index 100%
rename from ubuntu/_base/applications/ksquirrel/debian/ksquirrel-libs-configurator.1
rename to ubuntu/_base/applications/graphics/ksquirrel/debian/ksquirrel-libs-configurator.1
diff --git a/ubuntu/_base/applications/kile/debian/patches/.gitignore b/ubuntu/_base/applications/graphics/ksquirrel/debian/patches/.gitignore
similarity index 100%
rename from ubuntu/_base/applications/kile/debian/patches/.gitignore
rename to ubuntu/_base/applications/graphics/ksquirrel/debian/patches/.gitignore
diff --git a/ubuntu/_base/applications/ksquirrel/debian/rules b/ubuntu/_base/applications/graphics/ksquirrel/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/ksquirrel/debian/rules
rename to ubuntu/_base/applications/graphics/ksquirrel/debian/rules
diff --git a/ubuntu/_base/applications/gwenview-i18n/debian/source/format b/ubuntu/_base/applications/graphics/ksquirrel/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/gwenview-i18n/debian/source/format
rename to ubuntu/_base/applications/graphics/ksquirrel/debian/source/format
diff --git a/ubuntu/_base/applications/gwenview-i18n/debian/source/options b/ubuntu/_base/applications/graphics/ksquirrel/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/gwenview-i18n/debian/source/options
rename to ubuntu/_base/applications/graphics/ksquirrel/debian/source/options
diff --git a/ubuntu/_base/applications/ksquirrel/debian/watch b/ubuntu/_base/applications/graphics/ksquirrel/debian/watch
similarity index 100%
rename from ubuntu/_base/applications/ksquirrel/debian/watch
rename to ubuntu/_base/applications/graphics/ksquirrel/debian/watch
diff --git a/ubuntu/_base/applications/k9copy/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/graphics/potracegui/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/k9copy/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/graphics/potracegui/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/k9copy/debian/cdbs/versions.pl b/ubuntu/_base/applications/graphics/potracegui/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/k9copy/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/graphics/potracegui/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/potracegui/debian/changelog b/ubuntu/_base/applications/graphics/potracegui/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/potracegui/debian/changelog
rename to ubuntu/_base/applications/graphics/potracegui/debian/changelog
diff --git a/ubuntu/_base/applications/gwenview/debian/compat b/ubuntu/_base/applications/graphics/potracegui/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/gwenview/debian/compat
rename to ubuntu/_base/applications/graphics/potracegui/debian/compat
diff --git a/ubuntu/_base/applications/potracegui/debian/control b/ubuntu/_base/applications/graphics/potracegui/debian/control
similarity index 100%
rename from ubuntu/_base/applications/potracegui/debian/control
rename to ubuntu/_base/applications/graphics/potracegui/debian/control
diff --git a/ubuntu/_base/applications/potracegui/debian/copyright b/ubuntu/_base/applications/graphics/potracegui/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/potracegui/debian/copyright
rename to ubuntu/_base/applications/graphics/potracegui/debian/copyright
diff --git a/ubuntu/_base/applications/potracegui/debian/docs b/ubuntu/_base/applications/graphics/potracegui/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/potracegui/debian/docs
rename to ubuntu/_base/applications/graphics/potracegui/debian/docs
diff --git a/ubuntu/_base/applications/potracegui/debian/potracegui-trinity.menu b/ubuntu/_base/applications/graphics/potracegui/debian/potracegui-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/potracegui/debian/potracegui-trinity.menu
rename to ubuntu/_base/applications/graphics/potracegui/debian/potracegui-trinity.menu
diff --git a/ubuntu/_base/applications/kbiff/debian/rules b/ubuntu/_base/applications/graphics/potracegui/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kbiff/debian/rules
rename to ubuntu/_base/applications/graphics/potracegui/debian/rules
diff --git a/ubuntu/_base/applications/gwenview/debian/source/format b/ubuntu/_base/applications/graphics/potracegui/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/gwenview/debian/source/format
rename to ubuntu/_base/applications/graphics/potracegui/debian/source/format
diff --git a/ubuntu/_base/applications/gwenview/debian/source/options b/ubuntu/_base/applications/graphics/potracegui/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/gwenview/debian/source/options
rename to ubuntu/_base/applications/graphics/potracegui/debian/source/options
diff --git a/ubuntu/_base/applications/kaffeine-mozilla/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/kasablanca/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kaffeine-mozilla/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/internet/kasablanca/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kaffeine-mozilla/debian/cdbs/versions.pl b/ubuntu/_base/applications/internet/kasablanca/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kaffeine-mozilla/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/internet/kasablanca/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kasablanca/debian/changelog b/ubuntu/_base/applications/internet/kasablanca/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kasablanca/debian/changelog
rename to ubuntu/_base/applications/internet/kasablanca/debian/changelog
diff --git a/ubuntu/_base/applications/k3b-i18n/debian/compat b/ubuntu/_base/applications/internet/kasablanca/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/k3b-i18n/debian/compat
rename to ubuntu/_base/applications/internet/kasablanca/debian/compat
diff --git a/ubuntu/_base/applications/kasablanca/debian/control b/ubuntu/_base/applications/internet/kasablanca/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kasablanca/debian/control
rename to ubuntu/_base/applications/internet/kasablanca/debian/control
diff --git a/ubuntu/_base/applications/kasablanca/debian/copyright b/ubuntu/_base/applications/internet/kasablanca/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kasablanca/debian/copyright
rename to ubuntu/_base/applications/internet/kasablanca/debian/copyright
diff --git a/ubuntu/_base/applications/keep/debian/docs b/ubuntu/_base/applications/internet/kasablanca/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/keep/debian/docs
rename to ubuntu/_base/applications/internet/kasablanca/debian/docs
diff --git a/ubuntu/_base/applications/kasablanca/debian/kasablanca-trinity.menu b/ubuntu/_base/applications/internet/kasablanca/debian/kasablanca-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/kasablanca/debian/kasablanca-trinity.menu
rename to ubuntu/_base/applications/internet/kasablanca/debian/kasablanca-trinity.menu
diff --git a/ubuntu/_base/applications/dolphin/debian/patches/series b/ubuntu/_base/applications/internet/kasablanca/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/dolphin/debian/patches/series
rename to ubuntu/_base/applications/internet/kasablanca/debian/patches/series
diff --git a/ubuntu/_base/applications/kbarcode/debian/rules b/ubuntu/_base/applications/internet/kasablanca/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kbarcode/debian/rules
rename to ubuntu/_base/applications/internet/kasablanca/debian/rules
diff --git a/ubuntu/_base/applications/k3b-i18n/debian/source/format b/ubuntu/_base/applications/internet/kasablanca/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/k3b-i18n/debian/source/format
rename to ubuntu/_base/applications/internet/kasablanca/debian/source/format
diff --git a/ubuntu/_base/applications/k3b-i18n/debian/source/options b/ubuntu/_base/applications/internet/kasablanca/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/k3b-i18n/debian/source/options
rename to ubuntu/_base/applications/internet/kasablanca/debian/source/options
diff --git a/ubuntu/_base/applications/kaffeine/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/kbiff/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kaffeine/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/internet/kbiff/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kaffeine/debian/cdbs/versions.pl b/ubuntu/_base/applications/internet/kbiff/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kaffeine/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/internet/kbiff/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kbiff/debian/changelog b/ubuntu/_base/applications/internet/kbiff/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kbiff/debian/changelog
rename to ubuntu/_base/applications/internet/kbiff/debian/changelog
diff --git a/ubuntu/_base/applications/k3b/debian/compat b/ubuntu/_base/applications/internet/kbiff/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/compat
rename to ubuntu/_base/applications/internet/kbiff/debian/compat
diff --git a/ubuntu/_base/applications/kbiff/debian/control b/ubuntu/_base/applications/internet/kbiff/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kbiff/debian/control
rename to ubuntu/_base/applications/internet/kbiff/debian/control
diff --git a/ubuntu/_base/applications/kbiff/debian/copyright b/ubuntu/_base/applications/internet/kbiff/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kbiff/debian/copyright
rename to ubuntu/_base/applications/internet/kbiff/debian/copyright
diff --git a/ubuntu/_base/applications/basket/debian/dirs b/ubuntu/_base/applications/internet/kbiff/debian/dirs
similarity index 100%
rename from ubuntu/_base/applications/basket/debian/dirs
rename to ubuntu/_base/applications/internet/kbiff/debian/dirs
diff --git a/ubuntu/_base/applications/basket/debian/docs b/ubuntu/_base/applications/internet/kbiff/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/basket/debian/docs
rename to ubuntu/_base/applications/internet/kbiff/debian/docs
diff --git a/ubuntu/_base/applications/kbiff/debian/menu b/ubuntu/_base/applications/internet/kbiff/debian/menu
similarity index 100%
rename from ubuntu/_base/applications/kbiff/debian/menu
rename to ubuntu/_base/applications/internet/kbiff/debian/menu
diff --git a/ubuntu/_base/applications/kbookreader/debian/rules b/ubuntu/_base/applications/internet/kbiff/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kbookreader/debian/rules
rename to ubuntu/_base/applications/internet/kbiff/debian/rules
diff --git a/ubuntu/_base/applications/k3b/debian/source/format b/ubuntu/_base/applications/internet/kbiff/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/source/format
rename to ubuntu/_base/applications/internet/kbiff/debian/source/format
diff --git a/ubuntu/_base/applications/k3b/debian/source/options b/ubuntu/_base/applications/internet/kbiff/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/source/options
rename to ubuntu/_base/applications/internet/kbiff/debian/source/options
diff --git a/ubuntu/_base/applications/kbarcode/debian/README.Debian b/ubuntu/_base/applications/internet/kftpgrabber/debian/README.Debian
similarity index 100%
rename from ubuntu/_base/applications/kbarcode/debian/README.Debian
rename to ubuntu/_base/applications/internet/kftpgrabber/debian/README.Debian
diff --git a/ubuntu/_base/applications/kasablanca/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/kftpgrabber/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kasablanca/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/internet/kftpgrabber/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kasablanca/debian/cdbs/versions.pl b/ubuntu/_base/applications/internet/kftpgrabber/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kasablanca/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/internet/kftpgrabber/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kftpgrabber/debian/changelog b/ubuntu/_base/applications/internet/kftpgrabber/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kftpgrabber/debian/changelog
rename to ubuntu/_base/applications/internet/kftpgrabber/debian/changelog
diff --git a/ubuntu/_base/applications/kaffeine-mozilla/debian/compat b/ubuntu/_base/applications/internet/kftpgrabber/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kaffeine-mozilla/debian/compat
rename to ubuntu/_base/applications/internet/kftpgrabber/debian/compat
diff --git a/ubuntu/_base/applications/kftpgrabber/debian/control b/ubuntu/_base/applications/internet/kftpgrabber/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kftpgrabber/debian/control
rename to ubuntu/_base/applications/internet/kftpgrabber/debian/control
diff --git a/ubuntu/_base/applications/kftpgrabber/debian/copyright b/ubuntu/_base/applications/internet/kftpgrabber/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kftpgrabber/debian/copyright
rename to ubuntu/_base/applications/internet/kftpgrabber/debian/copyright
diff --git a/ubuntu/_base/applications/kftpgrabber/debian/docs b/ubuntu/_base/applications/internet/kftpgrabber/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/kftpgrabber/debian/docs
rename to ubuntu/_base/applications/internet/kftpgrabber/debian/docs
diff --git a/ubuntu/_base/applications/kftpgrabber/debian/kftpgrabber-trinity.lintian-overrides b/ubuntu/_base/applications/internet/kftpgrabber/debian/kftpgrabber-trinity.lintian-overrides
similarity index 100%
rename from ubuntu/_base/applications/kftpgrabber/debian/kftpgrabber-trinity.lintian-overrides
rename to ubuntu/_base/applications/internet/kftpgrabber/debian/kftpgrabber-trinity.lintian-overrides
diff --git a/ubuntu/_base/applications/kftpgrabber/debian/kftpgrabber.xml b/ubuntu/_base/applications/internet/kftpgrabber/debian/kftpgrabber.xml
similarity index 100%
rename from ubuntu/_base/applications/kftpgrabber/debian/kftpgrabber.xml
rename to ubuntu/_base/applications/internet/kftpgrabber/debian/kftpgrabber.xml
diff --git a/ubuntu/_base/applications/kftpgrabber/debian/manpages b/ubuntu/_base/applications/internet/kftpgrabber/debian/manpages
similarity index 100%
rename from ubuntu/_base/applications/kftpgrabber/debian/manpages
rename to ubuntu/_base/applications/internet/kftpgrabber/debian/manpages
diff --git a/ubuntu/_base/applications/kftpgrabber/debian/menu b/ubuntu/_base/applications/internet/kftpgrabber/debian/menu
similarity index 100%
rename from ubuntu/_base/applications/kftpgrabber/debian/menu
rename to ubuntu/_base/applications/internet/kftpgrabber/debian/menu
diff --git a/ubuntu/_base/applications/filelight/debian/patches/series b/ubuntu/_base/applications/internet/kftpgrabber/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/filelight/debian/patches/series
rename to ubuntu/_base/applications/internet/kftpgrabber/debian/patches/series
diff --git a/ubuntu/_base/applications/kftpgrabber/debian/rules b/ubuntu/_base/applications/internet/kftpgrabber/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kftpgrabber/debian/rules
rename to ubuntu/_base/applications/internet/kftpgrabber/debian/rules
diff --git a/ubuntu/_base/applications/k9copy/debian/source/format b/ubuntu/_base/applications/internet/kftpgrabber/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/k9copy/debian/source/format
rename to ubuntu/_base/applications/internet/kftpgrabber/debian/source/format
diff --git a/ubuntu/_base/applications/k9copy/debian/source/options b/ubuntu/_base/applications/internet/kftpgrabber/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/k9copy/debian/source/options
rename to ubuntu/_base/applications/internet/kftpgrabber/debian/source/options
diff --git a/ubuntu/_base/applications/kftpgrabber/debian/watch b/ubuntu/_base/applications/internet/kftpgrabber/debian/watch
similarity index 100%
rename from ubuntu/_base/applications/kftpgrabber/debian/watch
rename to ubuntu/_base/applications/internet/kftpgrabber/debian/watch
diff --git a/ubuntu/_base/applications/katapult/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/knmap/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/katapult/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/internet/knmap/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/katapult/debian/cdbs/versions.pl b/ubuntu/_base/applications/internet/knmap/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/katapult/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/internet/knmap/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/knmap/debian/changelog b/ubuntu/_base/applications/internet/knmap/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/knmap/debian/changelog
rename to ubuntu/_base/applications/internet/knmap/debian/changelog
diff --git a/ubuntu/_base/applications/kaffeine/debian/compat b/ubuntu/_base/applications/internet/knmap/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kaffeine/debian/compat
rename to ubuntu/_base/applications/internet/knmap/debian/compat
diff --git a/ubuntu/_base/applications/knmap/debian/control b/ubuntu/_base/applications/internet/knmap/debian/control
similarity index 100%
rename from ubuntu/_base/applications/knmap/debian/control
rename to ubuntu/_base/applications/internet/knmap/debian/control
diff --git a/ubuntu/_base/applications/knmap/debian/copyright b/ubuntu/_base/applications/internet/knmap/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/knmap/debian/copyright
rename to ubuntu/_base/applications/internet/knmap/debian/copyright
diff --git a/ubuntu/_base/applications/kbiff/debian/docs b/ubuntu/_base/applications/internet/knmap/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/kbiff/debian/docs
rename to ubuntu/_base/applications/internet/knmap/debian/docs
diff --git a/ubuntu/_base/applications/fusion-icon/debian/patches/series b/ubuntu/_base/applications/internet/knmap/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/fusion-icon/debian/patches/series
rename to ubuntu/_base/applications/internet/knmap/debian/patches/series
diff --git a/ubuntu/_base/applications/kcmautostart/debian/rules b/ubuntu/_base/applications/internet/knmap/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kcmautostart/debian/rules
rename to ubuntu/_base/applications/internet/knmap/debian/rules
diff --git a/ubuntu/_base/applications/kaffeine-mozilla/debian/source/format b/ubuntu/_base/applications/internet/knmap/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kaffeine-mozilla/debian/source/format
rename to ubuntu/_base/applications/internet/knmap/debian/source/format
diff --git a/ubuntu/_base/applications/kaffeine-mozilla/debian/source/options b/ubuntu/_base/applications/internet/knmap/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kaffeine-mozilla/debian/source/options
rename to ubuntu/_base/applications/internet/knmap/debian/source/options
diff --git a/ubuntu/_base/applications/kbarcode/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/konversation/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kbarcode/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/internet/konversation/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kbarcode/debian/cdbs/versions.pl b/ubuntu/_base/applications/internet/konversation/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kbarcode/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/internet/konversation/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/konversation/debian/changelog b/ubuntu/_base/applications/internet/konversation/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/konversation/debian/changelog
rename to ubuntu/_base/applications/internet/konversation/debian/changelog
diff --git a/ubuntu/_base/applications/kasablanca/debian/compat b/ubuntu/_base/applications/internet/konversation/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kasablanca/debian/compat
rename to ubuntu/_base/applications/internet/konversation/debian/compat
diff --git a/ubuntu/_base/applications/konversation/debian/control b/ubuntu/_base/applications/internet/konversation/debian/control
similarity index 100%
rename from ubuntu/_base/applications/konversation/debian/control
rename to ubuntu/_base/applications/internet/konversation/debian/control
diff --git a/ubuntu/_base/applications/konversation/debian/copyright b/ubuntu/_base/applications/internet/konversation/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/konversation/debian/copyright
rename to ubuntu/_base/applications/internet/konversation/debian/copyright
diff --git a/ubuntu/_base/applications/konversation/debian/konversation-trinity.docs b/ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.docs
similarity index 100%
rename from ubuntu/_base/applications/konversation/debian/konversation-trinity.docs
rename to ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.docs
diff --git a/ubuntu/_base/applications/konversation/debian/konversation-trinity.install b/ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/konversation/debian/konversation-trinity.install
rename to ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.install
diff --git a/ubuntu/_base/applications/konversation/debian/konversation-trinity.manpages b/ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.manpages
similarity index 100%
rename from ubuntu/_base/applications/konversation/debian/konversation-trinity.manpages
rename to ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.manpages
diff --git a/ubuntu/_base/applications/konversation/debian/konversation-trinity.menu b/ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/konversation/debian/konversation-trinity.menu
rename to ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.menu
diff --git a/ubuntu/_base/applications/konversation/debian/konversation16x16.xpm b/ubuntu/_base/applications/internet/konversation/debian/konversation16x16.xpm
similarity index 100%
rename from ubuntu/_base/applications/konversation/debian/konversation16x16.xpm
rename to ubuntu/_base/applications/internet/konversation/debian/konversation16x16.xpm
diff --git a/ubuntu/_base/applications/konversation/debian/konversation32x32.xpm b/ubuntu/_base/applications/internet/konversation/debian/konversation32x32.xpm
similarity index 100%
rename from ubuntu/_base/applications/konversation/debian/konversation32x32.xpm
rename to ubuntu/_base/applications/internet/konversation/debian/konversation32x32.xpm
diff --git a/ubuntu/_base/applications/konversation/debian/man/konversation.1.docbook b/ubuntu/_base/applications/internet/konversation/debian/man/konversation.1.docbook
similarity index 100%
rename from ubuntu/_base/applications/konversation/debian/man/konversation.1.docbook
rename to ubuntu/_base/applications/internet/konversation/debian/man/konversation.1.docbook
diff --git a/ubuntu/_base/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook b/ubuntu/_base/applications/internet/konversation/debian/man/konversationircprotocolhandler.1.docbook
similarity index 100%
rename from ubuntu/_base/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook
rename to ubuntu/_base/applications/internet/konversation/debian/man/konversationircprotocolhandler.1.docbook
diff --git a/ubuntu/_base/applications/knights/debian/patches/.gitignore b/ubuntu/_base/applications/internet/konversation/debian/patches/.gitignore
similarity index 100%
rename from ubuntu/_base/applications/knights/debian/patches/.gitignore
rename to ubuntu/_base/applications/internet/konversation/debian/patches/.gitignore
diff --git a/ubuntu/_base/applications/konversation/debian/rules b/ubuntu/_base/applications/internet/konversation/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/konversation/debian/rules
rename to ubuntu/_base/applications/internet/konversation/debian/rules
diff --git a/ubuntu/_base/applications/kaffeine/debian/source/format b/ubuntu/_base/applications/internet/konversation/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kaffeine/debian/source/format
rename to ubuntu/_base/applications/internet/konversation/debian/source/format
diff --git a/ubuntu/_base/applications/kaffeine/debian/source/options b/ubuntu/_base/applications/internet/konversation/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kaffeine/debian/source/options
rename to ubuntu/_base/applications/internet/konversation/debian/source/options
diff --git a/ubuntu/_base/applications/kbfx/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/kopete-otr/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kbfx/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/internet/kopete-otr/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kbfx/debian/cdbs/versions.pl b/ubuntu/_base/applications/internet/kopete-otr/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kbfx/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/internet/kopete-otr/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kopete-otr/debian/changelog b/ubuntu/_base/applications/internet/kopete-otr/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kopete-otr/debian/changelog
rename to ubuntu/_base/applications/internet/kopete-otr/debian/changelog
diff --git a/ubuntu/_base/applications/katapult/debian/compat b/ubuntu/_base/applications/internet/kopete-otr/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/katapult/debian/compat
rename to ubuntu/_base/applications/internet/kopete-otr/debian/compat
diff --git a/ubuntu/_base/applications/kopete-otr/debian/control b/ubuntu/_base/applications/internet/kopete-otr/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kopete-otr/debian/control
rename to ubuntu/_base/applications/internet/kopete-otr/debian/control
diff --git a/ubuntu/_base/applications/kopete-otr/debian/copyright b/ubuntu/_base/applications/internet/kopete-otr/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kopete-otr/debian/copyright
rename to ubuntu/_base/applications/internet/kopete-otr/debian/copyright
diff --git a/ubuntu/_base/applications/kcmldap/debian/rules b/ubuntu/_base/applications/internet/kopete-otr/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kcmldap/debian/rules
rename to ubuntu/_base/applications/internet/kopete-otr/debian/rules
diff --git a/ubuntu/_base/applications/kasablanca/debian/source/format b/ubuntu/_base/applications/internet/kopete-otr/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kasablanca/debian/source/format
rename to ubuntu/_base/applications/internet/kopete-otr/debian/source/format
diff --git a/ubuntu/_base/applications/kasablanca/debian/source/options b/ubuntu/_base/applications/internet/kopete-otr/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kasablanca/debian/source/options
rename to ubuntu/_base/applications/internet/kopete-otr/debian/source/options
diff --git a/ubuntu/_base/applications/kbibtex/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/kshowmail/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kbibtex/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/internet/kshowmail/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kbibtex/debian/cdbs/versions.pl b/ubuntu/_base/applications/internet/kshowmail/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kbibtex/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/internet/kshowmail/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kshowmail/debian/changelog b/ubuntu/_base/applications/internet/kshowmail/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kshowmail/debian/changelog
rename to ubuntu/_base/applications/internet/kshowmail/debian/changelog
diff --git a/ubuntu/_base/applications/kbarcode/debian/compat b/ubuntu/_base/applications/internet/kshowmail/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kbarcode/debian/compat
rename to ubuntu/_base/applications/internet/kshowmail/debian/compat
diff --git a/ubuntu/_base/applications/kshowmail/debian/control b/ubuntu/_base/applications/internet/kshowmail/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kshowmail/debian/control
rename to ubuntu/_base/applications/internet/kshowmail/debian/control
diff --git a/ubuntu/_base/applications/kshowmail/debian/copyright b/ubuntu/_base/applications/internet/kshowmail/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kshowmail/debian/copyright
rename to ubuntu/_base/applications/internet/kshowmail/debian/copyright
diff --git a/ubuntu/_base/applications/keximdb/debian/docs b/ubuntu/_base/applications/internet/kshowmail/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/keximdb/debian/docs
rename to ubuntu/_base/applications/internet/kshowmail/debian/docs
diff --git a/ubuntu/_base/applications/kshowmail/debian/menu b/ubuntu/_base/applications/internet/kshowmail/debian/menu
similarity index 100%
rename from ubuntu/_base/applications/kshowmail/debian/menu
rename to ubuntu/_base/applications/internet/kshowmail/debian/menu
diff --git a/ubuntu/_base/applications/kbibtex/debian/rules b/ubuntu/_base/applications/internet/kshowmail/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kbibtex/debian/rules
rename to ubuntu/_base/applications/internet/kshowmail/debian/rules
diff --git a/ubuntu/_base/applications/katapult/debian/source/format b/ubuntu/_base/applications/internet/kshowmail/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/katapult/debian/source/format
rename to ubuntu/_base/applications/internet/kshowmail/debian/source/format
diff --git a/ubuntu/_base/applications/katapult/debian/source/options b/ubuntu/_base/applications/internet/kshowmail/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/katapult/debian/source/options
rename to ubuntu/_base/applications/internet/kshowmail/debian/source/options
diff --git a/ubuntu/_base/applications/kbiff/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/kstreamripper/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kbiff/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/internet/kstreamripper/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kbiff/debian/cdbs/versions.pl b/ubuntu/_base/applications/internet/kstreamripper/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kbiff/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/internet/kstreamripper/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kstreamripper/debian/changelog b/ubuntu/_base/applications/internet/kstreamripper/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kstreamripper/debian/changelog
rename to ubuntu/_base/applications/internet/kstreamripper/debian/changelog
diff --git a/ubuntu/_base/applications/kbfx/debian/compat b/ubuntu/_base/applications/internet/kstreamripper/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kbfx/debian/compat
rename to ubuntu/_base/applications/internet/kstreamripper/debian/compat
diff --git a/ubuntu/_base/applications/kstreamripper/debian/control b/ubuntu/_base/applications/internet/kstreamripper/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kstreamripper/debian/control
rename to ubuntu/_base/applications/internet/kstreamripper/debian/control
diff --git a/ubuntu/_base/applications/kstreamripper/debian/copyright b/ubuntu/_base/applications/internet/kstreamripper/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kstreamripper/debian/copyright
rename to ubuntu/_base/applications/internet/kstreamripper/debian/copyright
diff --git a/ubuntu/_base/applications/kstreamripper/debian/dirs b/ubuntu/_base/applications/internet/kstreamripper/debian/dirs
similarity index 100%
rename from ubuntu/_base/applications/kstreamripper/debian/dirs
rename to ubuntu/_base/applications/internet/kstreamripper/debian/dirs
diff --git a/ubuntu/_base/applications/klamav/debian/docs b/ubuntu/_base/applications/internet/kstreamripper/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/klamav/debian/docs
rename to ubuntu/_base/applications/internet/kstreamripper/debian/docs
diff --git a/ubuntu/_base/applications/kstreamripper/debian/kstreamripper-trinity.menu b/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/kstreamripper/debian/kstreamripper-trinity.menu
rename to ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.menu
diff --git a/ubuntu/_base/applications/kstreamripper/debian/kstreamripper-trinity.postinst b/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postinst
similarity index 100%
rename from ubuntu/_base/applications/kstreamripper/debian/kstreamripper-trinity.postinst
rename to ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postinst
diff --git a/ubuntu/_base/applications/kstreamripper/debian/kstreamripper-trinity.postrm b/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postrm
similarity index 100%
rename from ubuntu/_base/applications/kstreamripper/debian/kstreamripper-trinity.postrm
rename to ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postrm
diff --git a/ubuntu/_base/applications/kstreamripper/debian/kstreamripper.1 b/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper.1
similarity index 100%
rename from ubuntu/_base/applications/kstreamripper/debian/kstreamripper.1
rename to ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper.1
diff --git a/ubuntu/_base/applications/konversation/debian/patches/.gitignore b/ubuntu/_base/applications/internet/kstreamripper/debian/patches/.gitignore
similarity index 100%
rename from ubuntu/_base/applications/konversation/debian/patches/.gitignore
rename to ubuntu/_base/applications/internet/kstreamripper/debian/patches/.gitignore
diff --git a/ubuntu/_base/applications/kdiff3/debian/rules b/ubuntu/_base/applications/internet/kstreamripper/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kdiff3/debian/rules
rename to ubuntu/_base/applications/internet/kstreamripper/debian/rules
diff --git a/ubuntu/_base/applications/kbarcode/debian/source/format b/ubuntu/_base/applications/internet/kstreamripper/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kbarcode/debian/source/format
rename to ubuntu/_base/applications/internet/kstreamripper/debian/source/format
diff --git a/ubuntu/_base/applications/kbarcode/debian/source/options b/ubuntu/_base/applications/internet/kstreamripper/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kbarcode/debian/source/options
rename to ubuntu/_base/applications/internet/kstreamripper/debian/source/options
diff --git a/ubuntu/_base/applications/ktorrent/debian/README.Debian b/ubuntu/_base/applications/internet/ktorrent/debian/README.Debian
similarity index 100%
rename from ubuntu/_base/applications/ktorrent/debian/README.Debian
rename to ubuntu/_base/applications/internet/ktorrent/debian/README.Debian
diff --git a/ubuntu/_base/applications/kbookreader/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/ktorrent/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kbookreader/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/internet/ktorrent/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kbookreader/debian/cdbs/versions.pl b/ubuntu/_base/applications/internet/ktorrent/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kbookreader/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/internet/ktorrent/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/ktorrent/debian/changelog b/ubuntu/_base/applications/internet/ktorrent/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/ktorrent/debian/changelog
rename to ubuntu/_base/applications/internet/ktorrent/debian/changelog
diff --git a/ubuntu/_base/applications/kbibtex/debian/compat b/ubuntu/_base/applications/internet/ktorrent/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kbibtex/debian/compat
rename to ubuntu/_base/applications/internet/ktorrent/debian/compat
diff --git a/ubuntu/_base/applications/ktorrent/debian/control b/ubuntu/_base/applications/internet/ktorrent/debian/control
similarity index 100%
rename from ubuntu/_base/applications/ktorrent/debian/control
rename to ubuntu/_base/applications/internet/ktorrent/debian/control
diff --git a/ubuntu/_base/applications/ktorrent/debian/copyright b/ubuntu/_base/applications/internet/ktorrent/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/ktorrent/debian/copyright
rename to ubuntu/_base/applications/internet/ktorrent/debian/copyright
diff --git a/ubuntu/_base/applications/ktorrent/debian/ktorrent.1.docbook b/ubuntu/_base/applications/internet/ktorrent/debian/ktorrent.1.docbook
similarity index 100%
rename from ubuntu/_base/applications/ktorrent/debian/ktorrent.1.docbook
rename to ubuntu/_base/applications/internet/ktorrent/debian/ktorrent.1.docbook
diff --git a/ubuntu/_base/applications/gtk-qt-engine/debian/patches/series b/ubuntu/_base/applications/internet/ktorrent/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/gtk-qt-engine/debian/patches/series
rename to ubuntu/_base/applications/internet/ktorrent/debian/patches/series
diff --git a/ubuntu/_base/applications/ktorrent/debian/rules b/ubuntu/_base/applications/internet/ktorrent/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/ktorrent/debian/rules
rename to ubuntu/_base/applications/internet/ktorrent/debian/rules
diff --git a/ubuntu/_base/applications/kbfx/debian/source/format b/ubuntu/_base/applications/internet/ktorrent/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kbfx/debian/source/format
rename to ubuntu/_base/applications/internet/ktorrent/debian/source/format
diff --git a/ubuntu/_base/applications/kbfx/debian/source/options b/ubuntu/_base/applications/internet/ktorrent/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kbfx/debian/source/options
rename to ubuntu/_base/applications/internet/ktorrent/debian/source/options
diff --git a/ubuntu/_base/applications/ktorrent/debian/watch b/ubuntu/_base/applications/internet/ktorrent/debian/watch
similarity index 100%
rename from ubuntu/_base/applications/ktorrent/debian/watch
rename to ubuntu/_base/applications/internet/ktorrent/debian/watch
diff --git a/ubuntu/_base/applications/kvirc/debian/changelog b/ubuntu/_base/applications/internet/kvirc/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kvirc/debian/changelog
rename to ubuntu/_base/applications/internet/kvirc/debian/changelog
diff --git a/ubuntu/_base/applications/kbiff/debian/compat b/ubuntu/_base/applications/internet/kvirc/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kbiff/debian/compat
rename to ubuntu/_base/applications/internet/kvirc/debian/compat
diff --git a/ubuntu/_base/applications/kvirc/debian/control b/ubuntu/_base/applications/internet/kvirc/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kvirc/debian/control
rename to ubuntu/_base/applications/internet/kvirc/debian/control
diff --git a/ubuntu/_base/applications/kvirc/debian/copyright b/ubuntu/_base/applications/internet/kvirc/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kvirc/debian/copyright
rename to ubuntu/_base/applications/internet/kvirc/debian/copyright
diff --git a/ubuntu/_base/applications/kvirc/debian/kvirc-data-trinity.install b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/kvirc/debian/kvirc-data-trinity.install
rename to ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install
diff --git a/ubuntu/_base/applications/kvirc/debian/kvirc-data-trinity.links b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.links
similarity index 100%
rename from ubuntu/_base/applications/kvirc/debian/kvirc-data-trinity.links
rename to ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.links
diff --git a/ubuntu/_base/applications/kvirc/debian/kvirc-data-trinity.postinst b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.postinst
similarity index 100%
rename from ubuntu/_base/applications/kvirc/debian/kvirc-data-trinity.postinst
rename to ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.postinst
diff --git a/ubuntu/_base/applications/kvirc/debian/kvirc-data-trinity.prerm b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.prerm
similarity index 100%
rename from ubuntu/_base/applications/kvirc/debian/kvirc-data-trinity.prerm
rename to ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.prerm
diff --git a/ubuntu/_base/applications/kvirc/debian/kvirc-trinity-dev.install b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-trinity-dev.install
similarity index 100%
rename from ubuntu/_base/applications/kvirc/debian/kvirc-trinity-dev.install
rename to ubuntu/_base/applications/internet/kvirc/debian/kvirc-trinity-dev.install
diff --git a/ubuntu/_base/applications/kvirc/debian/kvirc-trinity-dev.links b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-trinity-dev.links
similarity index 100%
rename from ubuntu/_base/applications/kvirc/debian/kvirc-trinity-dev.links
rename to ubuntu/_base/applications/internet/kvirc/debian/kvirc-trinity-dev.links
diff --git a/ubuntu/_base/applications/kvirc/debian/kvirc-trinity.install b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/kvirc/debian/kvirc-trinity.install
rename to ubuntu/_base/applications/internet/kvirc/debian/kvirc-trinity.install
diff --git a/ubuntu/_base/applications/kvirc/debian/kvirc-trinity.menu b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/kvirc/debian/kvirc-trinity.menu
rename to ubuntu/_base/applications/internet/kvirc/debian/kvirc-trinity.menu
diff --git a/ubuntu/_base/applications/kvirc/debian/overrides/kvirc-trinity b/ubuntu/_base/applications/internet/kvirc/debian/overrides/kvirc-trinity
similarity index 100%
rename from ubuntu/_base/applications/kvirc/debian/overrides/kvirc-trinity
rename to ubuntu/_base/applications/internet/kvirc/debian/overrides/kvirc-trinity
diff --git a/ubuntu/_base/applications/gtk3-tqt-engine/debian/patches/series b/ubuntu/_base/applications/internet/kvirc/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/gtk3-tqt-engine/debian/patches/series
rename to ubuntu/_base/applications/internet/kvirc/debian/patches/series
diff --git a/ubuntu/_base/applications/kvirc/debian/rules b/ubuntu/_base/applications/internet/kvirc/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kvirc/debian/rules
rename to ubuntu/_base/applications/internet/kvirc/debian/rules
diff --git a/ubuntu/_base/applications/kbibtex/debian/source/format b/ubuntu/_base/applications/internet/kvirc/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kbibtex/debian/source/format
rename to ubuntu/_base/applications/internet/kvirc/debian/source/format
diff --git a/ubuntu/_base/applications/kbibtex/debian/source/options b/ubuntu/_base/applications/internet/kvirc/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kbibtex/debian/source/options
rename to ubuntu/_base/applications/internet/kvirc/debian/source/options
diff --git a/ubuntu/_base/applications/kvpnc/debian/README.Debian b/ubuntu/_base/applications/internet/kvpnc/debian/README.Debian
similarity index 100%
rename from ubuntu/_base/applications/kvpnc/debian/README.Debian
rename to ubuntu/_base/applications/internet/kvpnc/debian/README.Debian
diff --git a/ubuntu/_base/applications/kchmviewer/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/kvpnc/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kchmviewer/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/internet/kvpnc/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kchmviewer/debian/cdbs/versions.pl b/ubuntu/_base/applications/internet/kvpnc/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kchmviewer/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/internet/kvpnc/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kvpnc/debian/changelog b/ubuntu/_base/applications/internet/kvpnc/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kvpnc/debian/changelog
rename to ubuntu/_base/applications/internet/kvpnc/debian/changelog
diff --git a/ubuntu/_base/applications/kchmviewer/debian/compat b/ubuntu/_base/applications/internet/kvpnc/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kchmviewer/debian/compat
rename to ubuntu/_base/applications/internet/kvpnc/debian/compat
diff --git a/ubuntu/_base/applications/kvpnc/debian/control b/ubuntu/_base/applications/internet/kvpnc/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kvpnc/debian/control
rename to ubuntu/_base/applications/internet/kvpnc/debian/control
diff --git a/ubuntu/_base/applications/kvpnc/debian/copyright b/ubuntu/_base/applications/internet/kvpnc/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kvpnc/debian/copyright
rename to ubuntu/_base/applications/internet/kvpnc/debian/copyright
diff --git a/ubuntu/_base/applications/knetload/debian/docs b/ubuntu/_base/applications/internet/kvpnc/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/knetload/debian/docs
rename to ubuntu/_base/applications/internet/kvpnc/debian/docs
diff --git a/ubuntu/_base/applications/kvpnc/debian/menu b/ubuntu/_base/applications/internet/kvpnc/debian/menu
similarity index 100%
rename from ubuntu/_base/applications/kvpnc/debian/menu
rename to ubuntu/_base/applications/internet/kvpnc/debian/menu
diff --git a/ubuntu/_base/applications/kvpnc/debian/patches/10_su-to-root_usage.diff b/ubuntu/_base/applications/internet/kvpnc/debian/patches/10_su-to-root_usage.diff
similarity index 100%
rename from ubuntu/_base/applications/kvpnc/debian/patches/10_su-to-root_usage.diff
rename to ubuntu/_base/applications/internet/kvpnc/debian/patches/10_su-to-root_usage.diff
diff --git a/ubuntu/_base/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/ubuntu/_base/applications/internet/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
similarity index 100%
rename from ubuntu/_base/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
rename to ubuntu/_base/applications/internet/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
diff --git a/ubuntu/_base/applications/kvpnc/debian/patches/series b/ubuntu/_base/applications/internet/kvpnc/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/kvpnc/debian/patches/series
rename to ubuntu/_base/applications/internet/kvpnc/debian/patches/series
diff --git a/ubuntu/_base/applications/kdirstat/debian/rules b/ubuntu/_base/applications/internet/kvpnc/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kdirstat/debian/rules
rename to ubuntu/_base/applications/internet/kvpnc/debian/rules
diff --git a/ubuntu/_base/applications/kbiff/debian/source/format b/ubuntu/_base/applications/internet/kvpnc/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kbiff/debian/source/format
rename to ubuntu/_base/applications/internet/kvpnc/debian/source/format
diff --git a/ubuntu/_base/applications/kbiff/debian/source/options b/ubuntu/_base/applications/internet/kvpnc/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kbiff/debian/source/options
rename to ubuntu/_base/applications/internet/kvpnc/debian/source/options
diff --git a/ubuntu/_base/applications/smb4k/debian/README.Debian b/ubuntu/_base/applications/internet/smb4k/debian/README.Debian
similarity index 100%
rename from ubuntu/_base/applications/smb4k/debian/README.Debian
rename to ubuntu/_base/applications/internet/smb4k/debian/README.Debian
diff --git a/ubuntu/_base/applications/kcmautostart/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/smb4k/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kcmautostart/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/internet/smb4k/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kcmautostart/debian/cdbs/versions.pl b/ubuntu/_base/applications/internet/smb4k/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kcmautostart/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/internet/smb4k/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/smb4k/debian/changelog b/ubuntu/_base/applications/internet/smb4k/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/smb4k/debian/changelog
rename to ubuntu/_base/applications/internet/smb4k/debian/changelog
diff --git a/ubuntu/_base/applications/kcmautostart/debian/compat b/ubuntu/_base/applications/internet/smb4k/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kcmautostart/debian/compat
rename to ubuntu/_base/applications/internet/smb4k/debian/compat
diff --git a/ubuntu/_base/applications/smb4k/debian/control b/ubuntu/_base/applications/internet/smb4k/debian/control
similarity index 100%
rename from ubuntu/_base/applications/smb4k/debian/control
rename to ubuntu/_base/applications/internet/smb4k/debian/control
diff --git a/ubuntu/_base/applications/smb4k/debian/copyright b/ubuntu/_base/applications/internet/smb4k/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/smb4k/debian/copyright
rename to ubuntu/_base/applications/internet/smb4k/debian/copyright
diff --git a/ubuntu/_base/applications/smb4k/debian/docs b/ubuntu/_base/applications/internet/smb4k/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/smb4k/debian/docs
rename to ubuntu/_base/applications/internet/smb4k/debian/docs
diff --git a/ubuntu/_base/applications/smb4k/debian/menu b/ubuntu/_base/applications/internet/smb4k/debian/menu
similarity index 100%
rename from ubuntu/_base/applications/smb4k/debian/menu
rename to ubuntu/_base/applications/internet/smb4k/debian/menu
diff --git a/ubuntu/_base/applications/smb4k/debian/rules b/ubuntu/_base/applications/internet/smb4k/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/smb4k/debian/rules
rename to ubuntu/_base/applications/internet/smb4k/debian/rules
diff --git a/ubuntu/_base/applications/kbookreader/debian/source/format b/ubuntu/_base/applications/internet/smb4k/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kbookreader/debian/source/format
rename to ubuntu/_base/applications/internet/smb4k/debian/source/format
diff --git a/ubuntu/_base/applications/kbookreader/debian/source/options b/ubuntu/_base/applications/internet/smb4k/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kbookreader/debian/source/options
rename to ubuntu/_base/applications/internet/smb4k/debian/source/options
diff --git a/ubuntu/_base/applications/smb4k/debian/watch b/ubuntu/_base/applications/internet/smb4k/debian/watch
similarity index 100%
rename from ubuntu/_base/applications/smb4k/debian/watch
rename to ubuntu/_base/applications/internet/smb4k/debian/watch
diff --git a/ubuntu/_base/applications/kcmldap/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/tork/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kcmldap/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/internet/tork/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kcmldap/debian/cdbs/versions.pl b/ubuntu/_base/applications/internet/tork/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kcmldap/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/internet/tork/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/tork/debian/changelog b/ubuntu/_base/applications/internet/tork/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/tork/debian/changelog
rename to ubuntu/_base/applications/internet/tork/debian/changelog
diff --git a/ubuntu/_base/applications/kcmldap/debian/compat b/ubuntu/_base/applications/internet/tork/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kcmldap/debian/compat
rename to ubuntu/_base/applications/internet/tork/debian/compat
diff --git a/ubuntu/_base/applications/tork/debian/control b/ubuntu/_base/applications/internet/tork/debian/control
similarity index 100%
rename from ubuntu/_base/applications/tork/debian/control
rename to ubuntu/_base/applications/internet/tork/debian/control
diff --git a/ubuntu/_base/applications/tork/debian/copyright b/ubuntu/_base/applications/internet/tork/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/tork/debian/copyright
rename to ubuntu/_base/applications/internet/tork/debian/copyright
diff --git a/ubuntu/_base/applications/krename/debian/docs b/ubuntu/_base/applications/internet/tork/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/krename/debian/docs
rename to ubuntu/_base/applications/internet/tork/debian/docs
diff --git a/ubuntu/_base/applications/tork/debian/rules b/ubuntu/_base/applications/internet/tork/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/tork/debian/rules
rename to ubuntu/_base/applications/internet/tork/debian/rules
diff --git a/ubuntu/_base/applications/kchmviewer/debian/source/format b/ubuntu/_base/applications/internet/tork/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kchmviewer/debian/source/format
rename to ubuntu/_base/applications/internet/tork/debian/source/format
diff --git a/ubuntu/_base/applications/kchmviewer/debian/source/options b/ubuntu/_base/applications/internet/tork/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kchmviewer/debian/source/options
rename to ubuntu/_base/applications/internet/tork/debian/source/options
diff --git a/ubuntu/_base/applications/tork/debian/tork-data-trinity.install b/ubuntu/_base/applications/internet/tork/debian/tork-data-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/tork/debian/tork-data-trinity.install
rename to ubuntu/_base/applications/internet/tork/debian/tork-data-trinity.install
diff --git a/ubuntu/_base/applications/tork/debian/tork-trinity.install b/ubuntu/_base/applications/internet/tork/debian/tork-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/tork/debian/tork-trinity.install
rename to ubuntu/_base/applications/internet/tork/debian/tork-trinity.install
diff --git a/ubuntu/_base/applications/tork/debian/tork-trinity.postinst b/ubuntu/_base/applications/internet/tork/debian/tork-trinity.postinst
similarity index 100%
rename from ubuntu/_base/applications/tork/debian/tork-trinity.postinst
rename to ubuntu/_base/applications/internet/tork/debian/tork-trinity.postinst
diff --git a/ubuntu/_base/applications/tork/debian/tork-trinity.postrm b/ubuntu/_base/applications/internet/tork/debian/tork-trinity.postrm
similarity index 100%
rename from ubuntu/_base/applications/tork/debian/tork-trinity.postrm
rename to ubuntu/_base/applications/internet/tork/debian/tork-trinity.postrm
diff --git a/ubuntu/_base/applications/kmatplot/debian/changelog b/ubuntu/_base/applications/kmatplot/debian/changelog
deleted file mode 100644
index 6bd58f944..000000000
--- a/ubuntu/_base/applications/kmatplot/debian/changelog
+++ /dev/null
@@ -1,81 +0,0 @@
-kmatplot-trinity (0.4-9-0ubuntu0) lucid; urgency=low
-
-  * Initial import
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 10 Dec 2011 18:34:00 -0600
-
-kmatplot (0.4-8) unstable; urgency=low
-
-  * Orphan package
-
- -- Hugo van der Merwe <hvdm@debian.org>  Wed, 11 Jan 2006 12:29:07 +0200
-
-kmatplot (0.4-7.2) unstable; urgency=low
-
-  * 0-day NMU during BSP.
-  * Build-conflicts on autoconf and autoconf2.13 to fix FTBFS on sparc.
-
- -- Aurelien Jarno <aurel32@debian.org>  Sat, 17 Dec 2005 17:00:30 +0100
-
-kmatplot (0.4-7.1) unstable; urgency=low
-
-  * 0-day NMU during BSP.
-  * Rebuild for the Qt/KDE transition (closes: bug#327980).
-  * Rebuilt for libreadline transition (closes: bug#326338).
-  * Applied a patch from Andreas Jochen to make the package buildable with
-    gcc-4.0 (closes: bug#300867).
-  * Build the shared libraries with -fPIC (closes: bug#286533).
-  * Added support for GNU/kFreeBSD.
-
- -- Aurelien Jarno <aurel32@debian.org>  Sat, 17 Dec 2005 15:43:54 +0100
-
-kmatplot (0.4-7) unstable; urgency=low
-
-  * Rebuild with latest unstable packages (Closes: #249482)
-
- -- Hugo van der Merwe <hvdm@debian.org>  Wed, 15 Dec 2004 09:57:20 +0200
-
-kmatplot (0.4-6) unstable; urgency=low
-
-  * Build with new octave (Closes: #240548)
-
- -- Hugo van der Merwe <hvdm@debian.org>  Mon, 29 Mar 2004 02:11:03 +0200
-
-kmatplot (0.4-5) unstable; urgency=low
-
-  * Update build-dependencies (Closes: #224711,#219556)
-    (ACK NMU by J.H.M. Dassen, thanks.)
-  * Build with octave-2.1.52 (Closes: #210510)
-  * Switched to cdbs.
-  * (0.4-4 never uploaded due to dead hard-drive, and long GPG key
-    salvaging operation - I don't keep backups of secret keys ;-)
-
- -- Hugo van der Merwe <hvdm@debian.org>  Wed, 31 Dec 2003 18:09:41 +0200
-
-kmatplot (0.4-3.1) unstable; urgency=medium
-
-  * NMU
-  * [debian/control] Updated build dependencies to fix FTBFS. (Closes: #219556)
-
- -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Sun, 21 Dec 2003 12:39:58 +0100
-
-kmatplot (0.4-3) unstable; urgency=low
-
-  * Applied patch from John Lightsey fixing G++ and QT3 build
-    problems. (Closes: #184028)
-
- -- Hugo van der Merwe <hvdm@debian.org>  Sun,  1 Jun 2003 12:55:36 +0200
-
-kmatplot (0.4-2) unstable; urgency=low
-
-  * Fixed SearchPath so that kmatplot finds its rc file. Thanks Laurent
-    Jacques.
-
- -- Hugo van der Merwe <hvdm@debian.org>  Sun, 12 May 2002 00:01:15 +0200
-
-kmatplot (0.4-1) unstable; urgency=low
-
-  * Initial Release. (Closes: #144363)
-
- -- Hugo van der Merwe <hvdm@debian.org>  Wed, 24 Apr 2002 17:24:30 +0200
-
diff --git a/ubuntu/_base/applications/kmatplot/debian/control b/ubuntu/_base/applications/kmatplot/debian/control
deleted file mode 100644
index a5ceef294..000000000
--- a/ubuntu/_base/applications/kmatplot/debian/control
+++ /dev/null
@@ -1,28 +0,0 @@
-Source: kmatplot-trinity
-Section: math
-Priority: optional
-Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: debhelper (>= 9~), libtqtinterface-dev, xlibmesa-gl-dev, octave2.1-headers, cdbs, automake, autoconf, libtool, libltdl-dev
-Build-Conflicts: scilab
-Standards-Version: 3.8.4
-
-Package: kmatplot-trinity
-Architecture: any
-Depends: ${shlibs:Depends}
-Replaces: kmatplot-trinity (<< 4:14.0.0~)
-Breaks: kmatplot-trinity (<< 4:14.0.0~)
-Recommends: octave2.1
-Description: A Gnuplot-like tool for plotting data sets in 2D or 3D
- KMatplot is a gnuplot-like tool for plotting data sets in either two or
- three dimensions. It can plot many types of 2d plots, including pixmaps
- and contours, and 3d surfaces. It offers a full WYSIWYG mode with
- multiple objects on a single page.
- .
- As opposite to Gnuplot, KMatplot is very clickable, so easier to use
- for unexperienced users. It can be used instead of Gnuplot with Octave
- and Scilab - there are new dll functions installed in those packages,
- which communicate with KMatplot through an Unix socket. Those functions
- are named 'kplot', 'kimage', kmesh', ... and are similar to those found
- in Octave by default.
- .
- The Debian package is not built with Scilab support by default.
diff --git a/ubuntu/_base/applications/kmatplot/debian/copyright b/ubuntu/_base/applications/kmatplot/debian/copyright
deleted file mode 100644
index e61cc889c..000000000
--- a/ubuntu/_base/applications/kmatplot/debian/copyright
+++ /dev/null
@@ -1,18 +0,0 @@
-This package was debianized by Hugo van der Merwe <hvdm@debian.org> on
-Wed, 24 Apr 2002 15:23:52 +0200.
-
-It was downloaded from http://kmatplot.sourceforge.net/
-
-Upstream Author: Kamil Dobkowski <kamildobk@poczta.onet.pl>
-
-Copyright:
-
-This software is copyright (c) 2000-2002 by Kamil Dobkowski
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-On Debian systems, the complete text of the GNU General Public
-License can be found in /usr/share/common-licenses/GPL file.
diff --git a/ubuntu/_base/applications/kmatplot/debian/debianrules b/ubuntu/_base/applications/kmatplot/debian/debianrules
deleted file mode 100644
index 5976c6894..000000000
--- a/ubuntu/_base/applications/kmatplot/debian/debianrules
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/usr/bin/perl -w
-
-use Shell qw(mv cp mkdir rm) ;
-use File::Find;
-use Cwd;
-
-$origPwd = `pwd`;
-chomp $origPwd;
-
-
-if (@ARGV && $ARGV[0] eq 'cleanup') {
-
-if (-d "debian/tmp/usr/share/config") {
-	if (! -d "debian/tmp/$tde_confdir") {
-	  system("mv debian/tmp/usr/share/config debian/tmp/$tde_confdir");
-	}
-}
-system("rm -f `find debian/ -name \".anchors\"`");
-system("chmod 755 debian/*preinst debian/*postinst");
-
-exit;
-}
-
-$TQTDIR="/usr/share/tqt3";
-$tde_prefix="/opt/trinity";
-$tde_htmldir="$tde_prefix/share/doc/tde/HTML";
-$tde_icondir="$tde_prefix/share/icons";
-$tde_sounddir="$tde_prefix/share/sounds";
-$tde_datadir="$tde_prefix/share/apps";
-$tde_locale="$tde_prefix/share/locale";
-$tde_confdir="/etc/tde2";
-$tde_cgidir="$tde_prefix/lib/cgi-bin";
-$tde_appsdir="$tde_prefix/share/applnk";
-$tde_mimedir="$tde_prefix/share/mimelnk";
-$tde_wallpaperdir="$tde_prefix/share/wallpapers";
-$tde_bindir="$tde_prefix/bin";
-$tde_servicesdir="$tde_prefix/share/services";
-$tde_servicetypesdir="$tde_prefix/share/servicetypes";
-$tde_includedir="$tde_prefix/include/tde";
-$tde_libdir="$tde_prefix/lib";
-$tde_moduledir="$tde_prefix/lib/tde";
-$mandir="$tde_prefix/share/man"; 
-$infodir="$tde_prefix/share/info";
-$IDL="$tde_bindir/cuteidl";
-$DCOPIDL="$tde_bindir/dcopidl";
-$DCOPIDL2CPP="$tde_bindir/dcopidl2cpp";
-$KDB2HTML="$tde_bindir/kdb2html";
-$MCOPIDL="$tde_bindir/mcopidl";
-$ARTSCCONFIG="$tde_bindir/artsc-config";
-
-if (@ARGV && $ARGV[0] eq 'echodirs') {
-  print STDOUT "export tde_htmldir=$tde_htmldir\n";
-  print STDOUT "export tde_appsdir=$tde_appsdir\n";
-  print STDOUT "export tde_icondir=$tde_icondir\n";
-  print STDOUT "export tde_sounddir=$tde_sounddir\n";
-  print STDOUT "export tde_datadir=$tde_datadir\n";
-  print STDOUT "export tde_cgidir=$tde_cgidir\n";
-  print STDOUT "export tde_locale=$tde_locale\n";
-  print STDOUT "export tde_confdir=$tde_confdir\n";
-  print STDOUT "export tde_mimedir=$tde_mimedir\n";
-  print STDOUT "export tde_wallpaperdir=$tde_wallpaperdir\n";
-  print STDOUT "export tde_bindir=$tde_bindir\n";
-  print STDOUT "export tde_servicesdir=$tde_servicesdir\n";
-  print STDOUT "export tde_servicetypesdir=$tde_servicetypesdir\n";
-  print STDOUT "export tde_includedir=$tde_includedir\n";
-  print STDOUT "export tde_libdir=$tde_libdir\n";
-  print STDOUT "export tde_moduledir=$tde_moduledir\n";
-  print STDOUT "export mandir=$mandir\n";
-  print STDOUT "export infodir=$infodir\n";
-  print STDOUT "export TQTDIR=$TQTDIR\n";
-  print STDOUT "export tde_prefix=$tde_prefix\n";
-  print STDOUT "export INSTALL_DATA=install -p -c -m 644\n";
-  print STDOUT "export IDL=$IDL\n";
-  print STDOUT "export DCOPIDL=$DCOPIDL\n";
-  print STDOUT "export DCOPIDL2CPP=$DCOPIDL2CPP\n";
-  print STDOUT "export KDB2HTML=$KDB2HTML\n";
-  print STDOUT "export MCOPIDL=$MCOPIDL\n";
-  print STDOUT "export ARTSCCONFIG=$ARTSCCONFIG\n";
-  print STDOUT "configtde=--disable-debug --disable-rpath --prefix=\$(tde_prefix) --libexecdir=\$(tde_bindir) --libdir=\$(tde_libdir) --includedir=\$(tde_includedir) --with-qt-includes=/usr/include/qt --mandir=\$(mandir) --infodir=\$(infodir)\n";
-  print STDOUT "configtdevelop=--disable-debug --enable-docbase --enable-kdoc2 --disable-rpath --libdir=\$(tde_libdir) --includedir=\$(tde_includedir) --with-qt-includes=/usr/include/qt --mandir=\$(mandir) --with-tdelibsdoc-dir=/usr/share/doc/tdelibs3-doc/html\n";
-  print STDOUT "configtdepim=--disable-debug --with-extra-includes=/usr/include/libpisock --enable-shared --disable-rpath --libdir=\$(tde_libdir) --includedir=\$(tde_includedir) --prefix=\$(tde_prefix) --libexecdir=\$(tde_bindir) --with-qt-includes=/usr/include/qt --mandir=\$(mandir) --infodir=\$(infodir)\n";
-  exit
-}
-
diff --git a/ubuntu/_base/applications/kmatplot/debian/dirs b/ubuntu/_base/applications/kmatplot/debian/dirs
deleted file mode 100644
index e77248175..000000000
--- a/ubuntu/_base/applications/kmatplot/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin
diff --git a/ubuntu/_base/applications/kmatplot/debian/kmatplot.1 b/ubuntu/_base/applications/kmatplot/debian/kmatplot.1
deleted file mode 100644
index 0937e379f..000000000
--- a/ubuntu/_base/applications/kmatplot/debian/kmatplot.1
+++ /dev/null
@@ -1,38 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.TH KMATPLOT 1 "May 1, 2002"
-.\" Please adjust this date whenever revising the manpage.
-
-.SH NAME
-kmatplot \- A Gnuplot-like tool for plotting data sets in 2D or 3D.
-
-.SH SYNOPSIS
-.B kmatplot
-
-.SH DESCRIPTION
-This manual page briefly documents
-.B KMatplot.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-.B KMatplot
-is a Gnuplot-like tool for plotting data sets in either two or
-three dimensions. It can plot many types of 2d plots, including pixmaps
-and contours, and 3d surfaces. It offers a full WYSIWYG mode with
-multiple objects on a single page.
-
-As opposite to Gnuplot,
-.B KMatplot is very clickable, so easier to use for unexperienced users.
-It can be used instead of Gnuplot with Octave and Scilab (although the
-Debian package is not built with Scilab support by default) - there are
-new dll functions installed in those packages, which communicate with
-.B KMatplot
-through a Unix socket. Those functions are named 'kplot', 'kimage',
-kmesh', and are similar to those found in Octave by default.
-
-Example plots can be found in the Help menu of the program. Help for
-many of the Octave functions can be found within Octave, for example:
-"help kplot", "help kaddaxes".
-
-.SH AUTHOR
-This manual page was written by Hugo van der Merwe <hvdm@debian.org>,
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/applications/kmatplot/debian/kmatplot.manpages b/ubuntu/_base/applications/kmatplot/debian/kmatplot.manpages
deleted file mode 100644
index e093ba20c..000000000
--- a/ubuntu/_base/applications/kmatplot/debian/kmatplot.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kmatplot.1
diff --git a/ubuntu/_base/applications/kmatplot/debian/menu b/ubuntu/_base/applications/kmatplot/debian/menu
deleted file mode 100644
index 0f04a74cf..000000000
--- a/ubuntu/_base/applications/kmatplot/debian/menu
+++ /dev/null
@@ -1,2 +0,0 @@
-?package(kmatplot-trinity):needs="X11" section="Apps/Math"\
-  title="kmatplot" command="/opt/trinity/bin/kmatplot"
diff --git a/ubuntu/_base/applications/kmatplot/debian/rules b/ubuntu/_base/applications/kmatplot/debian/rules
deleted file mode 100755
index 0df925fe4..000000000
--- a/ubuntu/_base/applications/kmatplot/debian/rules
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-export QSETTINGSDIR=/etc
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-mt --with-qsettings-dir=/etc
-DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/_base/applications/bibletime/debian/bibletime.xpm b/ubuntu/_base/applications/misc/bibletime/debian/bibletime.xpm
similarity index 100%
rename from ubuntu/_base/applications/bibletime/debian/bibletime.xpm
rename to ubuntu/_base/applications/misc/bibletime/debian/bibletime.xpm
diff --git a/ubuntu/_base/applications/kcmldapcontroller/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/misc/bibletime/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kcmldapcontroller/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/misc/bibletime/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kcmldapcontroller/debian/cdbs/versions.pl b/ubuntu/_base/applications/misc/bibletime/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kcmldapcontroller/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/misc/bibletime/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/bibletime/debian/changelog b/ubuntu/_base/applications/misc/bibletime/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/bibletime/debian/changelog
rename to ubuntu/_base/applications/misc/bibletime/debian/changelog
diff --git a/ubuntu/_base/applications/kcmldapcontroller/debian/compat b/ubuntu/_base/applications/misc/bibletime/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kcmldapcontroller/debian/compat
rename to ubuntu/_base/applications/misc/bibletime/debian/compat
diff --git a/ubuntu/_base/applications/bibletime/debian/control b/ubuntu/_base/applications/misc/bibletime/debian/control
similarity index 100%
rename from ubuntu/_base/applications/bibletime/debian/control
rename to ubuntu/_base/applications/misc/bibletime/debian/control
diff --git a/ubuntu/_base/applications/bibletime/debian/copyright b/ubuntu/_base/applications/misc/bibletime/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/bibletime/debian/copyright
rename to ubuntu/_base/applications/misc/bibletime/debian/copyright
diff --git a/ubuntu/_base/applications/bibletime/debian/de/bibletime.1 b/ubuntu/_base/applications/misc/bibletime/debian/de/bibletime.1
similarity index 100%
rename from ubuntu/_base/applications/bibletime/debian/de/bibletime.1
rename to ubuntu/_base/applications/misc/bibletime/debian/de/bibletime.1
diff --git a/ubuntu/_base/applications/bibletime/debian/dirs b/ubuntu/_base/applications/misc/bibletime/debian/dirs
similarity index 100%
rename from ubuntu/_base/applications/bibletime/debian/dirs
rename to ubuntu/_base/applications/misc/bibletime/debian/dirs
diff --git a/ubuntu/_base/applications/bibletime/debian/en/bibletime.1 b/ubuntu/_base/applications/misc/bibletime/debian/en/bibletime.1
similarity index 100%
rename from ubuntu/_base/applications/bibletime/debian/en/bibletime.1
rename to ubuntu/_base/applications/misc/bibletime/debian/en/bibletime.1
diff --git a/ubuntu/_base/applications/bibletime/debian/install b/ubuntu/_base/applications/misc/bibletime/debian/install
similarity index 100%
rename from ubuntu/_base/applications/bibletime/debian/install
rename to ubuntu/_base/applications/misc/bibletime/debian/install
diff --git a/ubuntu/_base/applications/bibletime/debian/menu b/ubuntu/_base/applications/misc/bibletime/debian/menu
similarity index 100%
rename from ubuntu/_base/applications/bibletime/debian/menu
rename to ubuntu/_base/applications/misc/bibletime/debian/menu
diff --git a/ubuntu/_base/applications/gwenview-i18n/debian/patches/series b/ubuntu/_base/applications/misc/bibletime/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/gwenview-i18n/debian/patches/series
rename to ubuntu/_base/applications/misc/bibletime/debian/patches/series
diff --git a/ubuntu/_base/applications/bibletime/debian/rules b/ubuntu/_base/applications/misc/bibletime/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/bibletime/debian/rules
rename to ubuntu/_base/applications/misc/bibletime/debian/rules
diff --git a/ubuntu/_base/applications/kcmautostart/debian/source/format b/ubuntu/_base/applications/misc/bibletime/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kcmautostart/debian/source/format
rename to ubuntu/_base/applications/misc/bibletime/debian/source/format
diff --git a/ubuntu/_base/applications/kcmautostart/debian/source/options b/ubuntu/_base/applications/misc/bibletime/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kcmautostart/debian/source/options
rename to ubuntu/_base/applications/misc/bibletime/debian/source/options
diff --git a/ubuntu/_base/applications/kcmldapmanager/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kcmldapmanager/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kcmldapmanager/debian/cdbs/versions.pl b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kcmldapmanager/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/changelog b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/changelog
rename to ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/changelog
diff --git a/ubuntu/_base/applications/kcmldapmanager/debian/compat b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kcmldapmanager/debian/compat
rename to ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/compat
diff --git a/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/control b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/control
similarity index 100%
rename from ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/control
rename to ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/control
diff --git a/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/copyright b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/copyright
rename to ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/copyright
diff --git a/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/docs b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/docs
rename to ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/docs
diff --git a/ubuntu/_base/applications/gwenview/debian/patches/series b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/gwenview/debian/patches/series
rename to ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/patches/series
diff --git a/ubuntu/_base/applications/kchmviewer/debian/rules b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kchmviewer/debian/rules
rename to ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/rules
diff --git a/ubuntu/_base/applications/kcmldap/debian/source/format b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kcmldap/debian/source/format
rename to ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/source/format
diff --git a/ubuntu/_base/applications/kcmldap/debian/source/options b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kcmldap/debian/source/options
rename to ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/source/options
diff --git a/ubuntu/_base/applications/desktop-effects-tde/debian/changelog b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/desktop-effects-tde/debian/changelog
rename to ubuntu/_base/applications/misc/desktop-effects-tde/debian/changelog
diff --git a/ubuntu/_base/applications/kcpuload/debian/compat b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kcpuload/debian/compat
rename to ubuntu/_base/applications/misc/desktop-effects-tde/debian/compat
diff --git a/ubuntu/_base/applications/desktop-effects-tde/debian/control b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/control
similarity index 100%
rename from ubuntu/_base/applications/desktop-effects-tde/debian/control
rename to ubuntu/_base/applications/misc/desktop-effects-tde/debian/control
diff --git a/ubuntu/_base/applications/desktop-effects-tde/debian/copyright b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/desktop-effects-tde/debian/copyright
rename to ubuntu/_base/applications/misc/desktop-effects-tde/debian/copyright
diff --git a/ubuntu/_base/applications/desktop-effects-tde/debian/desktop-effects-tde-trinity.install b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/desktop-effects-tde-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/desktop-effects-tde/debian/desktop-effects-tde-trinity.install
rename to ubuntu/_base/applications/misc/desktop-effects-tde/debian/desktop-effects-tde-trinity.install
diff --git a/ubuntu/_base/applications/desktop-effects-tde/debian/rules b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/desktop-effects-tde/debian/rules
rename to ubuntu/_base/applications/misc/desktop-effects-tde/debian/rules
diff --git a/ubuntu/_base/applications/kcmldapcontroller/debian/source/format b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kcmldapcontroller/debian/source/format
rename to ubuntu/_base/applications/misc/desktop-effects-tde/debian/source/format
diff --git a/ubuntu/_base/applications/kcmldapcontroller/debian/source/options b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kcmldapcontroller/debian/source/options
rename to ubuntu/_base/applications/misc/desktop-effects-tde/debian/source/options
diff --git a/ubuntu/_base/applications/fusion-icon/debian/changelog b/ubuntu/_base/applications/misc/fusion-icon/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/fusion-icon/debian/changelog
rename to ubuntu/_base/applications/misc/fusion-icon/debian/changelog
diff --git a/ubuntu/_base/applications/kdbg/debian/compat b/ubuntu/_base/applications/misc/fusion-icon/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kdbg/debian/compat
rename to ubuntu/_base/applications/misc/fusion-icon/debian/compat
diff --git a/ubuntu/_base/applications/fusion-icon/debian/control b/ubuntu/_base/applications/misc/fusion-icon/debian/control
similarity index 100%
rename from ubuntu/_base/applications/fusion-icon/debian/control
rename to ubuntu/_base/applications/misc/fusion-icon/debian/control
diff --git a/ubuntu/_base/applications/fusion-icon/debian/copyright b/ubuntu/_base/applications/misc/fusion-icon/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/fusion-icon/debian/copyright
rename to ubuntu/_base/applications/misc/fusion-icon/debian/copyright
diff --git a/ubuntu/_base/applications/fusion-icon/debian/fusion-icon.1 b/ubuntu/_base/applications/misc/fusion-icon/debian/fusion-icon.1
similarity index 100%
rename from ubuntu/_base/applications/fusion-icon/debian/fusion-icon.1
rename to ubuntu/_base/applications/misc/fusion-icon/debian/fusion-icon.1
diff --git a/ubuntu/_base/applications/fusion-icon/debian/fusion-icon.xpm b/ubuntu/_base/applications/misc/fusion-icon/debian/fusion-icon.xpm
similarity index 100%
rename from ubuntu/_base/applications/fusion-icon/debian/fusion-icon.xpm
rename to ubuntu/_base/applications/misc/fusion-icon/debian/fusion-icon.xpm
diff --git a/ubuntu/_base/applications/fusion-icon/debian/install b/ubuntu/_base/applications/misc/fusion-icon/debian/install
similarity index 100%
rename from ubuntu/_base/applications/fusion-icon/debian/install
rename to ubuntu/_base/applications/misc/fusion-icon/debian/install
diff --git a/ubuntu/_base/applications/fusion-icon/debian/links b/ubuntu/_base/applications/misc/fusion-icon/debian/links
similarity index 100%
rename from ubuntu/_base/applications/fusion-icon/debian/links
rename to ubuntu/_base/applications/misc/fusion-icon/debian/links
diff --git a/ubuntu/_base/applications/fusion-icon/debian/manpages b/ubuntu/_base/applications/misc/fusion-icon/debian/manpages
similarity index 100%
rename from ubuntu/_base/applications/fusion-icon/debian/manpages
rename to ubuntu/_base/applications/misc/fusion-icon/debian/manpages
diff --git a/ubuntu/_base/applications/fusion-icon/debian/menu b/ubuntu/_base/applications/misc/fusion-icon/debian/menu
similarity index 100%
rename from ubuntu/_base/applications/fusion-icon/debian/menu
rename to ubuntu/_base/applications/misc/fusion-icon/debian/menu
diff --git a/ubuntu/_base/applications/k9copy/debian/patches/series b/ubuntu/_base/applications/misc/fusion-icon/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/k9copy/debian/patches/series
rename to ubuntu/_base/applications/misc/fusion-icon/debian/patches/series
diff --git a/ubuntu/_base/applications/fusion-icon/debian/pycompat b/ubuntu/_base/applications/misc/fusion-icon/debian/pycompat
similarity index 100%
rename from ubuntu/_base/applications/fusion-icon/debian/pycompat
rename to ubuntu/_base/applications/misc/fusion-icon/debian/pycompat
diff --git a/ubuntu/_base/applications/fusion-icon/debian/python-distutils-custom.mk b/ubuntu/_base/applications/misc/fusion-icon/debian/python-distutils-custom.mk
similarity index 100%
rename from ubuntu/_base/applications/fusion-icon/debian/python-distutils-custom.mk
rename to ubuntu/_base/applications/misc/fusion-icon/debian/python-distutils-custom.mk
diff --git a/ubuntu/_base/applications/fusion-icon/debian/rules b/ubuntu/_base/applications/misc/fusion-icon/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/fusion-icon/debian/rules
rename to ubuntu/_base/applications/misc/fusion-icon/debian/rules
diff --git a/ubuntu/_base/applications/kcmldapmanager/debian/source/format b/ubuntu/_base/applications/misc/fusion-icon/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kcmldapmanager/debian/source/format
rename to ubuntu/_base/applications/misc/fusion-icon/debian/source/format
diff --git a/ubuntu/_base/applications/kcmldapmanager/debian/source/options b/ubuntu/_base/applications/misc/fusion-icon/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kcmldapmanager/debian/source/options
rename to ubuntu/_base/applications/misc/fusion-icon/debian/source/options
diff --git a/ubuntu/_base/applications/kcpuload/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/misc/kcmldap/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kcpuload/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/misc/kcmldap/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kcpuload/debian/cdbs/versions.pl b/ubuntu/_base/applications/misc/kcmldap/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kcpuload/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/misc/kcmldap/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kcmldap/debian/changelog b/ubuntu/_base/applications/misc/kcmldap/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kcmldap/debian/changelog
rename to ubuntu/_base/applications/misc/kcmldap/debian/changelog
diff --git a/ubuntu/_base/applications/kdbusnotification/debian/compat b/ubuntu/_base/applications/misc/kcmldap/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kdbusnotification/debian/compat
rename to ubuntu/_base/applications/misc/kcmldap/debian/compat
diff --git a/ubuntu/_base/applications/kcmldap/debian/control b/ubuntu/_base/applications/misc/kcmldap/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kcmldap/debian/control
rename to ubuntu/_base/applications/misc/kcmldap/debian/control
diff --git a/ubuntu/_base/applications/gtk3-tqt-engine/debian/copyright b/ubuntu/_base/applications/misc/kcmldap/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/gtk3-tqt-engine/debian/copyright
rename to ubuntu/_base/applications/misc/kcmldap/debian/copyright
diff --git a/ubuntu/_base/applications/kcmldap/debian/docs b/ubuntu/_base/applications/misc/kcmldap/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/kcmldap/debian/docs
rename to ubuntu/_base/applications/misc/kcmldap/debian/docs
diff --git a/ubuntu/_base/applications/kcmldap/debian/kcontrol-ldap-bonding-trinity.install b/ubuntu/_base/applications/misc/kcmldap/debian/kcontrol-ldap-bonding-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/kcmldap/debian/kcontrol-ldap-bonding-trinity.install
rename to ubuntu/_base/applications/misc/kcmldap/debian/kcontrol-ldap-bonding-trinity.install
diff --git a/ubuntu/_base/applications/kaffeine-mozilla/debian/patches/series b/ubuntu/_base/applications/misc/kcmldap/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/kaffeine-mozilla/debian/patches/series
rename to ubuntu/_base/applications/misc/kcmldap/debian/patches/series
diff --git a/ubuntu/_base/applications/kiosktool/debian/rules b/ubuntu/_base/applications/misc/kcmldap/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kiosktool/debian/rules
rename to ubuntu/_base/applications/misc/kcmldap/debian/rules
diff --git a/ubuntu/_base/applications/kcpuload/debian/source/format b/ubuntu/_base/applications/misc/kcmldap/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kcpuload/debian/source/format
rename to ubuntu/_base/applications/misc/kcmldap/debian/source/format
diff --git a/ubuntu/_base/applications/kcpuload/debian/source/options b/ubuntu/_base/applications/misc/kcmldap/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kcpuload/debian/source/options
rename to ubuntu/_base/applications/misc/kcmldap/debian/source/options
diff --git a/ubuntu/_base/applications/kcmldap/debian/tde-ldap-cert-updater.init b/ubuntu/_base/applications/misc/kcmldap/debian/tde-ldap-cert-updater.init
similarity index 100%
rename from ubuntu/_base/applications/kcmldap/debian/tde-ldap-cert-updater.init
rename to ubuntu/_base/applications/misc/kcmldap/debian/tde-ldap-cert-updater.init
diff --git a/ubuntu/_base/applications/kcmldap/debian/tde-ldap-cert-updater.install b/ubuntu/_base/applications/misc/kcmldap/debian/tde-ldap-cert-updater.install
similarity index 100%
rename from ubuntu/_base/applications/kcmldap/debian/tde-ldap-cert-updater.install
rename to ubuntu/_base/applications/misc/kcmldap/debian/tde-ldap-cert-updater.install
diff --git a/ubuntu/_base/applications/kdbg/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/misc/kcmldapcontroller/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kdbg/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/misc/kcmldapcontroller/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kdbg/debian/cdbs/versions.pl b/ubuntu/_base/applications/misc/kcmldapcontroller/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kdbg/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/misc/kcmldapcontroller/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kcmldapcontroller/debian/changelog b/ubuntu/_base/applications/misc/kcmldapcontroller/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kcmldapcontroller/debian/changelog
rename to ubuntu/_base/applications/misc/kcmldapcontroller/debian/changelog
diff --git a/ubuntu/_base/applications/kdiff3/debian/compat b/ubuntu/_base/applications/misc/kcmldapcontroller/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kdiff3/debian/compat
rename to ubuntu/_base/applications/misc/kcmldapcontroller/debian/compat
diff --git a/ubuntu/_base/applications/kcmldapcontroller/debian/control b/ubuntu/_base/applications/misc/kcmldapcontroller/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kcmldapcontroller/debian/control
rename to ubuntu/_base/applications/misc/kcmldapcontroller/debian/control
diff --git a/ubuntu/_base/applications/kcmldap/debian/copyright b/ubuntu/_base/applications/misc/kcmldapcontroller/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kcmldap/debian/copyright
rename to ubuntu/_base/applications/misc/kcmldapcontroller/debian/copyright
diff --git a/ubuntu/_base/applications/kcmldapcontroller/debian/docs b/ubuntu/_base/applications/misc/kcmldapcontroller/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/kcmldapcontroller/debian/docs
rename to ubuntu/_base/applications/misc/kcmldapcontroller/debian/docs
diff --git a/ubuntu/_base/applications/kaffeine/debian/patches/series b/ubuntu/_base/applications/misc/kcmldapcontroller/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/kaffeine/debian/patches/series
rename to ubuntu/_base/applications/misc/kcmldapcontroller/debian/patches/series
diff --git a/ubuntu/_base/applications/kcmldapcontroller/debian/rules b/ubuntu/_base/applications/misc/kcmldapcontroller/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kcmldapcontroller/debian/rules
rename to ubuntu/_base/applications/misc/kcmldapcontroller/debian/rules
diff --git a/ubuntu/_base/applications/kdbg/debian/source/format b/ubuntu/_base/applications/misc/kcmldapcontroller/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kdbg/debian/source/format
rename to ubuntu/_base/applications/misc/kcmldapcontroller/debian/source/format
diff --git a/ubuntu/_base/applications/kdbg/debian/source/options b/ubuntu/_base/applications/misc/kcmldapcontroller/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kdbg/debian/source/options
rename to ubuntu/_base/applications/misc/kcmldapcontroller/debian/source/options
diff --git a/ubuntu/_base/applications/kdbusnotification/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/misc/kcmldapmanager/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kdbusnotification/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/misc/kcmldapmanager/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kdbusnotification/debian/cdbs/versions.pl b/ubuntu/_base/applications/misc/kcmldapmanager/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kdbusnotification/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/misc/kcmldapmanager/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kcmldapmanager/debian/changelog b/ubuntu/_base/applications/misc/kcmldapmanager/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kcmldapmanager/debian/changelog
rename to ubuntu/_base/applications/misc/kcmldapmanager/debian/changelog
diff --git a/ubuntu/_base/applications/kdirstat/debian/compat b/ubuntu/_base/applications/misc/kcmldapmanager/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kdirstat/debian/compat
rename to ubuntu/_base/applications/misc/kcmldapmanager/debian/compat
diff --git a/ubuntu/_base/applications/kcmldapmanager/debian/control b/ubuntu/_base/applications/misc/kcmldapmanager/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kcmldapmanager/debian/control
rename to ubuntu/_base/applications/misc/kcmldapmanager/debian/control
diff --git a/ubuntu/_base/applications/kcmldapcontroller/debian/copyright b/ubuntu/_base/applications/misc/kcmldapmanager/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kcmldapcontroller/debian/copyright
rename to ubuntu/_base/applications/misc/kcmldapmanager/debian/copyright
diff --git a/ubuntu/_base/applications/kcmldapmanager/debian/docs b/ubuntu/_base/applications/misc/kcmldapmanager/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/kcmldapmanager/debian/docs
rename to ubuntu/_base/applications/misc/kcmldapmanager/debian/docs
diff --git a/ubuntu/_base/applications/kasablanca/debian/patches/series b/ubuntu/_base/applications/misc/kcmldapmanager/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/kasablanca/debian/patches/series
rename to ubuntu/_base/applications/misc/kcmldapmanager/debian/patches/series
diff --git a/ubuntu/_base/applications/kcmldapmanager/debian/rules b/ubuntu/_base/applications/misc/kcmldapmanager/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kcmldapmanager/debian/rules
rename to ubuntu/_base/applications/misc/kcmldapmanager/debian/rules
diff --git a/ubuntu/_base/applications/kdbusnotification/debian/source/format b/ubuntu/_base/applications/misc/kcmldapmanager/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kdbusnotification/debian/source/format
rename to ubuntu/_base/applications/misc/kcmldapmanager/debian/source/format
diff --git a/ubuntu/_base/applications/kdbusnotification/debian/source/options b/ubuntu/_base/applications/misc/kcmldapmanager/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kdbusnotification/debian/source/options
rename to ubuntu/_base/applications/misc/kcmldapmanager/debian/source/options
diff --git a/ubuntu/_base/applications/kdiff3/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/misc/kerberostray/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kdiff3/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/misc/kerberostray/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kdiff3/debian/cdbs/versions.pl b/ubuntu/_base/applications/misc/kerberostray/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kdiff3/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/misc/kerberostray/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kerberostray/debian/changelog b/ubuntu/_base/applications/misc/kerberostray/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kerberostray/debian/changelog
rename to ubuntu/_base/applications/misc/kerberostray/debian/changelog
diff --git a/ubuntu/_base/applications/kdpkg/debian/compat b/ubuntu/_base/applications/misc/kerberostray/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kdpkg/debian/compat
rename to ubuntu/_base/applications/misc/kerberostray/debian/compat
diff --git a/ubuntu/_base/applications/kerberostray/debian/control b/ubuntu/_base/applications/misc/kerberostray/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kerberostray/debian/control
rename to ubuntu/_base/applications/misc/kerberostray/debian/control
diff --git a/ubuntu/_base/applications/kcmldapmanager/debian/copyright b/ubuntu/_base/applications/misc/kerberostray/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kcmldapmanager/debian/copyright
rename to ubuntu/_base/applications/misc/kerberostray/debian/copyright
diff --git a/ubuntu/_base/applications/kcmautostart/debian/docs b/ubuntu/_base/applications/misc/kerberostray/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/kcmautostart/debian/docs
rename to ubuntu/_base/applications/misc/kerberostray/debian/docs
diff --git a/ubuntu/_base/applications/katapult/debian/patches/series b/ubuntu/_base/applications/misc/kerberostray/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/katapult/debian/patches/series
rename to ubuntu/_base/applications/misc/kerberostray/debian/patches/series
diff --git a/ubuntu/_base/applications/kdbusnotification/debian/rules b/ubuntu/_base/applications/misc/kerberostray/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kdbusnotification/debian/rules
rename to ubuntu/_base/applications/misc/kerberostray/debian/rules
diff --git a/ubuntu/_base/applications/kdiff3/debian/source/format b/ubuntu/_base/applications/misc/kerberostray/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kdiff3/debian/source/format
rename to ubuntu/_base/applications/misc/kerberostray/debian/source/format
diff --git a/ubuntu/_base/applications/kdiff3/debian/source/options b/ubuntu/_base/applications/misc/kerberostray/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kdiff3/debian/source/options
rename to ubuntu/_base/applications/misc/kerberostray/debian/source/options
diff --git a/ubuntu/_base/applications/krecipes/debian/README.source b/ubuntu/_base/applications/misc/krecipes/debian/README.source
similarity index 100%
rename from ubuntu/_base/applications/krecipes/debian/README.source
rename to ubuntu/_base/applications/misc/krecipes/debian/README.source
diff --git a/ubuntu/_base/applications/kdirstat/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/misc/krecipes/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kdirstat/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/misc/krecipes/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kdirstat/debian/cdbs/versions.pl b/ubuntu/_base/applications/misc/krecipes/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kdirstat/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/misc/krecipes/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/krecipes/debian/changelog b/ubuntu/_base/applications/misc/krecipes/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/krecipes/debian/changelog
rename to ubuntu/_base/applications/misc/krecipes/debian/changelog
diff --git a/ubuntu/_base/applications/keep/debian/compat b/ubuntu/_base/applications/misc/krecipes/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/keep/debian/compat
rename to ubuntu/_base/applications/misc/krecipes/debian/compat
diff --git a/ubuntu/_base/applications/krecipes/debian/control b/ubuntu/_base/applications/misc/krecipes/debian/control
similarity index 100%
rename from ubuntu/_base/applications/krecipes/debian/control
rename to ubuntu/_base/applications/misc/krecipes/debian/control
diff --git a/ubuntu/_base/applications/krecipes/debian/copyright b/ubuntu/_base/applications/misc/krecipes/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/krecipes/debian/copyright
rename to ubuntu/_base/applications/misc/krecipes/debian/copyright
diff --git a/ubuntu/_base/applications/krecipes/debian/krecipes-data-trinity.install b/ubuntu/_base/applications/misc/krecipes/debian/krecipes-data-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/krecipes/debian/krecipes-data-trinity.install
rename to ubuntu/_base/applications/misc/krecipes/debian/krecipes-data-trinity.install
diff --git a/ubuntu/_base/applications/krecipes/debian/krecipes-data-trinity.manpages b/ubuntu/_base/applications/misc/krecipes/debian/krecipes-data-trinity.manpages
similarity index 100%
rename from ubuntu/_base/applications/krecipes/debian/krecipes-data-trinity.manpages
rename to ubuntu/_base/applications/misc/krecipes/debian/krecipes-data-trinity.manpages
diff --git a/ubuntu/_base/applications/krecipes/debian/krecipes-doc-trinity.install b/ubuntu/_base/applications/misc/krecipes/debian/krecipes-doc-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/krecipes/debian/krecipes-doc-trinity.install
rename to ubuntu/_base/applications/misc/krecipes/debian/krecipes-doc-trinity.install
diff --git a/ubuntu/_base/applications/krecipes/debian/krecipes-trinity.install b/ubuntu/_base/applications/misc/krecipes/debian/krecipes-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/krecipes/debian/krecipes-trinity.install
rename to ubuntu/_base/applications/misc/krecipes/debian/krecipes-trinity.install
diff --git a/ubuntu/_base/applications/krecipes/debian/krecipes-trinity.lintian b/ubuntu/_base/applications/misc/krecipes/debian/krecipes-trinity.lintian
similarity index 100%
rename from ubuntu/_base/applications/krecipes/debian/krecipes-trinity.lintian
rename to ubuntu/_base/applications/misc/krecipes/debian/krecipes-trinity.lintian
diff --git a/ubuntu/_base/applications/krecipes/debian/krecipes-trinity.menu b/ubuntu/_base/applications/misc/krecipes/debian/krecipes-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/krecipes/debian/krecipes-trinity.menu
rename to ubuntu/_base/applications/misc/krecipes/debian/krecipes-trinity.menu
diff --git a/ubuntu/_base/applications/krecipes/debian/krecipes.1 b/ubuntu/_base/applications/misc/krecipes/debian/krecipes.1
similarity index 100%
rename from ubuntu/_base/applications/krecipes/debian/krecipes.1
rename to ubuntu/_base/applications/misc/krecipes/debian/krecipes.1
diff --git a/ubuntu/_base/applications/krecipes/debian/krecipes.xpm b/ubuntu/_base/applications/misc/krecipes/debian/krecipes.xpm
similarity index 100%
rename from ubuntu/_base/applications/krecipes/debian/krecipes.xpm
rename to ubuntu/_base/applications/misc/krecipes/debian/krecipes.xpm
diff --git a/ubuntu/_base/applications/krecipes/debian/rules b/ubuntu/_base/applications/misc/krecipes/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/krecipes/debian/rules
rename to ubuntu/_base/applications/misc/krecipes/debian/rules
diff --git a/ubuntu/_base/applications/kdirstat/debian/source/format b/ubuntu/_base/applications/misc/krecipes/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kdirstat/debian/source/format
rename to ubuntu/_base/applications/misc/krecipes/debian/source/format
diff --git a/ubuntu/_base/applications/kdirstat/debian/source/options b/ubuntu/_base/applications/misc/krecipes/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kdirstat/debian/source/options
rename to ubuntu/_base/applications/misc/krecipes/debian/source/options
diff --git a/ubuntu/_base/applications/krecipes/debian/watch b/ubuntu/_base/applications/misc/krecipes/debian/watch
similarity index 100%
rename from ubuntu/_base/applications/krecipes/debian/watch
rename to ubuntu/_base/applications/misc/krecipes/debian/watch
diff --git a/ubuntu/_base/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/applications/multimedia/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
similarity index 100%
rename from ubuntu/_base/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
rename to ubuntu/_base/applications/multimedia/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/ubuntu/_base/applications/amarok/debian/README.Debian b/ubuntu/_base/applications/multimedia/amarok/debian/README.Debian
similarity index 100%
rename from ubuntu/_base/applications/amarok/debian/README.Debian
rename to ubuntu/_base/applications/multimedia/amarok/debian/README.Debian
diff --git a/ubuntu/_base/applications/amarok/debian/amarok-common-trinity.install b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-common-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/amarok/debian/amarok-common-trinity.install
rename to ubuntu/_base/applications/multimedia/amarok/debian/amarok-common-trinity.install
diff --git a/ubuntu/_base/applications/amarok/debian/amarok-engine-akode-trinity.install b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-engine-akode-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/amarok/debian/amarok-engine-akode-trinity.install
rename to ubuntu/_base/applications/multimedia/amarok/debian/amarok-engine-akode-trinity.install
diff --git a/ubuntu/_base/applications/amarok/debian/amarok-engine-xine-trinity.install b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-engine-xine-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/amarok/debian/amarok-engine-xine-trinity.install
rename to ubuntu/_base/applications/multimedia/amarok/debian/amarok-engine-xine-trinity.install
diff --git a/ubuntu/_base/applications/amarok/debian/amarok-engine-yauap-trinity.install b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-engine-yauap-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/amarok/debian/amarok-engine-yauap-trinity.install
rename to ubuntu/_base/applications/multimedia/amarok/debian/amarok-engine-yauap-trinity.install
diff --git a/ubuntu/_base/applications/amarok/debian/amarok-konqsidebar-trinity.install b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-konqsidebar-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/amarok/debian/amarok-konqsidebar-trinity.install
rename to ubuntu/_base/applications/multimedia/amarok/debian/amarok-konqsidebar-trinity.install
diff --git a/ubuntu/_base/applications/amarok/debian/amarok-trinity.install b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/amarok/debian/amarok-trinity.install
rename to ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install
diff --git a/ubuntu/_base/applications/amarok/debian/amarok-trinity.manpages b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.manpages
similarity index 100%
rename from ubuntu/_base/applications/amarok/debian/amarok-trinity.manpages
rename to ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.manpages
diff --git a/ubuntu/_base/applications/amarok/debian/amarok-trinity.menu b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/amarok/debian/amarok-trinity.menu
rename to ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.menu
diff --git a/ubuntu/_base/applications/amarok/debian/amarok_play_audiocd.desktop b/ubuntu/_base/applications/multimedia/amarok/debian/amarok_play_audiocd.desktop
similarity index 100%
rename from ubuntu/_base/applications/amarok/debian/amarok_play_audiocd.desktop
rename to ubuntu/_base/applications/multimedia/amarok/debian/amarok_play_audiocd.desktop
diff --git a/ubuntu/_base/applications/kdpkg/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/amarok/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kdpkg/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/multimedia/amarok/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kdpkg/debian/cdbs/versions.pl b/ubuntu/_base/applications/multimedia/amarok/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kdpkg/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/multimedia/amarok/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/amarok/debian/changelog b/ubuntu/_base/applications/multimedia/amarok/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/amarok/debian/changelog
rename to ubuntu/_base/applications/multimedia/amarok/debian/changelog
diff --git a/ubuntu/_base/applications/kerberostray/debian/compat b/ubuntu/_base/applications/multimedia/amarok/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kerberostray/debian/compat
rename to ubuntu/_base/applications/multimedia/amarok/debian/compat
diff --git a/ubuntu/_base/applications/amarok/debian/control b/ubuntu/_base/applications/multimedia/amarok/debian/control
similarity index 100%
rename from ubuntu/_base/applications/amarok/debian/control
rename to ubuntu/_base/applications/multimedia/amarok/debian/control
diff --git a/ubuntu/_base/applications/amarok/debian/copyright b/ubuntu/_base/applications/multimedia/amarok/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/amarok/debian/copyright
rename to ubuntu/_base/applications/multimedia/amarok/debian/copyright
diff --git a/ubuntu/_base/applications/amarok/debian/icons/amarok-16.xpm b/ubuntu/_base/applications/multimedia/amarok/debian/icons/amarok-16.xpm
similarity index 100%
rename from ubuntu/_base/applications/amarok/debian/icons/amarok-16.xpm
rename to ubuntu/_base/applications/multimedia/amarok/debian/icons/amarok-16.xpm
diff --git a/ubuntu/_base/applications/amarok/debian/icons/amarok.xpm b/ubuntu/_base/applications/multimedia/amarok/debian/icons/amarok.xpm
similarity index 100%
rename from ubuntu/_base/applications/amarok/debian/icons/amarok.xpm
rename to ubuntu/_base/applications/multimedia/amarok/debian/icons/amarok.xpm
diff --git a/ubuntu/_base/applications/amarok/debian/install-mp3 b/ubuntu/_base/applications/multimedia/amarok/debian/install-mp3
similarity index 100%
rename from ubuntu/_base/applications/amarok/debian/install-mp3
rename to ubuntu/_base/applications/multimedia/amarok/debian/install-mp3
diff --git a/ubuntu/_base/applications/amarok/debian/kubuntu-media-amarok b/ubuntu/_base/applications/multimedia/amarok/debian/kubuntu-media-amarok
similarity index 100%
rename from ubuntu/_base/applications/amarok/debian/kubuntu-media-amarok
rename to ubuntu/_base/applications/multimedia/amarok/debian/kubuntu-media-amarok
diff --git a/ubuntu/_base/applications/amarok/debian/man/amarok-trinity.1 b/ubuntu/_base/applications/multimedia/amarok/debian/man/amarok-trinity.1
similarity index 100%
rename from ubuntu/_base/applications/amarok/debian/man/amarok-trinity.1
rename to ubuntu/_base/applications/multimedia/amarok/debian/man/amarok-trinity.1
diff --git a/ubuntu/_base/applications/amarok/debian/man/amarok_libvisual-trinity.1 b/ubuntu/_base/applications/multimedia/amarok/debian/man/amarok_libvisual-trinity.1
similarity index 100%
rename from ubuntu/_base/applications/amarok/debian/man/amarok_libvisual-trinity.1
rename to ubuntu/_base/applications/multimedia/amarok/debian/man/amarok_libvisual-trinity.1
diff --git a/ubuntu/_base/applications/amarok/debian/man/amarokapp-trinity.1 b/ubuntu/_base/applications/multimedia/amarok/debian/man/amarokapp-trinity.1
similarity index 100%
rename from ubuntu/_base/applications/amarok/debian/man/amarokapp-trinity.1
rename to ubuntu/_base/applications/multimedia/amarok/debian/man/amarokapp-trinity.1
diff --git a/ubuntu/_base/applications/amarok/debian/man/amarokcollectionscanner-trinity.1 b/ubuntu/_base/applications/multimedia/amarok/debian/man/amarokcollectionscanner-trinity.1
similarity index 100%
rename from ubuntu/_base/applications/amarok/debian/man/amarokcollectionscanner-trinity.1
rename to ubuntu/_base/applications/multimedia/amarok/debian/man/amarokcollectionscanner-trinity.1
diff --git a/ubuntu/_base/applications/kbfx/debian/patches/series b/ubuntu/_base/applications/multimedia/amarok/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/kbfx/debian/patches/series
rename to ubuntu/_base/applications/multimedia/amarok/debian/patches/series
diff --git a/ubuntu/_base/applications/amarok/debian/rules b/ubuntu/_base/applications/multimedia/amarok/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/amarok/debian/rules
rename to ubuntu/_base/applications/multimedia/amarok/debian/rules
diff --git a/ubuntu/_base/applications/kdpkg/debian/source/format b/ubuntu/_base/applications/multimedia/amarok/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kdpkg/debian/source/format
rename to ubuntu/_base/applications/multimedia/amarok/debian/source/format
diff --git a/ubuntu/_base/applications/kdpkg/debian/source/options b/ubuntu/_base/applications/multimedia/amarok/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kdpkg/debian/source/options
rename to ubuntu/_base/applications/multimedia/amarok/debian/source/options
diff --git a/ubuntu/_base/applications/keep/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/codeine/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/keep/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/multimedia/codeine/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/keep/debian/cdbs/versions.pl b/ubuntu/_base/applications/multimedia/codeine/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/keep/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/multimedia/codeine/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/codeine/debian/changelog b/ubuntu/_base/applications/multimedia/codeine/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/codeine/debian/changelog
rename to ubuntu/_base/applications/multimedia/codeine/debian/changelog
diff --git a/ubuntu/_base/applications/codeine/debian/codeine-trinity.menu b/ubuntu/_base/applications/multimedia/codeine/debian/codeine-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/codeine/debian/codeine-trinity.menu
rename to ubuntu/_base/applications/multimedia/codeine/debian/codeine-trinity.menu
diff --git a/ubuntu/_base/applications/keximdb/debian/compat b/ubuntu/_base/applications/multimedia/codeine/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/keximdb/debian/compat
rename to ubuntu/_base/applications/multimedia/codeine/debian/compat
diff --git a/ubuntu/_base/applications/codeine/debian/control b/ubuntu/_base/applications/multimedia/codeine/debian/control
similarity index 100%
rename from ubuntu/_base/applications/codeine/debian/control
rename to ubuntu/_base/applications/multimedia/codeine/debian/control
diff --git a/ubuntu/_base/applications/codeine/debian/copyright b/ubuntu/_base/applications/multimedia/codeine/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/codeine/debian/copyright
rename to ubuntu/_base/applications/multimedia/codeine/debian/copyright
diff --git a/ubuntu/_base/applications/knetload/debian/patches/series b/ubuntu/_base/applications/multimedia/codeine/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/knetload/debian/patches/series
rename to ubuntu/_base/applications/multimedia/codeine/debian/patches/series
diff --git a/ubuntu/_base/applications/klcddimmer/debian/rules b/ubuntu/_base/applications/multimedia/codeine/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/klcddimmer/debian/rules
rename to ubuntu/_base/applications/multimedia/codeine/debian/rules
diff --git a/ubuntu/_base/applications/keep/debian/source/format b/ubuntu/_base/applications/multimedia/codeine/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/keep/debian/source/format
rename to ubuntu/_base/applications/multimedia/codeine/debian/source/format
diff --git a/ubuntu/_base/applications/keep/debian/source/options b/ubuntu/_base/applications/multimedia/codeine/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/keep/debian/source/options
rename to ubuntu/_base/applications/multimedia/codeine/debian/source/options
diff --git a/ubuntu/_base/applications/k3b-i18n/debian/changelog b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/k3b-i18n/debian/changelog
rename to ubuntu/_base/applications/multimedia/k3b-i18n/debian/changelog
diff --git a/ubuntu/_base/applications/kftpgrabber/debian/compat b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kftpgrabber/debian/compat
rename to ubuntu/_base/applications/multimedia/k3b-i18n/debian/compat
diff --git a/ubuntu/_base/applications/k3b-i18n/debian/control b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/control
similarity index 100%
rename from ubuntu/_base/applications/k3b-i18n/debian/control
rename to ubuntu/_base/applications/multimedia/k3b-i18n/debian/control
diff --git a/ubuntu/_base/applications/k3b-i18n/debian/copyright b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/k3b-i18n/debian/copyright
rename to ubuntu/_base/applications/multimedia/k3b-i18n/debian/copyright
diff --git a/ubuntu/_base/applications/k3b-i18n/debian/rules b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/k3b-i18n/debian/rules
rename to ubuntu/_base/applications/multimedia/k3b-i18n/debian/rules
diff --git a/ubuntu/_base/applications/kerberostray/debian/source/format b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kerberostray/debian/source/format
rename to ubuntu/_base/applications/multimedia/k3b-i18n/debian/source/format
diff --git a/ubuntu/_base/applications/kerberostray/debian/source/options b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kerberostray/debian/source/options
rename to ubuntu/_base/applications/multimedia/k3b-i18n/debian/source/options
diff --git a/ubuntu/_base/applications/k3b-i18n/debian/watch b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/watch
similarity index 100%
rename from ubuntu/_base/applications/k3b-i18n/debian/watch
rename to ubuntu/_base/applications/multimedia/k3b-i18n/debian/watch
diff --git a/ubuntu/_base/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
rename to ubuntu/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/ubuntu/_base/applications/k3b/debian/README.Debian b/ubuntu/_base/applications/multimedia/k3b/debian/README.Debian
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/README.Debian
rename to ubuntu/_base/applications/multimedia/k3b/debian/README.Debian
diff --git a/ubuntu/_base/applications/kerberostray/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/k3b/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kerberostray/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/multimedia/k3b/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kerberostray/debian/cdbs/versions.pl b/ubuntu/_base/applications/multimedia/k3b/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kerberostray/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/multimedia/k3b/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/k3b/debian/changelog b/ubuntu/_base/applications/multimedia/k3b/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/changelog
rename to ubuntu/_base/applications/multimedia/k3b/debian/changelog
diff --git a/ubuntu/_base/applications/kgtk-qt3/debian/compat b/ubuntu/_base/applications/multimedia/k3b/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kgtk-qt3/debian/compat
rename to ubuntu/_base/applications/multimedia/k3b/debian/compat
diff --git a/ubuntu/_base/applications/k3b/debian/control b/ubuntu/_base/applications/multimedia/k3b/debian/control
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/control
rename to ubuntu/_base/applications/multimedia/k3b/debian/control
diff --git a/ubuntu/_base/applications/k3b/debian/copyright b/ubuntu/_base/applications/multimedia/k3b/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/copyright
rename to ubuntu/_base/applications/multimedia/k3b/debian/copyright
diff --git a/ubuntu/_base/applications/k3b/debian/docs b/ubuntu/_base/applications/multimedia/k3b/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/docs
rename to ubuntu/_base/applications/multimedia/k3b/debian/docs
diff --git a/ubuntu/_base/applications/k3b/debian/k3b-data-trinity.install b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-data-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/k3b-data-trinity.install
rename to ubuntu/_base/applications/multimedia/k3b/debian/k3b-data-trinity.install
diff --git a/ubuntu/_base/applications/k3b/debian/k3b-data.files b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-data.files
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/k3b-data.files
rename to ubuntu/_base/applications/multimedia/k3b/debian/k3b-data.files
diff --git a/ubuntu/_base/applications/k3b/debian/k3b-data.install b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-data.install
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/k3b-data.install
rename to ubuntu/_base/applications/multimedia/k3b/debian/k3b-data.install
diff --git a/ubuntu/_base/applications/k3b/debian/k3b-rip-audiocd.desktop b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-rip-audiocd.desktop
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/k3b-rip-audiocd.desktop
rename to ubuntu/_base/applications/multimedia/k3b/debian/k3b-rip-audiocd.desktop
diff --git a/ubuntu/_base/applications/k3b/debian/k3b-rip-videodvd.desktop b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-rip-videodvd.desktop
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/k3b-rip-videodvd.desktop
rename to ubuntu/_base/applications/multimedia/k3b/debian/k3b-rip-videodvd.desktop
diff --git a/ubuntu/_base/applications/k3b/debian/k3b-trinity.1 b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.1
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/k3b-trinity.1
rename to ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.1
diff --git a/ubuntu/_base/applications/k3b/debian/k3b-trinity.install b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/k3b-trinity.install
rename to ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.install
diff --git a/ubuntu/_base/applications/k3b/debian/k3b-trinity.manpages b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.manpages
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/k3b-trinity.manpages
rename to ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.manpages
diff --git a/ubuntu/_base/applications/k3b/debian/k3b-trinity.menu b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/k3b-trinity.menu
rename to ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.menu
diff --git a/ubuntu/_base/applications/k3b/debian/k3b-trinity.postinst b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.postinst
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/k3b-trinity.postinst
rename to ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.postinst
diff --git a/ubuntu/_base/applications/k3b/debian/k3b-write-bin-image.desktop b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-write-bin-image.desktop
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/k3b-write-bin-image.desktop
rename to ubuntu/_base/applications/multimedia/k3b/debian/k3b-write-bin-image.desktop
diff --git a/ubuntu/_base/applications/k3b/debian/k3b-write-iso-image.desktop b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-write-iso-image.desktop
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/k3b-write-iso-image.desktop
rename to ubuntu/_base/applications/multimedia/k3b/debian/k3b-write-iso-image.desktop
diff --git a/ubuntu/_base/applications/k3b/debian/k3b.files b/ubuntu/_base/applications/multimedia/k3b/debian/k3b.files
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/k3b.files
rename to ubuntu/_base/applications/multimedia/k3b/debian/k3b.files
diff --git a/ubuntu/_base/applications/k3b/debian/k3b.install b/ubuntu/_base/applications/multimedia/k3b/debian/k3b.install
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/k3b.install
rename to ubuntu/_base/applications/multimedia/k3b/debian/k3b.install
diff --git a/ubuntu/_base/applications/k3b/debian/k3b.manpages b/ubuntu/_base/applications/multimedia/k3b/debian/k3b.manpages
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/k3b.manpages
rename to ubuntu/_base/applications/multimedia/k3b/debian/k3b.manpages
diff --git a/ubuntu/_base/applications/k3b/debian/k3b.menu b/ubuntu/_base/applications/multimedia/k3b/debian/k3b.menu
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/k3b.menu
rename to ubuntu/_base/applications/multimedia/k3b/debian/k3b.menu
diff --git a/ubuntu/_base/applications/k3b/debian/k3b.postinst b/ubuntu/_base/applications/multimedia/k3b/debian/k3b.postinst
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/k3b.postinst
rename to ubuntu/_base/applications/multimedia/k3b/debian/k3b.postinst
diff --git a/ubuntu/_base/applications/k3b/debian/k3b.xpm b/ubuntu/_base/applications/multimedia/k3b/debian/k3b.xpm
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/k3b.xpm
rename to ubuntu/_base/applications/multimedia/k3b/debian/k3b.xpm
diff --git a/ubuntu/_base/applications/k3b/debian/libk3b-dev.files b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b-dev.files
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/libk3b-dev.files
rename to ubuntu/_base/applications/multimedia/k3b/debian/libk3b-dev.files
diff --git a/ubuntu/_base/applications/k3b/debian/libk3b-dev.install b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b-dev.install
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/libk3b-dev.install
rename to ubuntu/_base/applications/multimedia/k3b/debian/libk3b-dev.install
diff --git a/ubuntu/_base/applications/k3b/debian/libk3b-trinity-dev.install b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b-trinity-dev.install
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/libk3b-trinity-dev.install
rename to ubuntu/_base/applications/multimedia/k3b/debian/libk3b-trinity-dev.install
diff --git a/ubuntu/_base/applications/k3b/debian/libk3b3-extracodecs-trinity.install b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3-extracodecs-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/libk3b3-extracodecs-trinity.install
rename to ubuntu/_base/applications/multimedia/k3b/debian/libk3b3-extracodecs-trinity.install
diff --git a/ubuntu/_base/applications/k3b/debian/libk3b3-extracodecs.install b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3-extracodecs.install
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/libk3b3-extracodecs.install
rename to ubuntu/_base/applications/multimedia/k3b/debian/libk3b3-extracodecs.install
diff --git a/ubuntu/_base/applications/k3b/debian/libk3b3-trinity.install b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/libk3b3-trinity.install
rename to ubuntu/_base/applications/multimedia/k3b/debian/libk3b3-trinity.install
diff --git a/ubuntu/_base/applications/k3b/debian/libk3b3.files b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3.files
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/libk3b3.files
rename to ubuntu/_base/applications/multimedia/k3b/debian/libk3b3.files
diff --git a/ubuntu/_base/applications/k3b/debian/libk3b3.install b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3.install
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/libk3b3.install
rename to ubuntu/_base/applications/multimedia/k3b/debian/libk3b3.install
diff --git a/ubuntu/_base/applications/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff b/ubuntu/_base/applications/multimedia/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff
rename to ubuntu/_base/applications/multimedia/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff
diff --git a/ubuntu/_base/applications/k3b/debian/patches/series b/ubuntu/_base/applications/multimedia/k3b/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/patches/series
rename to ubuntu/_base/applications/multimedia/k3b/debian/patches/series
diff --git a/ubuntu/_base/applications/k3b/debian/rules b/ubuntu/_base/applications/multimedia/k3b/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/rules
rename to ubuntu/_base/applications/multimedia/k3b/debian/rules
diff --git a/ubuntu/_base/applications/keximdb/debian/source/format b/ubuntu/_base/applications/multimedia/k3b/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/keximdb/debian/source/format
rename to ubuntu/_base/applications/multimedia/k3b/debian/source/format
diff --git a/ubuntu/_base/applications/keximdb/debian/source/options b/ubuntu/_base/applications/multimedia/k3b/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/keximdb/debian/source/options
rename to ubuntu/_base/applications/multimedia/k3b/debian/source/options
diff --git a/ubuntu/_base/applications/k3b/debian/watch b/ubuntu/_base/applications/multimedia/k3b/debian/watch
similarity index 100%
rename from ubuntu/_base/applications/k3b/debian/watch
rename to ubuntu/_base/applications/multimedia/k3b/debian/watch
diff --git a/ubuntu/_base/applications/keximdb/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/k9copy/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/keximdb/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/multimedia/k9copy/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/keximdb/debian/cdbs/versions.pl b/ubuntu/_base/applications/multimedia/k9copy/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/keximdb/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/multimedia/k9copy/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/k9copy/debian/changelog b/ubuntu/_base/applications/multimedia/k9copy/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/k9copy/debian/changelog
rename to ubuntu/_base/applications/multimedia/k9copy/debian/changelog
diff --git a/ubuntu/_base/applications/k9copy/debian/compat b/ubuntu/_base/applications/multimedia/k9copy/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/k9copy/debian/compat
rename to ubuntu/_base/applications/multimedia/k9copy/debian/compat
diff --git a/ubuntu/_base/applications/k9copy/debian/control b/ubuntu/_base/applications/multimedia/k9copy/debian/control
similarity index 100%
rename from ubuntu/_base/applications/k9copy/debian/control
rename to ubuntu/_base/applications/multimedia/k9copy/debian/control
diff --git a/ubuntu/_base/applications/k9copy/debian/copyright b/ubuntu/_base/applications/multimedia/k9copy/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/k9copy/debian/copyright
rename to ubuntu/_base/applications/multimedia/k9copy/debian/copyright
diff --git a/ubuntu/_base/applications/k9copy/debian/docs b/ubuntu/_base/applications/multimedia/k9copy/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/k9copy/debian/docs
rename to ubuntu/_base/applications/multimedia/k9copy/debian/docs
diff --git a/ubuntu/_base/applications/k9copy/debian/k9copy.1.docbook b/ubuntu/_base/applications/multimedia/k9copy/debian/k9copy.1.docbook
similarity index 100%
rename from ubuntu/_base/applications/k9copy/debian/k9copy.1.docbook
rename to ubuntu/_base/applications/multimedia/k9copy/debian/k9copy.1.docbook
diff --git a/ubuntu/_base/applications/kbookreader/debian/patches/series b/ubuntu/_base/applications/multimedia/k9copy/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/kbookreader/debian/patches/series
rename to ubuntu/_base/applications/multimedia/k9copy/debian/patches/series
diff --git a/ubuntu/_base/applications/k9copy/debian/rules b/ubuntu/_base/applications/multimedia/k9copy/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/k9copy/debian/rules
rename to ubuntu/_base/applications/multimedia/k9copy/debian/rules
diff --git a/ubuntu/_base/applications/kftpgrabber/debian/source/format b/ubuntu/_base/applications/multimedia/k9copy/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kftpgrabber/debian/source/format
rename to ubuntu/_base/applications/multimedia/k9copy/debian/source/format
diff --git a/ubuntu/_base/applications/kftpgrabber/debian/source/options b/ubuntu/_base/applications/multimedia/k9copy/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kftpgrabber/debian/source/options
rename to ubuntu/_base/applications/multimedia/k9copy/debian/source/options
diff --git a/ubuntu/_base/applications/kftpgrabber/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kftpgrabber/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kftpgrabber/debian/cdbs/versions.pl b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kftpgrabber/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kaffeine-mozilla/debian/changelog b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kaffeine-mozilla/debian/changelog
rename to ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/changelog
diff --git a/ubuntu/_base/applications/kile/debian/compat b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kile/debian/compat
rename to ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/compat
diff --git a/ubuntu/_base/applications/kaffeine-mozilla/debian/control b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kaffeine-mozilla/debian/control
rename to ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/control
diff --git a/ubuntu/_base/applications/kaffeine-mozilla/debian/copyright b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kaffeine-mozilla/debian/copyright
rename to ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/copyright
diff --git a/ubuntu/_base/applications/kdbusnotification/debian/docs b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/kdbusnotification/debian/docs
rename to ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/docs
diff --git a/ubuntu/_base/applications/kcmautostart/debian/patches/series b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/kcmautostart/debian/patches/series
rename to ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/patches/series
diff --git a/ubuntu/_base/applications/kaffeine-mozilla/debian/rules b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kaffeine-mozilla/debian/rules
rename to ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/rules
diff --git a/ubuntu/_base/applications/kgtk-qt3/debian/source/format b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kgtk-qt3/debian/source/format
rename to ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/source/format
diff --git a/ubuntu/_base/applications/kgtk-qt3/debian/source/options b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kgtk-qt3/debian/source/options
rename to ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/source/options
diff --git a/ubuntu/_base/applications/kaffeine/debian/README.Debian b/ubuntu/_base/applications/multimedia/kaffeine/debian/README.Debian
similarity index 100%
rename from ubuntu/_base/applications/kaffeine/debian/README.Debian
rename to ubuntu/_base/applications/multimedia/kaffeine/debian/README.Debian
diff --git a/ubuntu/_base/applications/kgtk-qt3/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/kaffeine/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kgtk-qt3/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/multimedia/kaffeine/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kgtk-qt3/debian/cdbs/versions.pl b/ubuntu/_base/applications/multimedia/kaffeine/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kgtk-qt3/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/multimedia/kaffeine/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kaffeine/debian/changelog b/ubuntu/_base/applications/multimedia/kaffeine/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kaffeine/debian/changelog
rename to ubuntu/_base/applications/multimedia/kaffeine/debian/changelog
diff --git a/ubuntu/_base/applications/kima/debian/compat b/ubuntu/_base/applications/multimedia/kaffeine/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kima/debian/compat
rename to ubuntu/_base/applications/multimedia/kaffeine/debian/compat
diff --git a/ubuntu/_base/applications/kaffeine/debian/control b/ubuntu/_base/applications/multimedia/kaffeine/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kaffeine/debian/control
rename to ubuntu/_base/applications/multimedia/kaffeine/debian/control
diff --git a/ubuntu/_base/applications/kaffeine/debian/copyright b/ubuntu/_base/applications/multimedia/kaffeine/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kaffeine/debian/copyright
rename to ubuntu/_base/applications/multimedia/kaffeine/debian/copyright
diff --git a/ubuntu/_base/applications/kaffeine/debian/docs b/ubuntu/_base/applications/multimedia/kaffeine/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/kaffeine/debian/docs
rename to ubuntu/_base/applications/multimedia/kaffeine/debian/docs
diff --git a/ubuntu/_base/applications/kaffeine/debian/kaffeine-gstreamer-trinity.install b/ubuntu/_base/applications/multimedia/kaffeine/debian/kaffeine-gstreamer-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/kaffeine/debian/kaffeine-gstreamer-trinity.install
rename to ubuntu/_base/applications/multimedia/kaffeine/debian/kaffeine-gstreamer-trinity.install
diff --git a/ubuntu/_base/applications/kaffeine/debian/kaffeine-trinity.install b/ubuntu/_base/applications/multimedia/kaffeine/debian/kaffeine-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/kaffeine/debian/kaffeine-trinity.install
rename to ubuntu/_base/applications/multimedia/kaffeine/debian/kaffeine-trinity.install
diff --git a/ubuntu/_base/applications/kaffeine/debian/kaffeine-trinity.lintian-overrides b/ubuntu/_base/applications/multimedia/kaffeine/debian/kaffeine-trinity.lintian-overrides
similarity index 100%
rename from ubuntu/_base/applications/kaffeine/debian/kaffeine-trinity.lintian-overrides
rename to ubuntu/_base/applications/multimedia/kaffeine/debian/kaffeine-trinity.lintian-overrides
diff --git a/ubuntu/_base/applications/kaffeine/debian/kaffeine-trinity.menu b/ubuntu/_base/applications/multimedia/kaffeine/debian/kaffeine-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/kaffeine/debian/kaffeine-trinity.menu
rename to ubuntu/_base/applications/multimedia/kaffeine/debian/kaffeine-trinity.menu
diff --git a/ubuntu/_base/applications/kaffeine/debian/kaffeine.xpm b/ubuntu/_base/applications/multimedia/kaffeine/debian/kaffeine.xpm
similarity index 100%
rename from ubuntu/_base/applications/kaffeine/debian/kaffeine.xpm
rename to ubuntu/_base/applications/multimedia/kaffeine/debian/kaffeine.xpm
diff --git a/ubuntu/_base/applications/kcmldap/debian/patches/series b/ubuntu/_base/applications/multimedia/kaffeine/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/kcmldap/debian/patches/series
rename to ubuntu/_base/applications/multimedia/kaffeine/debian/patches/series
diff --git a/ubuntu/_base/applications/kmplayer/debian/rules b/ubuntu/_base/applications/multimedia/kaffeine/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kmplayer/debian/rules
rename to ubuntu/_base/applications/multimedia/kaffeine/debian/rules
diff --git a/ubuntu/_base/applications/kile/debian/source/format b/ubuntu/_base/applications/multimedia/kaffeine/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kile/debian/source/format
rename to ubuntu/_base/applications/multimedia/kaffeine/debian/source/format
diff --git a/ubuntu/_base/applications/kile/debian/source/options b/ubuntu/_base/applications/multimedia/kaffeine/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kile/debian/source/options
rename to ubuntu/_base/applications/multimedia/kaffeine/debian/source/options
diff --git a/ubuntu/_base/applications/kbfx/debian/README.Debian b/ubuntu/_base/applications/multimedia/kmplayer/debian/README.Debian
similarity index 100%
rename from ubuntu/_base/applications/kbfx/debian/README.Debian
rename to ubuntu/_base/applications/multimedia/kmplayer/debian/README.Debian
diff --git a/ubuntu/_base/applications/kile/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/kmplayer/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kile/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/multimedia/kmplayer/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kile/debian/cdbs/versions.pl b/ubuntu/_base/applications/multimedia/kmplayer/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kile/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/multimedia/kmplayer/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kmplayer/debian/changelog b/ubuntu/_base/applications/multimedia/kmplayer/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kmplayer/debian/changelog
rename to ubuntu/_base/applications/multimedia/kmplayer/debian/changelog
diff --git a/ubuntu/_base/applications/kiosktool/debian/compat b/ubuntu/_base/applications/multimedia/kmplayer/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kiosktool/debian/compat
rename to ubuntu/_base/applications/multimedia/kmplayer/debian/compat
diff --git a/ubuntu/_base/applications/kmplayer/debian/control b/ubuntu/_base/applications/multimedia/kmplayer/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kmplayer/debian/control
rename to ubuntu/_base/applications/multimedia/kmplayer/debian/control
diff --git a/ubuntu/_base/applications/kmplayer/debian/copyright b/ubuntu/_base/applications/multimedia/kmplayer/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kmplayer/debian/copyright
rename to ubuntu/_base/applications/multimedia/kmplayer/debian/copyright
diff --git a/ubuntu/_base/applications/kmplayer/debian/kmplayer-base-trinity.install b/ubuntu/_base/applications/multimedia/kmplayer/debian/kmplayer-base-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/kmplayer/debian/kmplayer-base-trinity.install
rename to ubuntu/_base/applications/multimedia/kmplayer/debian/kmplayer-base-trinity.install
diff --git a/ubuntu/_base/applications/kmplayer/debian/kmplayer-koffice-plugins-trinity.install b/ubuntu/_base/applications/multimedia/kmplayer/debian/kmplayer-koffice-plugins-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/kmplayer/debian/kmplayer-koffice-plugins-trinity.install
rename to ubuntu/_base/applications/multimedia/kmplayer/debian/kmplayer-koffice-plugins-trinity.install
diff --git a/ubuntu/_base/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install b/ubuntu/_base/applications/multimedia/kmplayer/debian/kmplayer-konq-plugins-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install
rename to ubuntu/_base/applications/multimedia/kmplayer/debian/kmplayer-konq-plugins-trinity.install
diff --git a/ubuntu/_base/applications/kmplayer/debian/kmplayer-trinity-doc.install b/ubuntu/_base/applications/multimedia/kmplayer/debian/kmplayer-trinity-doc.install
similarity index 100%
rename from ubuntu/_base/applications/kmplayer/debian/kmplayer-trinity-doc.install
rename to ubuntu/_base/applications/multimedia/kmplayer/debian/kmplayer-trinity-doc.install
diff --git a/ubuntu/_base/applications/kmplayer/debian/kmplayer-trinity.install b/ubuntu/_base/applications/multimedia/kmplayer/debian/kmplayer-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/kmplayer/debian/kmplayer-trinity.install
rename to ubuntu/_base/applications/multimedia/kmplayer/debian/kmplayer-trinity.install
diff --git a/ubuntu/_base/applications/kmplayer/debian/kmplayer-trinity.menu b/ubuntu/_base/applications/multimedia/kmplayer/debian/kmplayer-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/kmplayer/debian/kmplayer-trinity.menu
rename to ubuntu/_base/applications/multimedia/kmplayer/debian/kmplayer-trinity.menu
diff --git a/ubuntu/_base/applications/kcmldapcontroller/debian/patches/series b/ubuntu/_base/applications/multimedia/kmplayer/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/kcmldapcontroller/debian/patches/series
rename to ubuntu/_base/applications/multimedia/kmplayer/debian/patches/series
diff --git a/ubuntu/_base/applications/knetstats/debian/rules b/ubuntu/_base/applications/multimedia/kmplayer/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/knetstats/debian/rules
rename to ubuntu/_base/applications/multimedia/kmplayer/debian/rules
diff --git a/ubuntu/_base/applications/kima/debian/source/format b/ubuntu/_base/applications/multimedia/kmplayer/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kima/debian/source/format
rename to ubuntu/_base/applications/multimedia/kmplayer/debian/source/format
diff --git a/ubuntu/_base/applications/kima/debian/source/options b/ubuntu/_base/applications/multimedia/kmplayer/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kima/debian/source/options
rename to ubuntu/_base/applications/multimedia/kmplayer/debian/source/options
diff --git a/ubuntu/_base/applications/kima/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/kplayer/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kima/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/multimedia/kplayer/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kima/debian/cdbs/versions.pl b/ubuntu/_base/applications/multimedia/kplayer/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kima/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/multimedia/kplayer/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kplayer/debian/changelog b/ubuntu/_base/applications/multimedia/kplayer/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kplayer/debian/changelog
rename to ubuntu/_base/applications/multimedia/kplayer/debian/changelog
diff --git a/ubuntu/_base/applications/kkbswitch/debian/compat b/ubuntu/_base/applications/multimedia/kplayer/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kkbswitch/debian/compat
rename to ubuntu/_base/applications/multimedia/kplayer/debian/compat
diff --git a/ubuntu/_base/applications/kplayer/debian/control b/ubuntu/_base/applications/multimedia/kplayer/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kplayer/debian/control
rename to ubuntu/_base/applications/multimedia/kplayer/debian/control
diff --git a/ubuntu/_base/applications/kplayer/debian/copyright b/ubuntu/_base/applications/multimedia/kplayer/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kplayer/debian/copyright
rename to ubuntu/_base/applications/multimedia/kplayer/debian/copyright
diff --git a/ubuntu/_base/applications/kplayer/debian/patches/series b/ubuntu/_base/applications/multimedia/kplayer/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/kplayer/debian/patches/series
rename to ubuntu/_base/applications/multimedia/kplayer/debian/patches/series
diff --git a/ubuntu/_base/applications/knmap/debian/rules b/ubuntu/_base/applications/multimedia/kplayer/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/knmap/debian/rules
rename to ubuntu/_base/applications/multimedia/kplayer/debian/rules
diff --git a/ubuntu/_base/applications/kiosktool/debian/source/format b/ubuntu/_base/applications/multimedia/kplayer/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kiosktool/debian/source/format
rename to ubuntu/_base/applications/multimedia/kplayer/debian/source/format
diff --git a/ubuntu/_base/applications/kiosktool/debian/source/options b/ubuntu/_base/applications/multimedia/kplayer/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kiosktool/debian/source/options
rename to ubuntu/_base/applications/multimedia/kplayer/debian/source/options
diff --git a/ubuntu/_base/applications/kiosktool/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kiosktool/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/multimedia/mplayerthumbs/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kiosktool/debian/cdbs/versions.pl b/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kiosktool/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/multimedia/mplayerthumbs/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/mplayerthumbs/debian/changelog b/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/mplayerthumbs/debian/changelog
rename to ubuntu/_base/applications/multimedia/mplayerthumbs/debian/changelog
diff --git a/ubuntu/_base/applications/klamav/debian/compat b/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/klamav/debian/compat
rename to ubuntu/_base/applications/multimedia/mplayerthumbs/debian/compat
diff --git a/ubuntu/_base/applications/mplayerthumbs/debian/control b/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/control
similarity index 100%
rename from ubuntu/_base/applications/mplayerthumbs/debian/control
rename to ubuntu/_base/applications/multimedia/mplayerthumbs/debian/control
diff --git a/ubuntu/_base/applications/mplayerthumbs/debian/copyright b/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/mplayerthumbs/debian/copyright
rename to ubuntu/_base/applications/multimedia/mplayerthumbs/debian/copyright
diff --git a/ubuntu/_base/applications/knmap/debian/docs b/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/knmap/debian/docs
rename to ubuntu/_base/applications/multimedia/mplayerthumbs/debian/docs
diff --git a/ubuntu/_base/applications/kdpkg/debian/rules b/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kdpkg/debian/rules
rename to ubuntu/_base/applications/multimedia/mplayerthumbs/debian/rules
diff --git a/ubuntu/_base/applications/kkbswitch/debian/source/format b/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kkbswitch/debian/source/format
rename to ubuntu/_base/applications/multimedia/mplayerthumbs/debian/source/format
diff --git a/ubuntu/_base/applications/kkbswitch/debian/source/options b/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kkbswitch/debian/source/options
rename to ubuntu/_base/applications/multimedia/mplayerthumbs/debian/source/options
diff --git a/ubuntu/_base/applications/rosegarden/debian/README.Debian b/ubuntu/_base/applications/multimedia/rosegarden/debian/README.Debian
similarity index 100%
rename from ubuntu/_base/applications/rosegarden/debian/README.Debian
rename to ubuntu/_base/applications/multimedia/rosegarden/debian/README.Debian
diff --git a/ubuntu/_base/applications/kkbswitch/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/rosegarden/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kkbswitch/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/multimedia/rosegarden/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kkbswitch/debian/cdbs/versions.pl b/ubuntu/_base/applications/multimedia/rosegarden/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kkbswitch/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/multimedia/rosegarden/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/rosegarden/debian/changelog b/ubuntu/_base/applications/multimedia/rosegarden/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/rosegarden/debian/changelog
rename to ubuntu/_base/applications/multimedia/rosegarden/debian/changelog
diff --git a/ubuntu/_base/applications/klcddimmer/debian/compat b/ubuntu/_base/applications/multimedia/rosegarden/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/klcddimmer/debian/compat
rename to ubuntu/_base/applications/multimedia/rosegarden/debian/compat
diff --git a/ubuntu/_base/applications/rosegarden/debian/control b/ubuntu/_base/applications/multimedia/rosegarden/debian/control
similarity index 100%
rename from ubuntu/_base/applications/rosegarden/debian/control
rename to ubuntu/_base/applications/multimedia/rosegarden/debian/control
diff --git a/ubuntu/_base/applications/rosegarden/debian/copyright b/ubuntu/_base/applications/multimedia/rosegarden/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/rosegarden/debian/copyright
rename to ubuntu/_base/applications/multimedia/rosegarden/debian/copyright
diff --git a/ubuntu/_base/applications/kcmldapmanager/debian/patches/series b/ubuntu/_base/applications/multimedia/rosegarden/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/kcmldapmanager/debian/patches/series
rename to ubuntu/_base/applications/multimedia/rosegarden/debian/patches/series
diff --git a/ubuntu/_base/applications/rosegarden/debian/rosegarden-audiofile-importer.1 b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-audiofile-importer.1
similarity index 100%
rename from ubuntu/_base/applications/rosegarden/debian/rosegarden-audiofile-importer.1
rename to ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-audiofile-importer.1
diff --git a/ubuntu/_base/applications/rosegarden/debian/rosegarden-data-trinity.install b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-data-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/rosegarden/debian/rosegarden-data-trinity.install
rename to ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-data-trinity.install
diff --git a/ubuntu/_base/applications/rosegarden/debian/rosegarden-lilypondview.1 b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-lilypondview.1
similarity index 100%
rename from ubuntu/_base/applications/rosegarden/debian/rosegarden-lilypondview.1
rename to ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-lilypondview.1
diff --git a/ubuntu/_base/applications/rosegarden/debian/rosegarden-project-package.1 b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-project-package.1
similarity index 100%
rename from ubuntu/_base/applications/rosegarden/debian/rosegarden-project-package.1
rename to ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-project-package.1
diff --git a/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.dirs b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.dirs
similarity index 100%
rename from ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.dirs
rename to ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.dirs
diff --git a/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.docs b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.docs
similarity index 100%
rename from ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.docs
rename to ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.docs
diff --git a/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.examples b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.examples
similarity index 100%
rename from ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.examples
rename to ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.examples
diff --git a/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.install b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.install
rename to ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.install
diff --git a/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.links b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.links
similarity index 100%
rename from ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.links
rename to ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.links
diff --git a/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.lintian b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.lintian
similarity index 100%
rename from ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.lintian
rename to ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.lintian
diff --git a/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.manpages b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.manpages
similarity index 100%
rename from ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.manpages
rename to ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.manpages
diff --git a/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.menu b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.menu
rename to ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.menu
diff --git a/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.sharedmimeinfo b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.sharedmimeinfo
similarity index 100%
rename from ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.sharedmimeinfo
rename to ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.sharedmimeinfo
diff --git a/ubuntu/_base/applications/rosegarden/debian/rosegarden.1 b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden.1
similarity index 100%
rename from ubuntu/_base/applications/rosegarden/debian/rosegarden.1
rename to ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden.1
diff --git a/ubuntu/_base/applications/rosegarden/debian/rules b/ubuntu/_base/applications/multimedia/rosegarden/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/rosegarden/debian/rules
rename to ubuntu/_base/applications/multimedia/rosegarden/debian/rules
diff --git a/ubuntu/_base/applications/rosegarden/debian/semantic.cache b/ubuntu/_base/applications/multimedia/rosegarden/debian/semantic.cache
similarity index 100%
rename from ubuntu/_base/applications/rosegarden/debian/semantic.cache
rename to ubuntu/_base/applications/multimedia/rosegarden/debian/semantic.cache
diff --git a/ubuntu/_base/applications/klamav/debian/source/format b/ubuntu/_base/applications/multimedia/rosegarden/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/klamav/debian/source/format
rename to ubuntu/_base/applications/multimedia/rosegarden/debian/source/format
diff --git a/ubuntu/_base/applications/klamav/debian/source/options b/ubuntu/_base/applications/multimedia/rosegarden/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/klamav/debian/source/options
rename to ubuntu/_base/applications/multimedia/rosegarden/debian/source/options
diff --git a/ubuntu/_base/applications/rosegarden/debian/watch b/ubuntu/_base/applications/multimedia/rosegarden/debian/watch
similarity index 100%
rename from ubuntu/_base/applications/rosegarden/debian/watch
rename to ubuntu/_base/applications/multimedia/rosegarden/debian/watch
diff --git a/ubuntu/_base/applications/rosegarden/debian/x-rosegarden.desktop b/ubuntu/_base/applications/multimedia/rosegarden/debian/x-rosegarden.desktop
similarity index 100%
rename from ubuntu/_base/applications/rosegarden/debian/x-rosegarden.desktop
rename to ubuntu/_base/applications/multimedia/rosegarden/debian/x-rosegarden.desktop
diff --git a/ubuntu/_base/applications/soundkonverter/debian/README.Debian b/ubuntu/_base/applications/multimedia/soundkonverter/debian/README.Debian
similarity index 100%
rename from ubuntu/_base/applications/soundkonverter/debian/README.Debian
rename to ubuntu/_base/applications/multimedia/soundkonverter/debian/README.Debian
diff --git a/ubuntu/_base/applications/klamav/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/soundkonverter/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/klamav/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/multimedia/soundkonverter/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/klamav/debian/cdbs/versions.pl b/ubuntu/_base/applications/multimedia/soundkonverter/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/klamav/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/multimedia/soundkonverter/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/soundkonverter/debian/changelog b/ubuntu/_base/applications/multimedia/soundkonverter/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/soundkonverter/debian/changelog
rename to ubuntu/_base/applications/multimedia/soundkonverter/debian/changelog
diff --git a/ubuntu/_base/applications/kmatplot/debian/compat b/ubuntu/_base/applications/multimedia/soundkonverter/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kmatplot/debian/compat
rename to ubuntu/_base/applications/multimedia/soundkonverter/debian/compat
diff --git a/ubuntu/_base/applications/soundkonverter/debian/control b/ubuntu/_base/applications/multimedia/soundkonverter/debian/control
similarity index 100%
rename from ubuntu/_base/applications/soundkonverter/debian/control
rename to ubuntu/_base/applications/multimedia/soundkonverter/debian/control
diff --git a/ubuntu/_base/applications/soundkonverter/debian/copyright b/ubuntu/_base/applications/multimedia/soundkonverter/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/soundkonverter/debian/copyright
rename to ubuntu/_base/applications/multimedia/soundkonverter/debian/copyright
diff --git a/ubuntu/_base/applications/kdiff3/debian/docs b/ubuntu/_base/applications/multimedia/soundkonverter/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/kdiff3/debian/docs
rename to ubuntu/_base/applications/multimedia/soundkonverter/debian/docs
diff --git a/ubuntu/_base/applications/ksplash-engine-moodin/debian/patches/.gitignore b/ubuntu/_base/applications/multimedia/soundkonverter/debian/patches/.gitignore
similarity index 100%
rename from ubuntu/_base/applications/ksplash-engine-moodin/debian/patches/.gitignore
rename to ubuntu/_base/applications/multimedia/soundkonverter/debian/patches/.gitignore
diff --git a/ubuntu/_base/applications/soundkonverter/debian/rules b/ubuntu/_base/applications/multimedia/soundkonverter/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/soundkonverter/debian/rules
rename to ubuntu/_base/applications/multimedia/soundkonverter/debian/rules
diff --git a/ubuntu/_base/applications/soundkonverter/debian/soundkonverter-amarok-trinity.install b/ubuntu/_base/applications/multimedia/soundkonverter/debian/soundkonverter-amarok-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/soundkonverter/debian/soundkonverter-amarok-trinity.install
rename to ubuntu/_base/applications/multimedia/soundkonverter/debian/soundkonverter-amarok-trinity.install
diff --git a/ubuntu/_base/applications/soundkonverter/debian/soundkonverter-trinity.install b/ubuntu/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/soundkonverter/debian/soundkonverter-trinity.install
rename to ubuntu/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.install
diff --git a/ubuntu/_base/applications/soundkonverter/debian/soundkonverter-trinity.lintian-overrides b/ubuntu/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.lintian-overrides
similarity index 100%
rename from ubuntu/_base/applications/soundkonverter/debian/soundkonverter-trinity.lintian-overrides
rename to ubuntu/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.lintian-overrides
diff --git a/ubuntu/_base/applications/klcddimmer/debian/source/format b/ubuntu/_base/applications/multimedia/soundkonverter/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/klcddimmer/debian/source/format
rename to ubuntu/_base/applications/multimedia/soundkonverter/debian/source/format
diff --git a/ubuntu/_base/applications/klcddimmer/debian/source/options b/ubuntu/_base/applications/multimedia/soundkonverter/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/klcddimmer/debian/source/options
rename to ubuntu/_base/applications/multimedia/soundkonverter/debian/source/options
diff --git a/ubuntu/_base/applications/tderadio/debian/changelog b/ubuntu/_base/applications/multimedia/tderadio/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/tderadio/debian/changelog
rename to ubuntu/_base/applications/multimedia/tderadio/debian/changelog
diff --git a/ubuntu/_base/applications/kmplayer/debian/compat b/ubuntu/_base/applications/multimedia/tderadio/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kmplayer/debian/compat
rename to ubuntu/_base/applications/multimedia/tderadio/debian/compat
diff --git a/ubuntu/_base/applications/tderadio/debian/control b/ubuntu/_base/applications/multimedia/tderadio/debian/control
similarity index 100%
rename from ubuntu/_base/applications/tderadio/debian/control
rename to ubuntu/_base/applications/multimedia/tderadio/debian/control
diff --git a/ubuntu/_base/applications/tderadio/debian/convert-presets.1 b/ubuntu/_base/applications/multimedia/tderadio/debian/convert-presets.1
similarity index 100%
rename from ubuntu/_base/applications/tderadio/debian/convert-presets.1
rename to ubuntu/_base/applications/multimedia/tderadio/debian/convert-presets.1
diff --git a/ubuntu/_base/applications/tderadio/debian/copyright b/ubuntu/_base/applications/multimedia/tderadio/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/tderadio/debian/copyright
rename to ubuntu/_base/applications/multimedia/tderadio/debian/copyright
diff --git a/ubuntu/_base/applications/tderadio/debian/docs b/ubuntu/_base/applications/multimedia/tderadio/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/tderadio/debian/docs
rename to ubuntu/_base/applications/multimedia/tderadio/debian/docs
diff --git a/ubuntu/_base/applications/tderadio/debian/manpages b/ubuntu/_base/applications/multimedia/tderadio/debian/manpages
similarity index 100%
rename from ubuntu/_base/applications/tderadio/debian/manpages
rename to ubuntu/_base/applications/multimedia/tderadio/debian/manpages
diff --git a/ubuntu/_base/applications/tderadio/debian/menu b/ubuntu/_base/applications/multimedia/tderadio/debian/menu
similarity index 100%
rename from ubuntu/_base/applications/tderadio/debian/menu
rename to ubuntu/_base/applications/multimedia/tderadio/debian/menu
diff --git a/ubuntu/_base/applications/tderadio/debian/rules b/ubuntu/_base/applications/multimedia/tderadio/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/tderadio/debian/rules
rename to ubuntu/_base/applications/multimedia/tderadio/debian/rules
diff --git a/ubuntu/_base/applications/kmatplot/debian/source/format b/ubuntu/_base/applications/multimedia/tderadio/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kmatplot/debian/source/format
rename to ubuntu/_base/applications/multimedia/tderadio/debian/source/format
diff --git a/ubuntu/_base/applications/kmatplot/debian/source/options b/ubuntu/_base/applications/multimedia/tderadio/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kmatplot/debian/source/options
rename to ubuntu/_base/applications/multimedia/tderadio/debian/source/options
diff --git a/ubuntu/_base/applications/tderadio/debian/tderadio.1 b/ubuntu/_base/applications/multimedia/tderadio/debian/tderadio.1
similarity index 100%
rename from ubuntu/_base/applications/tderadio/debian/tderadio.1
rename to ubuntu/_base/applications/multimedia/tderadio/debian/tderadio.1
diff --git a/ubuntu/_base/applications/tderadio/debian/watch b/ubuntu/_base/applications/multimedia/tderadio/debian/watch
similarity index 100%
rename from ubuntu/_base/applications/tderadio/debian/watch
rename to ubuntu/_base/applications/multimedia/tderadio/debian/watch
diff --git a/ubuntu/_base/applications/basket/debian/basket-kontact-integration-trinity.install b/ubuntu/_base/applications/office/basket/debian/basket-kontact-integration-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/basket/debian/basket-kontact-integration-trinity.install
rename to ubuntu/_base/applications/office/basket/debian/basket-kontact-integration-trinity.install
diff --git a/ubuntu/_base/applications/basket/debian/basket-trinity.install b/ubuntu/_base/applications/office/basket/debian/basket-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/basket/debian/basket-trinity.install
rename to ubuntu/_base/applications/office/basket/debian/basket-trinity.install
diff --git a/ubuntu/_base/applications/klcddimmer/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/basket/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/klcddimmer/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/office/basket/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/klcddimmer/debian/cdbs/versions.pl b/ubuntu/_base/applications/office/basket/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/klcddimmer/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/office/basket/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/basket/debian/changelog b/ubuntu/_base/applications/office/basket/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/basket/debian/changelog
rename to ubuntu/_base/applications/office/basket/debian/changelog
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/compat b/ubuntu/_base/applications/office/basket/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kmyfirewall/debian/compat
rename to ubuntu/_base/applications/office/basket/debian/compat
diff --git a/ubuntu/_base/applications/basket/debian/control b/ubuntu/_base/applications/office/basket/debian/control
similarity index 100%
rename from ubuntu/_base/applications/basket/debian/control
rename to ubuntu/_base/applications/office/basket/debian/control
diff --git a/ubuntu/_base/applications/basket/debian/copyright b/ubuntu/_base/applications/office/basket/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/basket/debian/copyright
rename to ubuntu/_base/applications/office/basket/debian/copyright
diff --git a/ubuntu/_base/applications/kbiff/debian/dirs b/ubuntu/_base/applications/office/basket/debian/dirs
similarity index 100%
rename from ubuntu/_base/applications/kbiff/debian/dirs
rename to ubuntu/_base/applications/office/basket/debian/dirs
diff --git a/ubuntu/_base/applications/kompose/debian/docs b/ubuntu/_base/applications/office/basket/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/kompose/debian/docs
rename to ubuntu/_base/applications/office/basket/debian/docs
diff --git a/ubuntu/_base/applications/basket/debian/menu b/ubuntu/_base/applications/office/basket/debian/menu
similarity index 100%
rename from ubuntu/_base/applications/basket/debian/menu
rename to ubuntu/_base/applications/office/basket/debian/menu
diff --git a/ubuntu/_base/applications/kdirstat/debian/patches/series b/ubuntu/_base/applications/office/basket/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/kdirstat/debian/patches/series
rename to ubuntu/_base/applications/office/basket/debian/patches/series
diff --git a/ubuntu/_base/applications/knowit/debian/rules b/ubuntu/_base/applications/office/basket/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/knowit/debian/rules
rename to ubuntu/_base/applications/office/basket/debian/rules
diff --git a/ubuntu/_base/applications/kmplayer/debian/source/format b/ubuntu/_base/applications/office/basket/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kmplayer/debian/source/format
rename to ubuntu/_base/applications/office/basket/debian/source/format
diff --git a/ubuntu/_base/applications/kmplayer/debian/source/options b/ubuntu/_base/applications/office/basket/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kmplayer/debian/source/options
rename to ubuntu/_base/applications/office/basket/debian/source/options
diff --git a/ubuntu/_base/applications/kmplayer/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/kbibtex/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kmplayer/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/office/kbibtex/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kmplayer/debian/cdbs/versions.pl b/ubuntu/_base/applications/office/kbibtex/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kmplayer/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/office/kbibtex/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kbibtex/debian/changelog b/ubuntu/_base/applications/office/kbibtex/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kbibtex/debian/changelog
rename to ubuntu/_base/applications/office/kbibtex/debian/changelog
diff --git a/ubuntu/_base/applications/kmymoney/debian/compat b/ubuntu/_base/applications/office/kbibtex/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kmymoney/debian/compat
rename to ubuntu/_base/applications/office/kbibtex/debian/compat
diff --git a/ubuntu/_base/applications/kbibtex/debian/control b/ubuntu/_base/applications/office/kbibtex/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kbibtex/debian/control
rename to ubuntu/_base/applications/office/kbibtex/debian/control
diff --git a/ubuntu/_base/applications/kbibtex/debian/copyright b/ubuntu/_base/applications/office/kbibtex/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kbibtex/debian/copyright
rename to ubuntu/_base/applications/office/kbibtex/debian/copyright
diff --git a/ubuntu/_base/applications/kbibtex/debian/docs b/ubuntu/_base/applications/office/kbibtex/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/kbibtex/debian/docs
rename to ubuntu/_base/applications/office/kbibtex/debian/docs
diff --git a/ubuntu/_base/applications/kbibtex/debian/menu b/ubuntu/_base/applications/office/kbibtex/debian/menu
similarity index 100%
rename from ubuntu/_base/applications/kbibtex/debian/menu
rename to ubuntu/_base/applications/office/kbibtex/debian/menu
diff --git a/ubuntu/_base/applications/keep/debian/rules b/ubuntu/_base/applications/office/kbibtex/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/keep/debian/rules
rename to ubuntu/_base/applications/office/kbibtex/debian/rules
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/source/format b/ubuntu/_base/applications/office/kbibtex/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kmyfirewall/debian/source/format
rename to ubuntu/_base/applications/office/kbibtex/debian/source/format
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/source/options b/ubuntu/_base/applications/office/kbibtex/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kmyfirewall/debian/source/options
rename to ubuntu/_base/applications/office/kbibtex/debian/source/options
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/kbookreader/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kmyfirewall/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/office/kbookreader/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/cdbs/versions.pl b/ubuntu/_base/applications/office/kbookreader/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kmyfirewall/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/office/kbookreader/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kbookreader/debian/changelog b/ubuntu/_base/applications/office/kbookreader/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kbookreader/debian/changelog
rename to ubuntu/_base/applications/office/kbookreader/debian/changelog
diff --git a/ubuntu/_base/applications/kbookreader/debian/compat b/ubuntu/_base/applications/office/kbookreader/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kbookreader/debian/compat
rename to ubuntu/_base/applications/office/kbookreader/debian/compat
diff --git a/ubuntu/_base/applications/kbookreader/debian/control b/ubuntu/_base/applications/office/kbookreader/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kbookreader/debian/control
rename to ubuntu/_base/applications/office/kbookreader/debian/control
diff --git a/ubuntu/_base/applications/kbookreader/debian/copyright b/ubuntu/_base/applications/office/kbookreader/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kbookreader/debian/copyright
rename to ubuntu/_base/applications/office/kbookreader/debian/copyright
diff --git a/ubuntu/_base/applications/kbookreader/debian/docs b/ubuntu/_base/applications/office/kbookreader/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/kbookreader/debian/docs
rename to ubuntu/_base/applications/office/kbookreader/debian/docs
diff --git a/ubuntu/_base/applications/kdpkg/debian/patches/series b/ubuntu/_base/applications/office/kbookreader/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/kdpkg/debian/patches/series
rename to ubuntu/_base/applications/office/kbookreader/debian/patches/series
diff --git a/ubuntu/_base/applications/knutclient/debian/rules b/ubuntu/_base/applications/office/kbookreader/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/knutclient/debian/rules
rename to ubuntu/_base/applications/office/kbookreader/debian/rules
diff --git a/ubuntu/_base/applications/kmymoney/debian/source/format b/ubuntu/_base/applications/office/kbookreader/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kmymoney/debian/source/format
rename to ubuntu/_base/applications/office/kbookreader/debian/source/format
diff --git a/ubuntu/_base/applications/kmymoney/debian/source/options b/ubuntu/_base/applications/office/kbookreader/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kmymoney/debian/source/options
rename to ubuntu/_base/applications/office/kbookreader/debian/source/options
diff --git a/ubuntu/_base/applications/kmymoney/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/keximdb/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kmymoney/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/office/keximdb/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kmymoney/debian/cdbs/versions.pl b/ubuntu/_base/applications/office/keximdb/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kmymoney/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/office/keximdb/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/keximdb/debian/changelog b/ubuntu/_base/applications/office/keximdb/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/keximdb/debian/changelog
rename to ubuntu/_base/applications/office/keximdb/debian/changelog
diff --git a/ubuntu/_base/applications/knemo/debian/compat b/ubuntu/_base/applications/office/keximdb/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/knemo/debian/compat
rename to ubuntu/_base/applications/office/keximdb/debian/compat
diff --git a/ubuntu/_base/applications/keximdb/debian/control b/ubuntu/_base/applications/office/keximdb/debian/control
similarity index 100%
rename from ubuntu/_base/applications/keximdb/debian/control
rename to ubuntu/_base/applications/office/keximdb/debian/control
diff --git a/ubuntu/_base/applications/keximdb/debian/copyright b/ubuntu/_base/applications/office/keximdb/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/keximdb/debian/copyright
rename to ubuntu/_base/applications/office/keximdb/debian/copyright
diff --git a/ubuntu/_base/applications/kshowmail/debian/docs b/ubuntu/_base/applications/office/keximdb/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/kshowmail/debian/docs
rename to ubuntu/_base/applications/office/keximdb/debian/docs
diff --git a/ubuntu/_base/applications/keximdb/debian/rules b/ubuntu/_base/applications/office/keximdb/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/keximdb/debian/rules
rename to ubuntu/_base/applications/office/keximdb/debian/rules
diff --git a/ubuntu/_base/applications/knemo/debian/source/format b/ubuntu/_base/applications/office/keximdb/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/knemo/debian/source/format
rename to ubuntu/_base/applications/office/keximdb/debian/source/format
diff --git a/ubuntu/_base/applications/knemo/debian/source/options b/ubuntu/_base/applications/office/keximdb/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/knemo/debian/source/options
rename to ubuntu/_base/applications/office/keximdb/debian/source/options
diff --git a/ubuntu/_base/applications/kile/debian/README.Debian b/ubuntu/_base/applications/office/kile/debian/README.Debian
similarity index 100%
rename from ubuntu/_base/applications/kile/debian/README.Debian
rename to ubuntu/_base/applications/office/kile/debian/README.Debian
diff --git a/ubuntu/_base/applications/kile/debian/TODO.Debian b/ubuntu/_base/applications/office/kile/debian/TODO.Debian
similarity index 100%
rename from ubuntu/_base/applications/kile/debian/TODO.Debian
rename to ubuntu/_base/applications/office/kile/debian/TODO.Debian
diff --git a/ubuntu/_base/applications/knemo/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/kile/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/knemo/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/office/kile/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/knemo/debian/cdbs/versions.pl b/ubuntu/_base/applications/office/kile/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/knemo/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/office/kile/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kile/debian/changelog b/ubuntu/_base/applications/office/kile/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kile/debian/changelog
rename to ubuntu/_base/applications/office/kile/debian/changelog
diff --git a/ubuntu/_base/applications/knetload/debian/compat b/ubuntu/_base/applications/office/kile/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/knetload/debian/compat
rename to ubuntu/_base/applications/office/kile/debian/compat
diff --git a/ubuntu/_base/applications/kile/debian/control b/ubuntu/_base/applications/office/kile/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kile/debian/control
rename to ubuntu/_base/applications/office/kile/debian/control
diff --git a/ubuntu/_base/applications/kile/debian/copyright b/ubuntu/_base/applications/office/kile/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kile/debian/copyright
rename to ubuntu/_base/applications/office/kile/debian/copyright
diff --git a/ubuntu/_base/applications/ksquirrel/debian/docs b/ubuntu/_base/applications/office/kile/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/ksquirrel/debian/docs
rename to ubuntu/_base/applications/office/kile/debian/docs
diff --git a/ubuntu/_base/applications/kile/debian/kile-trinity.install b/ubuntu/_base/applications/office/kile/debian/kile-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/kile/debian/kile-trinity.install
rename to ubuntu/_base/applications/office/kile/debian/kile-trinity.install
diff --git a/ubuntu/_base/applications/kile/debian/kile-trinity.links b/ubuntu/_base/applications/office/kile/debian/kile-trinity.links
similarity index 100%
rename from ubuntu/_base/applications/kile/debian/kile-trinity.links
rename to ubuntu/_base/applications/office/kile/debian/kile-trinity.links
diff --git a/ubuntu/_base/applications/kile/debian/kile.1 b/ubuntu/_base/applications/office/kile/debian/kile.1
similarity index 100%
rename from ubuntu/_base/applications/kile/debian/kile.1
rename to ubuntu/_base/applications/office/kile/debian/kile.1
diff --git a/ubuntu/_base/applications/kile/debian/kile.xpm b/ubuntu/_base/applications/office/kile/debian/kile.xpm
similarity index 100%
rename from ubuntu/_base/applications/kile/debian/kile.xpm
rename to ubuntu/_base/applications/office/kile/debian/kile.xpm
diff --git a/ubuntu/_base/applications/kile/debian/menu b/ubuntu/_base/applications/office/kile/debian/menu
similarity index 100%
rename from ubuntu/_base/applications/kile/debian/menu
rename to ubuntu/_base/applications/office/kile/debian/menu
diff --git a/ubuntu/_base/applications/ksquirrel/debian/patches/.gitignore b/ubuntu/_base/applications/office/kile/debian/patches/.gitignore
similarity index 100%
rename from ubuntu/_base/applications/ksquirrel/debian/patches/.gitignore
rename to ubuntu/_base/applications/office/kile/debian/patches/.gitignore
diff --git a/ubuntu/_base/applications/kile/debian/rules b/ubuntu/_base/applications/office/kile/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kile/debian/rules
rename to ubuntu/_base/applications/office/kile/debian/rules
diff --git a/ubuntu/_base/applications/knetload/debian/source/format b/ubuntu/_base/applications/office/kile/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/knetload/debian/source/format
rename to ubuntu/_base/applications/office/kile/debian/source/format
diff --git a/ubuntu/_base/applications/knetload/debian/source/options b/ubuntu/_base/applications/office/kile/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/knetload/debian/source/options
rename to ubuntu/_base/applications/office/kile/debian/source/options
diff --git a/ubuntu/_base/applications/kile/debian/watch b/ubuntu/_base/applications/office/kile/debian/watch
similarity index 100%
rename from ubuntu/_base/applications/kile/debian/watch
rename to ubuntu/_base/applications/office/kile/debian/watch
diff --git a/ubuntu/_base/applications/kmymoney/debian/NEWS b/ubuntu/_base/applications/office/kmymoney/debian/NEWS
similarity index 100%
rename from ubuntu/_base/applications/kmymoney/debian/NEWS
rename to ubuntu/_base/applications/office/kmymoney/debian/NEWS
diff --git a/ubuntu/_base/applications/kmymoney/debian/README.source b/ubuntu/_base/applications/office/kmymoney/debian/README.source
similarity index 100%
rename from ubuntu/_base/applications/kmymoney/debian/README.source
rename to ubuntu/_base/applications/office/kmymoney/debian/README.source
diff --git a/ubuntu/_base/applications/knetload/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/kmymoney/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/knetload/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/office/kmymoney/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/knetload/debian/cdbs/versions.pl b/ubuntu/_base/applications/office/kmymoney/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/knetload/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/office/kmymoney/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kmymoney/debian/changelog b/ubuntu/_base/applications/office/kmymoney/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kmymoney/debian/changelog
rename to ubuntu/_base/applications/office/kmymoney/debian/changelog
diff --git a/ubuntu/_base/applications/knetstats/debian/compat b/ubuntu/_base/applications/office/kmymoney/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/knetstats/debian/compat
rename to ubuntu/_base/applications/office/kmymoney/debian/compat
diff --git a/ubuntu/_base/applications/kmymoney/debian/control b/ubuntu/_base/applications/office/kmymoney/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kmymoney/debian/control
rename to ubuntu/_base/applications/office/kmymoney/debian/control
diff --git a/ubuntu/_base/applications/kmymoney/debian/copyright b/ubuntu/_base/applications/office/kmymoney/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kmymoney/debian/copyright
rename to ubuntu/_base/applications/office/kmymoney/debian/copyright
diff --git a/ubuntu/_base/applications/kmymoney/debian/kmymoney2-common-trinity.install b/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-common-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/kmymoney/debian/kmymoney2-common-trinity.install
rename to ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-common-trinity.install
diff --git a/ubuntu/_base/applications/kmymoney/debian/kmymoney2-trinity-dev.install b/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install
similarity index 100%
rename from ubuntu/_base/applications/kmymoney/debian/kmymoney2-trinity-dev.install
rename to ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install
diff --git a/ubuntu/_base/applications/kmymoney/debian/kmymoney2-trinity.docs b/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity.docs
similarity index 100%
rename from ubuntu/_base/applications/kmymoney/debian/kmymoney2-trinity.docs
rename to ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity.docs
diff --git a/ubuntu/_base/applications/kmymoney/debian/kmymoney2-trinity.install b/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/kmymoney/debian/kmymoney2-trinity.install
rename to ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity.install
diff --git a/ubuntu/_base/applications/kmymoney/debian/kmymoney2.xpm b/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2.xpm
similarity index 100%
rename from ubuntu/_base/applications/kmymoney/debian/kmymoney2.xpm
rename to ubuntu/_base/applications/office/kmymoney/debian/kmymoney2.xpm
diff --git a/ubuntu/_base/applications/kmymoney/debian/menu b/ubuntu/_base/applications/office/kmymoney/debian/menu
similarity index 100%
rename from ubuntu/_base/applications/kmymoney/debian/menu
rename to ubuntu/_base/applications/office/kmymoney/debian/menu
diff --git a/ubuntu/_base/applications/keep/debian/patches/series b/ubuntu/_base/applications/office/kmymoney/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/keep/debian/patches/series
rename to ubuntu/_base/applications/office/kmymoney/debian/patches/series
diff --git a/ubuntu/_base/applications/kmymoney/debian/rules b/ubuntu/_base/applications/office/kmymoney/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kmymoney/debian/rules
rename to ubuntu/_base/applications/office/kmymoney/debian/rules
diff --git a/ubuntu/_base/applications/knetstats/debian/source/format b/ubuntu/_base/applications/office/kmymoney/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/knetstats/debian/source/format
rename to ubuntu/_base/applications/office/kmymoney/debian/source/format
diff --git a/ubuntu/_base/applications/knetstats/debian/source/options b/ubuntu/_base/applications/office/kmymoney/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/knetstats/debian/source/options
rename to ubuntu/_base/applications/office/kmymoney/debian/source/options
diff --git a/ubuntu/_base/applications/kmymoney/debian/watch b/ubuntu/_base/applications/office/kmymoney/debian/watch
similarity index 100%
rename from ubuntu/_base/applications/kmymoney/debian/watch
rename to ubuntu/_base/applications/office/kmymoney/debian/watch
diff --git a/ubuntu/_base/applications/knetstats/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/knowit/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/knetstats/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/office/knowit/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/knetstats/debian/cdbs/versions.pl b/ubuntu/_base/applications/office/knowit/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/knetstats/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/office/knowit/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/knowit/debian/changelog b/ubuntu/_base/applications/office/knowit/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/knowit/debian/changelog
rename to ubuntu/_base/applications/office/knowit/debian/changelog
diff --git a/ubuntu/_base/applications/knetworkmanager8/debian/compat b/ubuntu/_base/applications/office/knowit/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/knetworkmanager8/debian/compat
rename to ubuntu/_base/applications/office/knowit/debian/compat
diff --git a/ubuntu/_base/applications/knowit/debian/control b/ubuntu/_base/applications/office/knowit/debian/control
similarity index 100%
rename from ubuntu/_base/applications/knowit/debian/control
rename to ubuntu/_base/applications/office/knowit/debian/control
diff --git a/ubuntu/_base/applications/knowit/debian/copyright b/ubuntu/_base/applications/office/knowit/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/knowit/debian/copyright
rename to ubuntu/_base/applications/office/knowit/debian/copyright
diff --git a/ubuntu/_base/applications/knowit/debian/docs b/ubuntu/_base/applications/office/knowit/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/knowit/debian/docs
rename to ubuntu/_base/applications/office/knowit/debian/docs
diff --git a/ubuntu/_base/applications/kopete-otr/debian/rules b/ubuntu/_base/applications/office/knowit/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kopete-otr/debian/rules
rename to ubuntu/_base/applications/office/knowit/debian/rules
diff --git a/ubuntu/_base/applications/knetworkmanager8/debian/source/format b/ubuntu/_base/applications/office/knowit/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/knetworkmanager8/debian/source/format
rename to ubuntu/_base/applications/office/knowit/debian/source/format
diff --git a/ubuntu/_base/applications/knetworkmanager8/debian/source/options b/ubuntu/_base/applications/office/knowit/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/knetworkmanager8/debian/source/options
rename to ubuntu/_base/applications/office/knowit/debian/source/options
diff --git a/ubuntu/_base/applications/koffice-i18n/debian/changelog b/ubuntu/_base/applications/office/koffice-i18n/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/koffice-i18n/debian/changelog
rename to ubuntu/_base/applications/office/koffice-i18n/debian/changelog
diff --git a/ubuntu/_base/applications/knights/debian/compat b/ubuntu/_base/applications/office/koffice-i18n/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/knights/debian/compat
rename to ubuntu/_base/applications/office/koffice-i18n/debian/compat
diff --git a/ubuntu/_base/applications/koffice-i18n/debian/control b/ubuntu/_base/applications/office/koffice-i18n/debian/control
similarity index 100%
rename from ubuntu/_base/applications/koffice-i18n/debian/control
rename to ubuntu/_base/applications/office/koffice-i18n/debian/control
diff --git a/ubuntu/_base/applications/koffice-i18n/debian/copyright b/ubuntu/_base/applications/office/koffice-i18n/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/koffice-i18n/debian/copyright
rename to ubuntu/_base/applications/office/koffice-i18n/debian/copyright
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/debiandirs b/ubuntu/_base/applications/office/koffice-i18n/debian/debiandirs
similarity index 100%
rename from ubuntu/_base/applications/kmyfirewall/debian/debiandirs
rename to ubuntu/_base/applications/office/koffice-i18n/debian/debiandirs
diff --git a/ubuntu/_base/applications/koffice-i18n/debian/rules b/ubuntu/_base/applications/office/koffice-i18n/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/koffice-i18n/debian/rules
rename to ubuntu/_base/applications/office/koffice-i18n/debian/rules
diff --git a/ubuntu/_base/applications/knights/debian/source/format b/ubuntu/_base/applications/office/koffice-i18n/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/knights/debian/source/format
rename to ubuntu/_base/applications/office/koffice-i18n/debian/source/format
diff --git a/ubuntu/_base/applications/knights/debian/source/options b/ubuntu/_base/applications/office/koffice-i18n/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/knights/debian/source/options
rename to ubuntu/_base/applications/office/koffice-i18n/debian/source/options
diff --git a/ubuntu/_base/applications/koffice/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/applications/office/koffice/debian/KUBUNTU-DEBIAN-DIFFERENCES
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/KUBUNTU-DEBIAN-DIFFERENCES
rename to ubuntu/_base/applications/office/koffice/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/ubuntu/_base/applications/koffice/debian/README.MimeType b/ubuntu/_base/applications/office/koffice/debian/README.MimeType
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/README.MimeType
rename to ubuntu/_base/applications/office/koffice/debian/README.MimeType
diff --git a/ubuntu/_base/applications/knetworkmanager8/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/koffice/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/knetworkmanager8/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/office/koffice/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/knetworkmanager8/debian/cdbs/versions.pl b/ubuntu/_base/applications/office/koffice/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/knetworkmanager8/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/office/koffice/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/koffice/debian/chalk-data-trinity.install b/ubuntu/_base/applications/office/koffice/debian/chalk-data-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/chalk-data-trinity.install
rename to ubuntu/_base/applications/office/koffice/debian/chalk-data-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/chalk-data-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/chalk-data-trinity.lintian
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/chalk-data-trinity.lintian
rename to ubuntu/_base/applications/office/koffice/debian/chalk-data-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/chalk-trinity.docs b/ubuntu/_base/applications/office/koffice/debian/chalk-trinity.docs
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/chalk-trinity.docs
rename to ubuntu/_base/applications/office/koffice/debian/chalk-trinity.docs
diff --git a/ubuntu/_base/applications/koffice/debian/chalk-trinity.install b/ubuntu/_base/applications/office/koffice/debian/chalk-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/chalk-trinity.install
rename to ubuntu/_base/applications/office/koffice/debian/chalk-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/chalk-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/chalk-trinity.lintian
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/chalk-trinity.lintian
rename to ubuntu/_base/applications/office/koffice/debian/chalk-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/chalk-trinity.menu b/ubuntu/_base/applications/office/koffice/debian/chalk-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/chalk-trinity.menu
rename to ubuntu/_base/applications/office/koffice/debian/chalk-trinity.menu
diff --git a/ubuntu/_base/applications/koffice/debian/chalk-trinity.mime b/ubuntu/_base/applications/office/koffice/debian/chalk-trinity.mime
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/chalk-trinity.mime
rename to ubuntu/_base/applications/office/koffice/debian/chalk-trinity.mime
diff --git a/ubuntu/_base/applications/koffice/debian/chalk.xpm b/ubuntu/_base/applications/office/koffice/debian/chalk.xpm
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/chalk.xpm
rename to ubuntu/_base/applications/office/koffice/debian/chalk.xpm
diff --git a/ubuntu/_base/applications/koffice/debian/changelog b/ubuntu/_base/applications/office/koffice/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/changelog
rename to ubuntu/_base/applications/office/koffice/debian/changelog
diff --git a/ubuntu/_base/applications/knmap/debian/compat b/ubuntu/_base/applications/office/koffice/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/knmap/debian/compat
rename to ubuntu/_base/applications/office/koffice/debian/compat
diff --git a/ubuntu/_base/applications/koffice/debian/control b/ubuntu/_base/applications/office/koffice/debian/control
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/control
rename to ubuntu/_base/applications/office/koffice/debian/control
diff --git a/ubuntu/_base/applications/koffice/debian/copyright b/ubuntu/_base/applications/office/koffice/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/copyright
rename to ubuntu/_base/applications/office/koffice/debian/copyright
diff --git a/ubuntu/_base/applications/koffice/debian/fogra27l.icm.uu b/ubuntu/_base/applications/office/koffice/debian/fogra27l.icm.uu
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/fogra27l.icm.uu
rename to ubuntu/_base/applications/office/koffice/debian/fogra27l.icm.uu
diff --git a/ubuntu/_base/applications/koffice/debian/karbon-trinity.docs b/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.docs
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/karbon-trinity.docs
rename to ubuntu/_base/applications/office/koffice/debian/karbon-trinity.docs
diff --git a/ubuntu/_base/applications/koffice/debian/karbon-trinity.install b/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/karbon-trinity.install
rename to ubuntu/_base/applications/office/koffice/debian/karbon-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/karbon-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.lintian
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/karbon-trinity.lintian
rename to ubuntu/_base/applications/office/koffice/debian/karbon-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/karbon-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.manpages
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/karbon-trinity.manpages
rename to ubuntu/_base/applications/office/koffice/debian/karbon-trinity.manpages
diff --git a/ubuntu/_base/applications/koffice/debian/karbon-trinity.menu b/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/karbon-trinity.menu
rename to ubuntu/_base/applications/office/koffice/debian/karbon-trinity.menu
diff --git a/ubuntu/_base/applications/koffice/debian/karbon-trinity.mime b/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.mime
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/karbon-trinity.mime
rename to ubuntu/_base/applications/office/koffice/debian/karbon-trinity.mime
diff --git a/ubuntu/_base/applications/koffice/debian/karbon.1 b/ubuntu/_base/applications/office/koffice/debian/karbon.1
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/karbon.1
rename to ubuntu/_base/applications/office/koffice/debian/karbon.1
diff --git a/ubuntu/_base/applications/koffice/debian/karbon.xpm b/ubuntu/_base/applications/office/koffice/debian/karbon.xpm
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/karbon.xpm
rename to ubuntu/_base/applications/office/koffice/debian/karbon.xpm
diff --git a/ubuntu/_base/applications/koffice/debian/kchart-trinity.README.Debian b/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.README.Debian
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kchart-trinity.README.Debian
rename to ubuntu/_base/applications/office/koffice/debian/kchart-trinity.README.Debian
diff --git a/ubuntu/_base/applications/koffice/debian/kchart-trinity.docs b/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.docs
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kchart-trinity.docs
rename to ubuntu/_base/applications/office/koffice/debian/kchart-trinity.docs
diff --git a/ubuntu/_base/applications/koffice/debian/kchart-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kchart-trinity.install
rename to ubuntu/_base/applications/office/koffice/debian/kchart-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/kchart-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.lintian
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kchart-trinity.lintian
rename to ubuntu/_base/applications/office/koffice/debian/kchart-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/kchart-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.manpages
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kchart-trinity.manpages
rename to ubuntu/_base/applications/office/koffice/debian/kchart-trinity.manpages
diff --git a/ubuntu/_base/applications/koffice/debian/kchart-trinity.menu b/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kchart-trinity.menu
rename to ubuntu/_base/applications/office/koffice/debian/kchart-trinity.menu
diff --git a/ubuntu/_base/applications/koffice/debian/kchart-trinity.mime b/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.mime
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kchart-trinity.mime
rename to ubuntu/_base/applications/office/koffice/debian/kchart-trinity.mime
diff --git a/ubuntu/_base/applications/koffice/debian/kchart.1 b/ubuntu/_base/applications/office/koffice/debian/kchart.1
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kchart.1
rename to ubuntu/_base/applications/office/koffice/debian/kchart.1
diff --git a/ubuntu/_base/applications/koffice/debian/kchart.xpm b/ubuntu/_base/applications/office/koffice/debian/kchart.xpm
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kchart.xpm
rename to ubuntu/_base/applications/office/koffice/debian/kchart.xpm
diff --git a/ubuntu/_base/applications/koffice/debian/kexi-trinity.docs b/ubuntu/_base/applications/office/koffice/debian/kexi-trinity.docs
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kexi-trinity.docs
rename to ubuntu/_base/applications/office/koffice/debian/kexi-trinity.docs
diff --git a/ubuntu/_base/applications/koffice/debian/kexi-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kexi-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kexi-trinity.install
rename to ubuntu/_base/applications/office/koffice/debian/kexi-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/kexi-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kexi-trinity.lintian
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kexi-trinity.lintian
rename to ubuntu/_base/applications/office/koffice/debian/kexi-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/kformula-trinity.README.Debian b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.README.Debian
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kformula-trinity.README.Debian
rename to ubuntu/_base/applications/office/koffice/debian/kformula-trinity.README.Debian
diff --git a/ubuntu/_base/applications/koffice/debian/kformula-trinity.docs b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.docs
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kformula-trinity.docs
rename to ubuntu/_base/applications/office/koffice/debian/kformula-trinity.docs
diff --git a/ubuntu/_base/applications/koffice/debian/kformula-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kformula-trinity.install
rename to ubuntu/_base/applications/office/koffice/debian/kformula-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/kformula-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.lintian
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kformula-trinity.lintian
rename to ubuntu/_base/applications/office/koffice/debian/kformula-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/kformula-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.manpages
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kformula-trinity.manpages
rename to ubuntu/_base/applications/office/koffice/debian/kformula-trinity.manpages
diff --git a/ubuntu/_base/applications/koffice/debian/kformula-trinity.menu b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kformula-trinity.menu
rename to ubuntu/_base/applications/office/koffice/debian/kformula-trinity.menu
diff --git a/ubuntu/_base/applications/koffice/debian/kformula-trinity.mime b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.mime
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kformula-trinity.mime
rename to ubuntu/_base/applications/office/koffice/debian/kformula-trinity.mime
diff --git a/ubuntu/_base/applications/koffice/debian/kformula.1 b/ubuntu/_base/applications/office/koffice/debian/kformula.1
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kformula.1
rename to ubuntu/_base/applications/office/koffice/debian/kformula.1
diff --git a/ubuntu/_base/applications/koffice/debian/kformula.xpm b/ubuntu/_base/applications/office/koffice/debian/kformula.xpm
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kformula.xpm
rename to ubuntu/_base/applications/office/koffice/debian/kformula.xpm
diff --git a/ubuntu/_base/applications/koffice/debian/kivio-data-trinity.README.Debian b/ubuntu/_base/applications/office/koffice/debian/kivio-data-trinity.README.Debian
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kivio-data-trinity.README.Debian
rename to ubuntu/_base/applications/office/koffice/debian/kivio-data-trinity.README.Debian
diff --git a/ubuntu/_base/applications/koffice/debian/kivio-data-trinity.docs b/ubuntu/_base/applications/office/koffice/debian/kivio-data-trinity.docs
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kivio-data-trinity.docs
rename to ubuntu/_base/applications/office/koffice/debian/kivio-data-trinity.docs
diff --git a/ubuntu/_base/applications/koffice/debian/kivio-data-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kivio-data-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kivio-data-trinity.install
rename to ubuntu/_base/applications/office/koffice/debian/kivio-data-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/kivio-data-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kivio-data-trinity.lintian
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kivio-data-trinity.lintian
rename to ubuntu/_base/applications/office/koffice/debian/kivio-data-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/kivio-trinity.docs b/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.docs
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kivio-trinity.docs
rename to ubuntu/_base/applications/office/koffice/debian/kivio-trinity.docs
diff --git a/ubuntu/_base/applications/koffice/debian/kivio-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kivio-trinity.install
rename to ubuntu/_base/applications/office/koffice/debian/kivio-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/kivio-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.lintian
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kivio-trinity.lintian
rename to ubuntu/_base/applications/office/koffice/debian/kivio-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/kivio-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.manpages
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kivio-trinity.manpages
rename to ubuntu/_base/applications/office/koffice/debian/kivio-trinity.manpages
diff --git a/ubuntu/_base/applications/koffice/debian/kivio-trinity.menu b/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kivio-trinity.menu
rename to ubuntu/_base/applications/office/koffice/debian/kivio-trinity.menu
diff --git a/ubuntu/_base/applications/koffice/debian/kivio-trinity.mime b/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.mime
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kivio-trinity.mime
rename to ubuntu/_base/applications/office/koffice/debian/kivio-trinity.mime
diff --git a/ubuntu/_base/applications/koffice/debian/kivio.1 b/ubuntu/_base/applications/office/koffice/debian/kivio.1
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kivio.1
rename to ubuntu/_base/applications/office/koffice/debian/kivio.1
diff --git a/ubuntu/_base/applications/koffice/debian/kivio.xpm b/ubuntu/_base/applications/office/koffice/debian/kivio.xpm
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kivio.xpm
rename to ubuntu/_base/applications/office/koffice/debian/kivio.xpm
diff --git a/ubuntu/_base/applications/koffice/debian/koconverter.1 b/ubuntu/_base/applications/office/koffice/debian/koconverter.1
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/koconverter.1
rename to ubuntu/_base/applications/office/koffice/debian/koconverter.1
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-data-trinity.README.Debian b/ubuntu/_base/applications/office/koffice/debian/koffice-data-trinity.README.Debian
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/koffice-data-trinity.README.Debian
rename to ubuntu/_base/applications/office/koffice/debian/koffice-data-trinity.README.Debian
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-data-trinity.docs b/ubuntu/_base/applications/office/koffice/debian/koffice-data-trinity.docs
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/koffice-data-trinity.docs
rename to ubuntu/_base/applications/office/koffice/debian/koffice-data-trinity.docs
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-data-trinity.install b/ubuntu/_base/applications/office/koffice/debian/koffice-data-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/koffice-data-trinity.install
rename to ubuntu/_base/applications/office/koffice/debian/koffice-data-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-data-trinity.links b/ubuntu/_base/applications/office/koffice/debian/koffice-data-trinity.links
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/koffice-data-trinity.links
rename to ubuntu/_base/applications/office/koffice/debian/koffice-data-trinity.links
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.README.Debian b/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.README.Debian
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.README.Debian
rename to ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.README.Debian
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.docs b/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.docs
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.docs
rename to ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.docs
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.install b/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.install
rename to ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.links b/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.links
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.links
rename to ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.links
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.lintian
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.lintian
rename to ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.manpages
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.manpages
rename to ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.manpages
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-trinity-dev.install b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity-dev.install
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/koffice-trinity-dev.install
rename to ubuntu/_base/applications/office/koffice/debian/koffice-trinity-dev.install
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kchart b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kchart
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kchart
rename to ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kchart
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kformula b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kformula
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kformula
rename to ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kformula
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kivio b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kivio
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kivio
rename to ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kivio
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.koffice b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.koffice
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.koffice
rename to ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.koffice
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kpresenter b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kpresenter
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kpresenter
rename to ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kpresenter
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kspread b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kspread
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kspread
rename to ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kspread
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kugar b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kugar
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kugar
rename to ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kugar
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kword b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kword
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kword
rename to ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kword
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.thesaurus b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.thesaurus
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.thesaurus
rename to ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.thesaurus
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc.install b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc.install
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/koffice-trinity-doc.install
rename to ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc.install
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-trinity.README.Debian b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity.README.Debian
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/koffice-trinity.README.Debian
rename to ubuntu/_base/applications/office/koffice/debian/koffice-trinity.README.Debian
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-trinity.docs b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity.docs
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/koffice-trinity.docs
rename to ubuntu/_base/applications/office/koffice/debian/koffice-trinity.docs
diff --git a/ubuntu/_base/applications/koffice/debian/koscript.1 b/ubuntu/_base/applications/office/koffice/debian/koscript.1
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/koscript.1
rename to ubuntu/_base/applications/office/koffice/debian/koscript.1
diff --git a/ubuntu/_base/applications/koffice/debian/koshell-trinity.docs b/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.docs
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/koshell-trinity.docs
rename to ubuntu/_base/applications/office/koffice/debian/koshell-trinity.docs
diff --git a/ubuntu/_base/applications/koffice/debian/koshell-trinity.install b/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/koshell-trinity.install
rename to ubuntu/_base/applications/office/koffice/debian/koshell-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/koshell-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.lintian
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/koshell-trinity.lintian
rename to ubuntu/_base/applications/office/koffice/debian/koshell-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/koshell-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.manpages
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/koshell-trinity.manpages
rename to ubuntu/_base/applications/office/koffice/debian/koshell-trinity.manpages
diff --git a/ubuntu/_base/applications/koffice/debian/koshell-trinity.menu b/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/koshell-trinity.menu
rename to ubuntu/_base/applications/office/koffice/debian/koshell-trinity.menu
diff --git a/ubuntu/_base/applications/koffice/debian/koshell.1 b/ubuntu/_base/applications/office/koffice/debian/koshell.1
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/koshell.1
rename to ubuntu/_base/applications/office/koffice/debian/koshell.1
diff --git a/ubuntu/_base/applications/koffice/debian/koshell.xpm b/ubuntu/_base/applications/office/koffice/debian/koshell.xpm
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/koshell.xpm
rename to ubuntu/_base/applications/office/koffice/debian/koshell.xpm
diff --git a/ubuntu/_base/applications/koffice/debian/kplato-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kplato-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kplato-trinity.install
rename to ubuntu/_base/applications/office/koffice/debian/kplato-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/kplato-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kplato-trinity.lintian
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kplato-trinity.lintian
rename to ubuntu/_base/applications/office/koffice/debian/kplato-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/kprconverter.pl.1 b/ubuntu/_base/applications/office/koffice/debian/kprconverter.pl.1
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kprconverter.pl.1
rename to ubuntu/_base/applications/office/koffice/debian/kprconverter.pl.1
diff --git a/ubuntu/_base/applications/koffice/debian/kpresenter-data-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kpresenter-data-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kpresenter-data-trinity.install
rename to ubuntu/_base/applications/office/koffice/debian/kpresenter-data-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/kpresenter-data-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kpresenter-data-trinity.lintian
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kpresenter-data-trinity.lintian
rename to ubuntu/_base/applications/office/koffice/debian/kpresenter-data-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/kpresenter-trinity.README.Debian b/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.README.Debian
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kpresenter-trinity.README.Debian
rename to ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.README.Debian
diff --git a/ubuntu/_base/applications/koffice/debian/kpresenter-trinity.docs b/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.docs
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kpresenter-trinity.docs
rename to ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.docs
diff --git a/ubuntu/_base/applications/koffice/debian/kpresenter-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kpresenter-trinity.install
rename to ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/kpresenter-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.lintian
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kpresenter-trinity.lintian
rename to ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/kpresenter-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.manpages
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kpresenter-trinity.manpages
rename to ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.manpages
diff --git a/ubuntu/_base/applications/koffice/debian/kpresenter-trinity.menu b/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kpresenter-trinity.menu
rename to ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.menu
diff --git a/ubuntu/_base/applications/koffice/debian/kpresenter-trinity.mime b/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.mime
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kpresenter-trinity.mime
rename to ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.mime
diff --git a/ubuntu/_base/applications/koffice/debian/kpresenter.1 b/ubuntu/_base/applications/office/koffice/debian/kpresenter.1
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kpresenter.1
rename to ubuntu/_base/applications/office/koffice/debian/kpresenter.1
diff --git a/ubuntu/_base/applications/koffice/debian/kpresenter.xpm b/ubuntu/_base/applications/office/koffice/debian/kpresenter.xpm
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kpresenter.xpm
rename to ubuntu/_base/applications/office/koffice/debian/kpresenter.xpm
diff --git a/ubuntu/_base/applications/koffice/debian/kspread-trinity.README.Debian b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.README.Debian
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kspread-trinity.README.Debian
rename to ubuntu/_base/applications/office/koffice/debian/kspread-trinity.README.Debian
diff --git a/ubuntu/_base/applications/koffice/debian/kspread-trinity.docs b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.docs
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kspread-trinity.docs
rename to ubuntu/_base/applications/office/koffice/debian/kspread-trinity.docs
diff --git a/ubuntu/_base/applications/koffice/debian/kspread-trinity.examples b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.examples
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kspread-trinity.examples
rename to ubuntu/_base/applications/office/koffice/debian/kspread-trinity.examples
diff --git a/ubuntu/_base/applications/koffice/debian/kspread-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kspread-trinity.install
rename to ubuntu/_base/applications/office/koffice/debian/kspread-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/kspread-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.lintian
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kspread-trinity.lintian
rename to ubuntu/_base/applications/office/koffice/debian/kspread-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/kspread-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.manpages
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kspread-trinity.manpages
rename to ubuntu/_base/applications/office/koffice/debian/kspread-trinity.manpages
diff --git a/ubuntu/_base/applications/koffice/debian/kspread-trinity.menu b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kspread-trinity.menu
rename to ubuntu/_base/applications/office/koffice/debian/kspread-trinity.menu
diff --git a/ubuntu/_base/applications/koffice/debian/kspread-trinity.mime b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.mime
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kspread-trinity.mime
rename to ubuntu/_base/applications/office/koffice/debian/kspread-trinity.mime
diff --git a/ubuntu/_base/applications/koffice/debian/kspread.1 b/ubuntu/_base/applications/office/koffice/debian/kspread.1
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kspread.1
rename to ubuntu/_base/applications/office/koffice/debian/kspread.1
diff --git a/ubuntu/_base/applications/koffice/debian/kspread.xpm b/ubuntu/_base/applications/office/koffice/debian/kspread.xpm
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kspread.xpm
rename to ubuntu/_base/applications/office/koffice/debian/kspread.xpm
diff --git a/ubuntu/_base/applications/koffice/debian/kthesaurus-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kthesaurus-trinity.install
rename to ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/kthesaurus-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.lintian
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kthesaurus-trinity.lintian
rename to ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/kthesaurus-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.manpages
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kthesaurus-trinity.manpages
rename to ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.manpages
diff --git a/ubuntu/_base/applications/koffice/debian/kthesaurus-trinity.menu b/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kthesaurus-trinity.menu
rename to ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.menu
diff --git a/ubuntu/_base/applications/koffice/debian/kthesaurus.1 b/ubuntu/_base/applications/office/koffice/debian/kthesaurus.1
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kthesaurus.1
rename to ubuntu/_base/applications/office/koffice/debian/kthesaurus.1
diff --git a/ubuntu/_base/applications/koffice/debian/kthesaurus.xpm b/ubuntu/_base/applications/office/koffice/debian/kthesaurus.xpm
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kthesaurus.xpm
rename to ubuntu/_base/applications/office/koffice/debian/kthesaurus.xpm
diff --git a/ubuntu/_base/applications/koffice/debian/kudesigner.1 b/ubuntu/_base/applications/office/koffice/debian/kudesigner.1
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kudesigner.1
rename to ubuntu/_base/applications/office/koffice/debian/kudesigner.1
diff --git a/ubuntu/_base/applications/koffice/debian/kugar-trinity.README.Debian b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.README.Debian
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kugar-trinity.README.Debian
rename to ubuntu/_base/applications/office/koffice/debian/kugar-trinity.README.Debian
diff --git a/ubuntu/_base/applications/koffice/debian/kugar-trinity.docs b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.docs
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kugar-trinity.docs
rename to ubuntu/_base/applications/office/koffice/debian/kugar-trinity.docs
diff --git a/ubuntu/_base/applications/koffice/debian/kugar-trinity.examples b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.examples
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kugar-trinity.examples
rename to ubuntu/_base/applications/office/koffice/debian/kugar-trinity.examples
diff --git a/ubuntu/_base/applications/koffice/debian/kugar-trinity.examples.README b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.examples.README
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kugar-trinity.examples.README
rename to ubuntu/_base/applications/office/koffice/debian/kugar-trinity.examples.README
diff --git a/ubuntu/_base/applications/koffice/debian/kugar-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kugar-trinity.install
rename to ubuntu/_base/applications/office/koffice/debian/kugar-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/kugar-trinity.links b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.links
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kugar-trinity.links
rename to ubuntu/_base/applications/office/koffice/debian/kugar-trinity.links
diff --git a/ubuntu/_base/applications/koffice/debian/kugar-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.lintian
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kugar-trinity.lintian
rename to ubuntu/_base/applications/office/koffice/debian/kugar-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/kugar-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.manpages
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kugar-trinity.manpages
rename to ubuntu/_base/applications/office/koffice/debian/kugar-trinity.manpages
diff --git a/ubuntu/_base/applications/koffice/debian/kugar-trinity.menu b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kugar-trinity.menu
rename to ubuntu/_base/applications/office/koffice/debian/kugar-trinity.menu
diff --git a/ubuntu/_base/applications/koffice/debian/kugar-trinity.mime b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.mime
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kugar-trinity.mime
rename to ubuntu/_base/applications/office/koffice/debian/kugar-trinity.mime
diff --git a/ubuntu/_base/applications/koffice/debian/kugar.1 b/ubuntu/_base/applications/office/koffice/debian/kugar.1
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kugar.1
rename to ubuntu/_base/applications/office/koffice/debian/kugar.1
diff --git a/ubuntu/_base/applications/koffice/debian/kugar.xpm b/ubuntu/_base/applications/office/koffice/debian/kugar.xpm
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kugar.xpm
rename to ubuntu/_base/applications/office/koffice/debian/kugar.xpm
diff --git a/ubuntu/_base/applications/koffice/debian/kword-data-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kword-data-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kword-data-trinity.install
rename to ubuntu/_base/applications/office/koffice/debian/kword-data-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/kword-data-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kword-data-trinity.lintian
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kword-data-trinity.lintian
rename to ubuntu/_base/applications/office/koffice/debian/kword-data-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/kword-trinity.README.Debian b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.README.Debian
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kword-trinity.README.Debian
rename to ubuntu/_base/applications/office/koffice/debian/kword-trinity.README.Debian
diff --git a/ubuntu/_base/applications/koffice/debian/kword-trinity.docs b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.docs
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kword-trinity.docs
rename to ubuntu/_base/applications/office/koffice/debian/kword-trinity.docs
diff --git a/ubuntu/_base/applications/koffice/debian/kword-trinity.examples b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.examples
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kword-trinity.examples
rename to ubuntu/_base/applications/office/koffice/debian/kword-trinity.examples
diff --git a/ubuntu/_base/applications/koffice/debian/kword-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kword-trinity.install
rename to ubuntu/_base/applications/office/koffice/debian/kword-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/kword-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.lintian
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kword-trinity.lintian
rename to ubuntu/_base/applications/office/koffice/debian/kword-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/kword-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.manpages
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kword-trinity.manpages
rename to ubuntu/_base/applications/office/koffice/debian/kword-trinity.manpages
diff --git a/ubuntu/_base/applications/koffice/debian/kword-trinity.menu b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kword-trinity.menu
rename to ubuntu/_base/applications/office/koffice/debian/kword-trinity.menu
diff --git a/ubuntu/_base/applications/koffice/debian/kword-trinity.mime b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.mime
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kword-trinity.mime
rename to ubuntu/_base/applications/office/koffice/debian/kword-trinity.mime
diff --git a/ubuntu/_base/applications/koffice/debian/kword.1 b/ubuntu/_base/applications/office/koffice/debian/kword.1
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kword.1
rename to ubuntu/_base/applications/office/koffice/debian/kword.1
diff --git a/ubuntu/_base/applications/koffice/debian/kword.xpm b/ubuntu/_base/applications/office/koffice/debian/kword.xpm
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/kword.xpm
rename to ubuntu/_base/applications/office/koffice/debian/kword.xpm
diff --git a/ubuntu/_base/applications/koffice/debian/not-installed.list b/ubuntu/_base/applications/office/koffice/debian/not-installed.list
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/not-installed.list
rename to ubuntu/_base/applications/office/koffice/debian/not-installed.list
diff --git a/ubuntu/_base/applications/kerberostray/debian/patches/series b/ubuntu/_base/applications/office/koffice/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/kerberostray/debian/patches/series
rename to ubuntu/_base/applications/office/koffice/debian/patches/series
diff --git a/ubuntu/_base/applications/koffice/debian/rules b/ubuntu/_base/applications/office/koffice/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/rules
rename to ubuntu/_base/applications/office/koffice/debian/rules
diff --git a/ubuntu/_base/applications/knmap/debian/source/format b/ubuntu/_base/applications/office/koffice/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/knmap/debian/source/format
rename to ubuntu/_base/applications/office/koffice/debian/source/format
diff --git a/ubuntu/_base/applications/knmap/debian/source/options b/ubuntu/_base/applications/office/koffice/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/knmap/debian/source/options
rename to ubuntu/_base/applications/office/koffice/debian/source/options
diff --git a/ubuntu/_base/applications/knights/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/kpilot/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/knights/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/office/kpilot/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/knights/debian/cdbs/versions.pl b/ubuntu/_base/applications/office/kpilot/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/knights/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/office/kpilot/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kpilot/debian/changelog b/ubuntu/_base/applications/office/kpilot/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kpilot/debian/changelog
rename to ubuntu/_base/applications/office/kpilot/debian/changelog
diff --git a/ubuntu/_base/applications/knowit/debian/compat b/ubuntu/_base/applications/office/kpilot/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/knowit/debian/compat
rename to ubuntu/_base/applications/office/kpilot/debian/compat
diff --git a/ubuntu/_base/applications/kpilot/debian/control b/ubuntu/_base/applications/office/kpilot/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kpilot/debian/control
rename to ubuntu/_base/applications/office/kpilot/debian/control
diff --git a/ubuntu/_base/applications/kpilot/debian/copyright b/ubuntu/_base/applications/office/kpilot/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kpilot/debian/copyright
rename to ubuntu/_base/applications/office/kpilot/debian/copyright
diff --git a/ubuntu/_base/applications/kpilot/debian/kpilot-trinity.install b/ubuntu/_base/applications/office/kpilot/debian/kpilot-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/kpilot/debian/kpilot-trinity.install
rename to ubuntu/_base/applications/office/kpilot/debian/kpilot-trinity.install
diff --git a/ubuntu/_base/applications/kpilot/debian/rules b/ubuntu/_base/applications/office/kpilot/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kpilot/debian/rules
rename to ubuntu/_base/applications/office/kpilot/debian/rules
diff --git a/ubuntu/_base/applications/knowit/debian/source/format b/ubuntu/_base/applications/office/kpilot/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/knowit/debian/source/format
rename to ubuntu/_base/applications/office/kpilot/debian/source/format
diff --git a/ubuntu/_base/applications/knowit/debian/source/options b/ubuntu/_base/applications/office/kpilot/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/knowit/debian/source/options
rename to ubuntu/_base/applications/office/kpilot/debian/source/options
diff --git a/ubuntu/_base/applications/knmap/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/tellico/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/knmap/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/office/tellico/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/knmap/debian/cdbs/versions.pl b/ubuntu/_base/applications/office/tellico/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/knmap/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/office/tellico/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/tellico/debian/changelog b/ubuntu/_base/applications/office/tellico/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/tellico/debian/changelog
rename to ubuntu/_base/applications/office/tellico/debian/changelog
diff --git a/ubuntu/_base/applications/knutclient/debian/compat b/ubuntu/_base/applications/office/tellico/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/knutclient/debian/compat
rename to ubuntu/_base/applications/office/tellico/debian/compat
diff --git a/ubuntu/_base/applications/tellico/debian/control b/ubuntu/_base/applications/office/tellico/debian/control
similarity index 100%
rename from ubuntu/_base/applications/tellico/debian/control
rename to ubuntu/_base/applications/office/tellico/debian/control
diff --git a/ubuntu/_base/applications/tellico/debian/copyright b/ubuntu/_base/applications/office/tellico/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/tellico/debian/copyright
rename to ubuntu/_base/applications/office/tellico/debian/copyright
diff --git a/ubuntu/_base/applications/tellico/debian/menu b/ubuntu/_base/applications/office/tellico/debian/menu
similarity index 100%
rename from ubuntu/_base/applications/tellico/debian/menu
rename to ubuntu/_base/applications/office/tellico/debian/menu
diff --git a/ubuntu/_base/applications/tellico/debian/rules b/ubuntu/_base/applications/office/tellico/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/tellico/debian/rules
rename to ubuntu/_base/applications/office/tellico/debian/rules
diff --git a/ubuntu/_base/applications/knutclient/debian/source/format b/ubuntu/_base/applications/office/tellico/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/knutclient/debian/source/format
rename to ubuntu/_base/applications/office/tellico/debian/source/format
diff --git a/ubuntu/_base/applications/knutclient/debian/source/options b/ubuntu/_base/applications/office/tellico/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/knutclient/debian/source/options
rename to ubuntu/_base/applications/office/tellico/debian/source/options
diff --git a/ubuntu/_base/applications/tellico/debian/tellico-data-trinity.install b/ubuntu/_base/applications/office/tellico/debian/tellico-data-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/tellico/debian/tellico-data-trinity.install
rename to ubuntu/_base/applications/office/tellico/debian/tellico-data-trinity.install
diff --git a/ubuntu/_base/applications/tellico/debian/tellico-scripts-trinity.install b/ubuntu/_base/applications/office/tellico/debian/tellico-scripts-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/tellico/debian/tellico-scripts-trinity.install
rename to ubuntu/_base/applications/office/tellico/debian/tellico-scripts-trinity.install
diff --git a/ubuntu/_base/applications/tellico/debian/tellico-trinity.install b/ubuntu/_base/applications/office/tellico/debian/tellico-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/tellico/debian/tellico-trinity.install
rename to ubuntu/_base/applications/office/tellico/debian/tellico-trinity.install
diff --git a/ubuntu/_base/applications/tellico/debian/tellico-trinity.manpages b/ubuntu/_base/applications/office/tellico/debian/tellico-trinity.manpages
similarity index 100%
rename from ubuntu/_base/applications/tellico/debian/tellico-trinity.manpages
rename to ubuntu/_base/applications/office/tellico/debian/tellico-trinity.manpages
diff --git a/ubuntu/_base/applications/tellico/debian/tellico.1x b/ubuntu/_base/applications/office/tellico/debian/tellico.1x
similarity index 100%
rename from ubuntu/_base/applications/tellico/debian/tellico.1x
rename to ubuntu/_base/applications/office/tellico/debian/tellico.1x
diff --git a/ubuntu/_base/applications/tellico/debian/tellico.xpm b/ubuntu/_base/applications/office/tellico/debian/tellico.xpm
similarity index 100%
rename from ubuntu/_base/applications/tellico/debian/tellico.xpm
rename to ubuntu/_base/applications/office/tellico/debian/tellico.xpm
diff --git a/ubuntu/_base/applications/tellico/debian/watch b/ubuntu/_base/applications/office/tellico/debian/watch
similarity index 100%
rename from ubuntu/_base/applications/tellico/debian/watch
rename to ubuntu/_base/applications/office/tellico/debian/watch
diff --git a/ubuntu/_base/applications/knowit/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/kdpkg/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/knowit/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/settings/kdpkg/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/knowit/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/kdpkg/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/knowit/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/settings/kdpkg/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kdpkg/debian/changelog b/ubuntu/_base/applications/settings/kdpkg/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kdpkg/debian/changelog
rename to ubuntu/_base/applications/settings/kdpkg/debian/changelog
diff --git a/ubuntu/_base/applications/koffice-i18n/debian/compat b/ubuntu/_base/applications/settings/kdpkg/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/koffice-i18n/debian/compat
rename to ubuntu/_base/applications/settings/kdpkg/debian/compat
diff --git a/ubuntu/_base/applications/kdpkg/debian/control b/ubuntu/_base/applications/settings/kdpkg/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kdpkg/debian/control
rename to ubuntu/_base/applications/settings/kdpkg/debian/control
diff --git a/ubuntu/_base/applications/kdpkg/debian/copyright b/ubuntu/_base/applications/settings/kdpkg/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kdpkg/debian/copyright
rename to ubuntu/_base/applications/settings/kdpkg/debian/copyright
diff --git a/ubuntu/_base/applications/kdpkg/debian/docs b/ubuntu/_base/applications/settings/kdpkg/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/kdpkg/debian/docs
rename to ubuntu/_base/applications/settings/kdpkg/debian/docs
diff --git a/ubuntu/_base/applications/kftpgrabber/debian/patches/series b/ubuntu/_base/applications/settings/kdpkg/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/kftpgrabber/debian/patches/series
rename to ubuntu/_base/applications/settings/kdpkg/debian/patches/series
diff --git a/ubuntu/_base/applications/kerberostray/debian/rules b/ubuntu/_base/applications/settings/kdpkg/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kerberostray/debian/rules
rename to ubuntu/_base/applications/settings/kdpkg/debian/rules
diff --git a/ubuntu/_base/applications/koffice-i18n/debian/source/format b/ubuntu/_base/applications/settings/kdpkg/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/koffice-i18n/debian/source/format
rename to ubuntu/_base/applications/settings/kdpkg/debian/source/format
diff --git a/ubuntu/_base/applications/koffice-i18n/debian/source/options b/ubuntu/_base/applications/settings/kdpkg/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/koffice-i18n/debian/source/options
rename to ubuntu/_base/applications/settings/kdpkg/debian/source/options
diff --git a/ubuntu/_base/applications/knutclient/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/kima/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/knutclient/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/settings/kima/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/knutclient/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/kima/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/knutclient/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/settings/kima/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kima/debian/changelog b/ubuntu/_base/applications/settings/kima/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kima/debian/changelog
rename to ubuntu/_base/applications/settings/kima/debian/changelog
diff --git a/ubuntu/_base/applications/koffice/debian/compat b/ubuntu/_base/applications/settings/kima/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/compat
rename to ubuntu/_base/applications/settings/kima/debian/compat
diff --git a/ubuntu/_base/applications/kima/debian/control b/ubuntu/_base/applications/settings/kima/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kima/debian/control
rename to ubuntu/_base/applications/settings/kima/debian/control
diff --git a/ubuntu/_base/applications/kima/debian/copyright b/ubuntu/_base/applications/settings/kima/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kima/debian/copyright
rename to ubuntu/_base/applications/settings/kima/debian/copyright
diff --git a/ubuntu/_base/applications/kima/debian/docs b/ubuntu/_base/applications/settings/kima/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/kima/debian/docs
rename to ubuntu/_base/applications/settings/kima/debian/docs
diff --git a/ubuntu/_base/applications/kima/debian/rules b/ubuntu/_base/applications/settings/kima/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kima/debian/rules
rename to ubuntu/_base/applications/settings/kima/debian/rules
diff --git a/ubuntu/_base/applications/koffice/debian/source/format b/ubuntu/_base/applications/settings/kima/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/source/format
rename to ubuntu/_base/applications/settings/kima/debian/source/format
diff --git a/ubuntu/_base/applications/koffice/debian/source/options b/ubuntu/_base/applications/settings/kima/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/source/options
rename to ubuntu/_base/applications/settings/kima/debian/source/options
diff --git a/ubuntu/_base/applications/koffice/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/kiosktool/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/settings/kiosktool/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/koffice/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/kiosktool/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/settings/kiosktool/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kiosktool/debian/changelog b/ubuntu/_base/applications/settings/kiosktool/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kiosktool/debian/changelog
rename to ubuntu/_base/applications/settings/kiosktool/debian/changelog
diff --git a/ubuntu/_base/applications/kompose/debian/compat b/ubuntu/_base/applications/settings/kiosktool/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kompose/debian/compat
rename to ubuntu/_base/applications/settings/kiosktool/debian/compat
diff --git a/ubuntu/_base/applications/kiosktool/debian/control b/ubuntu/_base/applications/settings/kiosktool/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kiosktool/debian/control
rename to ubuntu/_base/applications/settings/kiosktool/debian/control
diff --git a/ubuntu/_base/applications/kiosktool/debian/copyright b/ubuntu/_base/applications/settings/kiosktool/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kiosktool/debian/copyright
rename to ubuntu/_base/applications/settings/kiosktool/debian/copyright
diff --git a/ubuntu/_base/applications/ktechlab/debian/docs b/ubuntu/_base/applications/settings/kiosktool/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/ktechlab/debian/docs
rename to ubuntu/_base/applications/settings/kiosktool/debian/docs
diff --git a/ubuntu/_base/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff b/ubuntu/_base/applications/settings/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
similarity index 100%
rename from ubuntu/_base/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
rename to ubuntu/_base/applications/settings/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
diff --git a/ubuntu/_base/applications/kiosktool/debian/patches/series b/ubuntu/_base/applications/settings/kiosktool/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/kiosktool/debian/patches/series
rename to ubuntu/_base/applications/settings/kiosktool/debian/patches/series
diff --git a/ubuntu/_base/applications/kpicosim/debian/rules b/ubuntu/_base/applications/settings/kiosktool/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kpicosim/debian/rules
rename to ubuntu/_base/applications/settings/kiosktool/debian/rules
diff --git a/ubuntu/_base/applications/kompose/debian/source/format b/ubuntu/_base/applications/settings/kiosktool/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kompose/debian/source/format
rename to ubuntu/_base/applications/settings/kiosktool/debian/source/format
diff --git a/ubuntu/_base/applications/kompose/debian/source/options b/ubuntu/_base/applications/settings/kiosktool/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kompose/debian/source/options
rename to ubuntu/_base/applications/settings/kiosktool/debian/source/options
diff --git a/ubuntu/_base/applications/kompose/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/kkbswitch/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kompose/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/settings/kkbswitch/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kompose/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/kkbswitch/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kompose/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/settings/kkbswitch/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kkbswitch/debian/changelog b/ubuntu/_base/applications/settings/kkbswitch/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kkbswitch/debian/changelog
rename to ubuntu/_base/applications/settings/kkbswitch/debian/changelog
diff --git a/ubuntu/_base/applications/konversation/debian/compat b/ubuntu/_base/applications/settings/kkbswitch/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/konversation/debian/compat
rename to ubuntu/_base/applications/settings/kkbswitch/debian/compat
diff --git a/ubuntu/_base/applications/kkbswitch/debian/control b/ubuntu/_base/applications/settings/kkbswitch/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kkbswitch/debian/control
rename to ubuntu/_base/applications/settings/kkbswitch/debian/control
diff --git a/ubuntu/_base/applications/kkbswitch/debian/copyright b/ubuntu/_base/applications/settings/kkbswitch/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kkbswitch/debian/copyright
rename to ubuntu/_base/applications/settings/kkbswitch/debian/copyright
diff --git a/ubuntu/_base/applications/kkbswitch/debian/kkbswitch-trinity.dirs b/ubuntu/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.dirs
similarity index 100%
rename from ubuntu/_base/applications/kkbswitch/debian/kkbswitch-trinity.dirs
rename to ubuntu/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.dirs
diff --git a/ubuntu/_base/applications/kkbswitch/debian/kkbswitch-trinity.docs b/ubuntu/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.docs
similarity index 100%
rename from ubuntu/_base/applications/kkbswitch/debian/kkbswitch-trinity.docs
rename to ubuntu/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.docs
diff --git a/ubuntu/_base/applications/kkbswitch/debian/kkbswitch-trinity.install b/ubuntu/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/kkbswitch/debian/kkbswitch-trinity.install
rename to ubuntu/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.install
diff --git a/ubuntu/_base/applications/kkbswitch/debian/kkbswitch-trinity.menu b/ubuntu/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/kkbswitch/debian/kkbswitch-trinity.menu
rename to ubuntu/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.menu
diff --git a/ubuntu/_base/applications/kkbswitch/debian/rules b/ubuntu/_base/applications/settings/kkbswitch/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kkbswitch/debian/rules
rename to ubuntu/_base/applications/settings/kkbswitch/debian/rules
diff --git a/ubuntu/_base/applications/konversation/debian/source/format b/ubuntu/_base/applications/settings/kkbswitch/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/konversation/debian/source/format
rename to ubuntu/_base/applications/settings/kkbswitch/debian/source/format
diff --git a/ubuntu/_base/applications/konversation/debian/source/options b/ubuntu/_base/applications/settings/kkbswitch/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/konversation/debian/source/options
rename to ubuntu/_base/applications/settings/kkbswitch/debian/source/options
diff --git a/ubuntu/_base/applications/kkbswitch/debian/xkb-data-extra-trinity.dirs b/ubuntu/_base/applications/settings/kkbswitch/debian/xkb-data-extra-trinity.dirs
similarity index 100%
rename from ubuntu/_base/applications/kkbswitch/debian/xkb-data-extra-trinity.dirs
rename to ubuntu/_base/applications/settings/kkbswitch/debian/xkb-data-extra-trinity.dirs
diff --git a/ubuntu/_base/applications/kkbswitch/debian/xkb-data-extra-trinity.install b/ubuntu/_base/applications/settings/kkbswitch/debian/xkb-data-extra-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/kkbswitch/debian/xkb-data-extra-trinity.install
rename to ubuntu/_base/applications/settings/kkbswitch/debian/xkb-data-extra-trinity.install
diff --git a/ubuntu/_base/applications/konversation/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/klcddimmer/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/konversation/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/settings/klcddimmer/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/konversation/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/klcddimmer/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/konversation/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/settings/klcddimmer/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/klcddimmer/debian/changelog b/ubuntu/_base/applications/settings/klcddimmer/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/klcddimmer/debian/changelog
rename to ubuntu/_base/applications/settings/klcddimmer/debian/changelog
diff --git a/ubuntu/_base/applications/kooldock/debian/compat b/ubuntu/_base/applications/settings/klcddimmer/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kooldock/debian/compat
rename to ubuntu/_base/applications/settings/klcddimmer/debian/compat
diff --git a/ubuntu/_base/applications/klcddimmer/debian/control b/ubuntu/_base/applications/settings/klcddimmer/debian/control
similarity index 100%
rename from ubuntu/_base/applications/klcddimmer/debian/control
rename to ubuntu/_base/applications/settings/klcddimmer/debian/control
diff --git a/ubuntu/_base/applications/klcddimmer/debian/copyright b/ubuntu/_base/applications/settings/klcddimmer/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/klcddimmer/debian/copyright
rename to ubuntu/_base/applications/settings/klcddimmer/debian/copyright
diff --git a/ubuntu/_base/applications/klcddimmer/debian/docs b/ubuntu/_base/applications/settings/klcddimmer/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/klcddimmer/debian/docs
rename to ubuntu/_base/applications/settings/klcddimmer/debian/docs
diff --git a/ubuntu/_base/applications/kplayer/debian/rules b/ubuntu/_base/applications/settings/klcddimmer/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kplayer/debian/rules
rename to ubuntu/_base/applications/settings/klcddimmer/debian/rules
diff --git a/ubuntu/_base/applications/kooldock/debian/source/format b/ubuntu/_base/applications/settings/klcddimmer/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kooldock/debian/source/format
rename to ubuntu/_base/applications/settings/klcddimmer/debian/source/format
diff --git a/ubuntu/_base/applications/kooldock/debian/source/options b/ubuntu/_base/applications/settings/klcddimmer/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kooldock/debian/source/options
rename to ubuntu/_base/applications/settings/klcddimmer/debian/source/options
diff --git a/ubuntu/_base/applications/kooldock/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/kmyfirewall/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kooldock/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/settings/kmyfirewall/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kooldock/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/kmyfirewall/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kooldock/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/settings/kmyfirewall/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/changelog b/ubuntu/_base/applications/settings/kmyfirewall/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kmyfirewall/debian/changelog
rename to ubuntu/_base/applications/settings/kmyfirewall/debian/changelog
diff --git a/ubuntu/_base/applications/kopete-otr/debian/compat b/ubuntu/_base/applications/settings/kmyfirewall/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kopete-otr/debian/compat
rename to ubuntu/_base/applications/settings/kmyfirewall/debian/compat
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/control b/ubuntu/_base/applications/settings/kmyfirewall/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kmyfirewall/debian/control
rename to ubuntu/_base/applications/settings/kmyfirewall/debian/control
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/copyright b/ubuntu/_base/applications/settings/kmyfirewall/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kmyfirewall/debian/copyright
rename to ubuntu/_base/applications/settings/kmyfirewall/debian/copyright
diff --git a/ubuntu/_base/applications/koffice-i18n/debian/debiandirs b/ubuntu/_base/applications/settings/kmyfirewall/debian/debiandirs
similarity index 100%
rename from ubuntu/_base/applications/koffice-i18n/debian/debiandirs
rename to ubuntu/_base/applications/settings/kmyfirewall/debian/debiandirs
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/dirs b/ubuntu/_base/applications/settings/kmyfirewall/debian/dirs
similarity index 100%
rename from ubuntu/_base/applications/kmyfirewall/debian/dirs
rename to ubuntu/_base/applications/settings/kmyfirewall/debian/dirs
diff --git a/ubuntu/_base/applications/piklab/debian/docs b/ubuntu/_base/applications/settings/kmyfirewall/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/piklab/debian/docs
rename to ubuntu/_base/applications/settings/kmyfirewall/debian/docs
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/install b/ubuntu/_base/applications/settings/kmyfirewall/debian/install
similarity index 100%
rename from ubuntu/_base/applications/kmyfirewall/debian/install
rename to ubuntu/_base/applications/settings/kmyfirewall/debian/install
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/kmfinstallerplugin.desktop b/ubuntu/_base/applications/settings/kmyfirewall/debian/kmfinstallerplugin.desktop
similarity index 100%
rename from ubuntu/_base/applications/kmyfirewall/debian/kmfinstallerplugin.desktop
rename to ubuntu/_base/applications/settings/kmyfirewall/debian/kmfinstallerplugin.desktop
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/kmyfirewall.1 b/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.1
similarity index 100%
rename from ubuntu/_base/applications/kmyfirewall/debian/kmyfirewall.1
rename to ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.1
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/kmyfirewall.desktop b/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.desktop
similarity index 100%
rename from ubuntu/_base/applications/kmyfirewall/debian/kmyfirewall.desktop
rename to ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.desktop
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/kmyfirewall.xpm b/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.xpm
similarity index 100%
rename from ubuntu/_base/applications/kmyfirewall/debian/kmyfirewall.xpm
rename to ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.xpm
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/manpages b/ubuntu/_base/applications/settings/kmyfirewall/debian/manpages
similarity index 100%
rename from ubuntu/_base/applications/kmyfirewall/debian/manpages
rename to ubuntu/_base/applications/settings/kmyfirewall/debian/manpages
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/menu b/ubuntu/_base/applications/settings/kmyfirewall/debian/menu
similarity index 100%
rename from ubuntu/_base/applications/kmyfirewall/debian/menu
rename to ubuntu/_base/applications/settings/kmyfirewall/debian/menu
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/rules b/ubuntu/_base/applications/settings/kmyfirewall/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kmyfirewall/debian/rules
rename to ubuntu/_base/applications/settings/kmyfirewall/debian/rules
diff --git a/ubuntu/_base/applications/kopete-otr/debian/source/format b/ubuntu/_base/applications/settings/kmyfirewall/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kopete-otr/debian/source/format
rename to ubuntu/_base/applications/settings/kmyfirewall/debian/source/format
diff --git a/ubuntu/_base/applications/kopete-otr/debian/source/options b/ubuntu/_base/applications/settings/kmyfirewall/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kopete-otr/debian/source/options
rename to ubuntu/_base/applications/settings/kmyfirewall/debian/source/options
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/watch b/ubuntu/_base/applications/settings/kmyfirewall/debian/watch
similarity index 100%
rename from ubuntu/_base/applications/kmyfirewall/debian/watch
rename to ubuntu/_base/applications/settings/kmyfirewall/debian/watch
diff --git a/ubuntu/_base/applications/knetworkmanager8/debian/README.source b/ubuntu/_base/applications/settings/knetworkmanager8/debian/README.source
similarity index 100%
rename from ubuntu/_base/applications/knetworkmanager8/debian/README.source
rename to ubuntu/_base/applications/settings/knetworkmanager8/debian/README.source
diff --git a/ubuntu/_base/applications/kopete-otr/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/knetworkmanager8/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kopete-otr/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/settings/knetworkmanager8/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kopete-otr/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/knetworkmanager8/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kopete-otr/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/settings/knetworkmanager8/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/knetworkmanager8/debian/changelog b/ubuntu/_base/applications/settings/knetworkmanager8/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/knetworkmanager8/debian/changelog
rename to ubuntu/_base/applications/settings/knetworkmanager8/debian/changelog
diff --git a/ubuntu/_base/applications/kpicosim/debian/compat b/ubuntu/_base/applications/settings/knetworkmanager8/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kpicosim/debian/compat
rename to ubuntu/_base/applications/settings/knetworkmanager8/debian/compat
diff --git a/ubuntu/_base/applications/knetworkmanager8/debian/control b/ubuntu/_base/applications/settings/knetworkmanager8/debian/control
similarity index 100%
rename from ubuntu/_base/applications/knetworkmanager8/debian/control
rename to ubuntu/_base/applications/settings/knetworkmanager8/debian/control
diff --git a/ubuntu/_base/applications/knetworkmanager8/debian/copyright b/ubuntu/_base/applications/settings/knetworkmanager8/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/knetworkmanager8/debian/copyright
rename to ubuntu/_base/applications/settings/knetworkmanager8/debian/copyright
diff --git a/ubuntu/_base/applications/knetworkmanager8/debian/knetworkmanager.1 b/ubuntu/_base/applications/settings/knetworkmanager8/debian/knetworkmanager.1
similarity index 100%
rename from ubuntu/_base/applications/knetworkmanager8/debian/knetworkmanager.1
rename to ubuntu/_base/applications/settings/knetworkmanager8/debian/knetworkmanager.1
diff --git a/ubuntu/_base/applications/knetworkmanager8/debian/manpages b/ubuntu/_base/applications/settings/knetworkmanager8/debian/manpages
similarity index 100%
rename from ubuntu/_base/applications/knetworkmanager8/debian/manpages
rename to ubuntu/_base/applications/settings/knetworkmanager8/debian/manpages
diff --git a/ubuntu/_base/applications/knetworkmanager8/debian/menu b/ubuntu/_base/applications/settings/knetworkmanager8/debian/menu
similarity index 100%
rename from ubuntu/_base/applications/knetworkmanager8/debian/menu
rename to ubuntu/_base/applications/settings/knetworkmanager8/debian/menu
diff --git a/ubuntu/_base/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides b/ubuntu/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
similarity index 100%
rename from ubuntu/_base/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
rename to ubuntu/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
diff --git a/ubuntu/_base/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst b/ubuntu/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.postinst
similarity index 100%
rename from ubuntu/_base/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst
rename to ubuntu/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.postinst
diff --git a/ubuntu/_base/applications/kgtk-qt3/debian/patches/series b/ubuntu/_base/applications/settings/knetworkmanager8/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/kgtk-qt3/debian/patches/series
rename to ubuntu/_base/applications/settings/knetworkmanager8/debian/patches/series
diff --git a/ubuntu/_base/applications/knetworkmanager8/debian/rules b/ubuntu/_base/applications/settings/knetworkmanager8/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/knetworkmanager8/debian/rules
rename to ubuntu/_base/applications/settings/knetworkmanager8/debian/rules
diff --git a/ubuntu/_base/applications/kpicosim/debian/source/format b/ubuntu/_base/applications/settings/knetworkmanager8/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kpicosim/debian/source/format
rename to ubuntu/_base/applications/settings/knetworkmanager8/debian/source/format
diff --git a/ubuntu/_base/applications/kpicosim/debian/source/options b/ubuntu/_base/applications/settings/knetworkmanager8/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kpicosim/debian/source/options
rename to ubuntu/_base/applications/settings/knetworkmanager8/debian/source/options
diff --git a/ubuntu/_base/applications/knetworkmanager8/debian/watch b/ubuntu/_base/applications/settings/knetworkmanager8/debian/watch
similarity index 100%
rename from ubuntu/_base/applications/knetworkmanager8/debian/watch
rename to ubuntu/_base/applications/settings/knetworkmanager8/debian/watch
diff --git a/ubuntu/_base/applications/kftpgrabber/debian/README.Debian b/ubuntu/_base/applications/settings/tde-guidance/debian/README.Debian
similarity index 100%
rename from ubuntu/_base/applications/kftpgrabber/debian/README.Debian
rename to ubuntu/_base/applications/settings/tde-guidance/debian/README.Debian
diff --git a/ubuntu/_base/applications/tde-guidance/debian/changelog b/ubuntu/_base/applications/settings/tde-guidance/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/tde-guidance/debian/changelog
rename to ubuntu/_base/applications/settings/tde-guidance/debian/changelog
diff --git a/ubuntu/_base/applications/kpilot/debian/compat b/ubuntu/_base/applications/settings/tde-guidance/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kpilot/debian/compat
rename to ubuntu/_base/applications/settings/tde-guidance/debian/compat
diff --git a/ubuntu/_base/applications/tde-guidance/debian/control b/ubuntu/_base/applications/settings/tde-guidance/debian/control
similarity index 100%
rename from ubuntu/_base/applications/tde-guidance/debian/control
rename to ubuntu/_base/applications/settings/tde-guidance/debian/control
diff --git a/ubuntu/_base/applications/tde-guidance/debian/copyright b/ubuntu/_base/applications/settings/tde-guidance/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/tde-guidance/debian/copyright
rename to ubuntu/_base/applications/settings/tde-guidance/debian/copyright
diff --git a/ubuntu/_base/applications/tde-guidance/debian/docs b/ubuntu/_base/applications/settings/tde-guidance/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/tde-guidance/debian/docs
rename to ubuntu/_base/applications/settings/tde-guidance/debian/docs
diff --git a/ubuntu/_base/applications/tde-guidance/debian/guidance-backends-trinity.install b/ubuntu/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/tde-guidance/debian/guidance-backends-trinity.install
rename to ubuntu/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.install
diff --git a/ubuntu/_base/applications/tde-guidance/debian/mountconfig-trinity.1 b/ubuntu/_base/applications/settings/tde-guidance/debian/mountconfig-trinity.1
similarity index 100%
rename from ubuntu/_base/applications/tde-guidance/debian/mountconfig-trinity.1
rename to ubuntu/_base/applications/settings/tde-guidance/debian/mountconfig-trinity.1
diff --git a/ubuntu/_base/applications/klamav/debian/patches/series b/ubuntu/_base/applications/settings/tde-guidance/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/klamav/debian/patches/series
rename to ubuntu/_base/applications/settings/tde-guidance/debian/patches/series
diff --git a/ubuntu/_base/applications/tde-guidance/debian/pycompat b/ubuntu/_base/applications/settings/tde-guidance/debian/pycompat
similarity index 100%
rename from ubuntu/_base/applications/tde-guidance/debian/pycompat
rename to ubuntu/_base/applications/settings/tde-guidance/debian/pycompat
diff --git a/ubuntu/_base/applications/tde-guidance/debian/python-distutils-jaunty.mk b/ubuntu/_base/applications/settings/tde-guidance/debian/python-distutils-jaunty.mk
similarity index 100%
rename from ubuntu/_base/applications/tde-guidance/debian/python-distutils-jaunty.mk
rename to ubuntu/_base/applications/settings/tde-guidance/debian/python-distutils-jaunty.mk
diff --git a/ubuntu/_base/applications/tde-guidance/debian/pyversions b/ubuntu/_base/applications/settings/tde-guidance/debian/pyversions
similarity index 100%
rename from ubuntu/_base/applications/tde-guidance/debian/pyversions
rename to ubuntu/_base/applications/settings/tde-guidance/debian/pyversions
diff --git a/ubuntu/_base/applications/tde-guidance/debian/rules b/ubuntu/_base/applications/settings/tde-guidance/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/tde-guidance/debian/rules
rename to ubuntu/_base/applications/settings/tde-guidance/debian/rules
diff --git a/ubuntu/_base/applications/tde-guidance/debian/serviceconfig-trinity.1 b/ubuntu/_base/applications/settings/tde-guidance/debian/serviceconfig-trinity.1
similarity index 100%
rename from ubuntu/_base/applications/tde-guidance/debian/serviceconfig-trinity.1
rename to ubuntu/_base/applications/settings/tde-guidance/debian/serviceconfig-trinity.1
diff --git a/ubuntu/_base/applications/kpilot/debian/source/format b/ubuntu/_base/applications/settings/tde-guidance/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kpilot/debian/source/format
rename to ubuntu/_base/applications/settings/tde-guidance/debian/source/format
diff --git a/ubuntu/_base/applications/kpilot/debian/source/options b/ubuntu/_base/applications/settings/tde-guidance/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kpilot/debian/source/options
rename to ubuntu/_base/applications/settings/tde-guidance/debian/source/options
diff --git a/ubuntu/_base/applications/tde-guidance/debian/tde-guidance-trinity.install b/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/tde-guidance/debian/tde-guidance-trinity.install
rename to ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.install
diff --git a/ubuntu/_base/applications/tde-guidance/debian/tde-guidance-trinity.lintian-overrides b/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.lintian-overrides
similarity index 100%
rename from ubuntu/_base/applications/tde-guidance/debian/tde-guidance-trinity.lintian-overrides
rename to ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.lintian-overrides
diff --git a/ubuntu/_base/applications/tde-guidance/debian/tde-guidance-trinity.postinst b/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.postinst
similarity index 100%
rename from ubuntu/_base/applications/tde-guidance/debian/tde-guidance-trinity.postinst
rename to ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.postinst
diff --git a/ubuntu/_base/applications/tde-guidance/debian/userconfig-trinity.1 b/ubuntu/_base/applications/settings/tde-guidance/debian/userconfig-trinity.1
similarity index 100%
rename from ubuntu/_base/applications/tde-guidance/debian/userconfig-trinity.1
rename to ubuntu/_base/applications/settings/tde-guidance/debian/userconfig-trinity.1
diff --git a/ubuntu/_base/applications/tde-guidance/debian/watch b/ubuntu/_base/applications/settings/tde-guidance/debian/watch
similarity index 100%
rename from ubuntu/_base/applications/tde-guidance/debian/watch
rename to ubuntu/_base/applications/settings/tde-guidance/debian/watch
diff --git a/ubuntu/_base/applications/kpicosim/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/tde-systemsettings/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kpicosim/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/settings/tde-systemsettings/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kpicosim/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/tde-systemsettings/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kpicosim/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/settings/tde-systemsettings/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/tde-systemsettings/debian/changelog b/ubuntu/_base/applications/settings/tde-systemsettings/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/tde-systemsettings/debian/changelog
rename to ubuntu/_base/applications/settings/tde-systemsettings/debian/changelog
diff --git a/ubuntu/_base/applications/kplayer/debian/compat b/ubuntu/_base/applications/settings/tde-systemsettings/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kplayer/debian/compat
rename to ubuntu/_base/applications/settings/tde-systemsettings/debian/compat
diff --git a/ubuntu/_base/applications/tde-systemsettings/debian/control b/ubuntu/_base/applications/settings/tde-systemsettings/debian/control
similarity index 100%
rename from ubuntu/_base/applications/tde-systemsettings/debian/control
rename to ubuntu/_base/applications/settings/tde-systemsettings/debian/control
diff --git a/ubuntu/_base/applications/tde-systemsettings/debian/copyright b/ubuntu/_base/applications/settings/tde-systemsettings/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/tde-systemsettings/debian/copyright
rename to ubuntu/_base/applications/settings/tde-systemsettings/debian/copyright
diff --git a/ubuntu/_base/applications/tde-systemsettings/debian/docs b/ubuntu/_base/applications/settings/tde-systemsettings/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/tde-systemsettings/debian/docs
rename to ubuntu/_base/applications/settings/tde-systemsettings/debian/docs
diff --git a/ubuntu/_base/applications/kmplayer/debian/patches/series b/ubuntu/_base/applications/settings/tde-systemsettings/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/kmplayer/debian/patches/series
rename to ubuntu/_base/applications/settings/tde-systemsettings/debian/patches/series
diff --git a/ubuntu/_base/applications/krename/debian/rules b/ubuntu/_base/applications/settings/tde-systemsettings/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/krename/debian/rules
rename to ubuntu/_base/applications/settings/tde-systemsettings/debian/rules
diff --git a/ubuntu/_base/applications/kplayer/debian/source/format b/ubuntu/_base/applications/settings/tde-systemsettings/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kplayer/debian/source/format
rename to ubuntu/_base/applications/settings/tde-systemsettings/debian/source/format
diff --git a/ubuntu/_base/applications/kplayer/debian/source/options b/ubuntu/_base/applications/settings/tde-systemsettings/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kplayer/debian/source/options
rename to ubuntu/_base/applications/settings/tde-systemsettings/debian/source/options
diff --git a/ubuntu/_base/applications/tde-systemsettings/debian/tde-systemsettings-trinity.preinst b/ubuntu/_base/applications/settings/tde-systemsettings/debian/tde-systemsettings-trinity.preinst
similarity index 100%
rename from ubuntu/_base/applications/tde-systemsettings/debian/tde-systemsettings-trinity.preinst
rename to ubuntu/_base/applications/settings/tde-systemsettings/debian/tde-systemsettings-trinity.preinst
diff --git a/ubuntu/_base/applications/kpilot/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kpilot/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/settings/tdenetworkmanager/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kpilot/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kpilot/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/settings/tdenetworkmanager/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/tdenetworkmanager/debian/changelog b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/tdenetworkmanager/debian/changelog
rename to ubuntu/_base/applications/settings/tdenetworkmanager/debian/changelog
diff --git a/ubuntu/_base/applications/kpowersave/debian/compat b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kpowersave/debian/compat
rename to ubuntu/_base/applications/settings/tdenetworkmanager/debian/compat
diff --git a/ubuntu/_base/applications/tdenetworkmanager/debian/control b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/control
similarity index 100%
rename from ubuntu/_base/applications/tdenetworkmanager/debian/control
rename to ubuntu/_base/applications/settings/tdenetworkmanager/debian/control
diff --git a/ubuntu/_base/applications/tdenetworkmanager/debian/copyright b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/tdenetworkmanager/debian/copyright
rename to ubuntu/_base/applications/settings/tdenetworkmanager/debian/copyright
diff --git a/ubuntu/_base/applications/tdenetworkmanager/debian/menu b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/menu
similarity index 100%
rename from ubuntu/_base/applications/tdenetworkmanager/debian/menu
rename to ubuntu/_base/applications/settings/tdenetworkmanager/debian/menu
diff --git a/ubuntu/_base/applications/tdenetworkmanager/debian/network-manager-tde.lintian b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.lintian
similarity index 100%
rename from ubuntu/_base/applications/tdenetworkmanager/debian/network-manager-tde.lintian
rename to ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.lintian
diff --git a/ubuntu/_base/applications/tdenetworkmanager/debian/network-manager-tde.postinst b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.postinst
similarity index 100%
rename from ubuntu/_base/applications/tdenetworkmanager/debian/network-manager-tde.postinst
rename to ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.postinst
diff --git a/ubuntu/_base/applications/kmymoney/debian/patches/series b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/kmymoney/debian/patches/series
rename to ubuntu/_base/applications/settings/tdenetworkmanager/debian/patches/series
diff --git a/ubuntu/_base/applications/klamav/debian/rules b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/klamav/debian/rules
rename to ubuntu/_base/applications/settings/tdenetworkmanager/debian/rules
diff --git a/ubuntu/_base/applications/kpowersave/debian/source/format b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kpowersave/debian/source/format
rename to ubuntu/_base/applications/settings/tdenetworkmanager/debian/source/format
diff --git a/ubuntu/_base/applications/kpowersave/debian/source/options b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kpowersave/debian/source/options
rename to ubuntu/_base/applications/settings/tdenetworkmanager/debian/source/options
diff --git a/ubuntu/_base/applications/kplayer/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/tdesudo/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kplayer/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/settings/tdesudo/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kplayer/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/tdesudo/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kplayer/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/settings/tdesudo/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/tdesudo/debian/changelog b/ubuntu/_base/applications/settings/tdesudo/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/tdesudo/debian/changelog
rename to ubuntu/_base/applications/settings/tdesudo/debian/changelog
diff --git a/ubuntu/_base/applications/krecipes/debian/compat b/ubuntu/_base/applications/settings/tdesudo/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/krecipes/debian/compat
rename to ubuntu/_base/applications/settings/tdesudo/debian/compat
diff --git a/ubuntu/_base/applications/tdesudo/debian/control b/ubuntu/_base/applications/settings/tdesudo/debian/control
similarity index 100%
rename from ubuntu/_base/applications/tdesudo/debian/control
rename to ubuntu/_base/applications/settings/tdesudo/debian/control
diff --git a/ubuntu/_base/applications/tdesudo/debian/copyright b/ubuntu/_base/applications/settings/tdesudo/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/tdesudo/debian/copyright
rename to ubuntu/_base/applications/settings/tdesudo/debian/copyright
diff --git a/ubuntu/_base/applications/ksensors/debian/docs b/ubuntu/_base/applications/settings/tdesudo/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/ksensors/debian/docs
rename to ubuntu/_base/applications/settings/tdesudo/debian/docs
diff --git a/ubuntu/_base/applications/tdesudo/debian/links b/ubuntu/_base/applications/settings/tdesudo/debian/links
similarity index 100%
rename from ubuntu/_base/applications/tdesudo/debian/links
rename to ubuntu/_base/applications/settings/tdesudo/debian/links
diff --git a/ubuntu/_base/applications/knemo/debian/patches/series b/ubuntu/_base/applications/settings/tdesudo/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/knemo/debian/patches/series
rename to ubuntu/_base/applications/settings/tdesudo/debian/patches/series
diff --git a/ubuntu/_base/applications/tdesudo/debian/postinst b/ubuntu/_base/applications/settings/tdesudo/debian/postinst
similarity index 100%
rename from ubuntu/_base/applications/tdesudo/debian/postinst
rename to ubuntu/_base/applications/settings/tdesudo/debian/postinst
diff --git a/ubuntu/_base/applications/tdesudo/debian/postrm b/ubuntu/_base/applications/settings/tdesudo/debian/postrm
similarity index 100%
rename from ubuntu/_base/applications/tdesudo/debian/postrm
rename to ubuntu/_base/applications/settings/tdesudo/debian/postrm
diff --git a/ubuntu/_base/applications/tdesudo/debian/preinst b/ubuntu/_base/applications/settings/tdesudo/debian/preinst
similarity index 100%
rename from ubuntu/_base/applications/tdesudo/debian/preinst
rename to ubuntu/_base/applications/settings/tdesudo/debian/preinst
diff --git a/ubuntu/_base/applications/kscope/debian/rules b/ubuntu/_base/applications/settings/tdesudo/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kscope/debian/rules
rename to ubuntu/_base/applications/settings/tdesudo/debian/rules
diff --git a/ubuntu/_base/applications/krecipes/debian/source/format b/ubuntu/_base/applications/settings/tdesudo/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/krecipes/debian/source/format
rename to ubuntu/_base/applications/settings/tdesudo/debian/source/format
diff --git a/ubuntu/_base/applications/krecipes/debian/source/options b/ubuntu/_base/applications/settings/tdesudo/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/krecipes/debian/source/options
rename to ubuntu/_base/applications/settings/tdesudo/debian/source/options
diff --git a/ubuntu/_base/applications/kmplayer/debian/README.Debian b/ubuntu/_base/applications/settings/wlassistant/debian/README.Debian
similarity index 100%
rename from ubuntu/_base/applications/kmplayer/debian/README.Debian
rename to ubuntu/_base/applications/settings/wlassistant/debian/README.Debian
diff --git a/ubuntu/_base/applications/kpowersave/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/wlassistant/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kpowersave/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/settings/wlassistant/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kpowersave/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/wlassistant/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kpowersave/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/settings/wlassistant/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/wlassistant/debian/changelog b/ubuntu/_base/applications/settings/wlassistant/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/wlassistant/debian/changelog
rename to ubuntu/_base/applications/settings/wlassistant/debian/changelog
diff --git a/ubuntu/_base/applications/krename/debian/compat b/ubuntu/_base/applications/settings/wlassistant/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/krename/debian/compat
rename to ubuntu/_base/applications/settings/wlassistant/debian/compat
diff --git a/ubuntu/_base/applications/wlassistant/debian/control b/ubuntu/_base/applications/settings/wlassistant/debian/control
similarity index 100%
rename from ubuntu/_base/applications/wlassistant/debian/control
rename to ubuntu/_base/applications/settings/wlassistant/debian/control
diff --git a/ubuntu/_base/applications/wlassistant/debian/copyright b/ubuntu/_base/applications/settings/wlassistant/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/wlassistant/debian/copyright
rename to ubuntu/_base/applications/settings/wlassistant/debian/copyright
diff --git a/ubuntu/_base/applications/knetstats/debian/patches/series b/ubuntu/_base/applications/settings/wlassistant/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/knetstats/debian/patches/series
rename to ubuntu/_base/applications/settings/wlassistant/debian/patches/series
diff --git a/ubuntu/_base/applications/wlassistant/debian/rules b/ubuntu/_base/applications/settings/wlassistant/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/wlassistant/debian/rules
rename to ubuntu/_base/applications/settings/wlassistant/debian/rules
diff --git a/ubuntu/_base/applications/krename/debian/source/format b/ubuntu/_base/applications/settings/wlassistant/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/krename/debian/source/format
rename to ubuntu/_base/applications/settings/wlassistant/debian/source/format
diff --git a/ubuntu/_base/applications/krename/debian/source/options b/ubuntu/_base/applications/settings/wlassistant/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/krename/debian/source/options
rename to ubuntu/_base/applications/settings/wlassistant/debian/source/options
diff --git a/ubuntu/_base/applications/wlassistant/debian/watch b/ubuntu/_base/applications/settings/wlassistant/debian/watch
similarity index 100%
rename from ubuntu/_base/applications/wlassistant/debian/watch
rename to ubuntu/_base/applications/settings/wlassistant/debian/watch
diff --git a/ubuntu/_base/applications/wlassistant/debian/wlassistant-16.xpm b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-16.xpm
similarity index 100%
rename from ubuntu/_base/applications/wlassistant/debian/wlassistant-16.xpm
rename to ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-16.xpm
diff --git a/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.dirs b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.dirs
similarity index 100%
rename from ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.dirs
rename to ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.dirs
diff --git a/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.docs b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs
similarity index 100%
rename from ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.docs
rename to ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs
diff --git a/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.install b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.install
rename to ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.install
diff --git a/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.manpage b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.manpage
similarity index 100%
rename from ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.manpage
rename to ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.manpage
diff --git a/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.menu b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.menu
rename to ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.menu
diff --git a/ubuntu/_base/applications/wlassistant/debian/wlassistant.xpm b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant.xpm
similarity index 100%
rename from ubuntu/_base/applications/wlassistant/debian/wlassistant.xpm
rename to ubuntu/_base/applications/settings/wlassistant/debian/wlassistant.xpm
diff --git a/ubuntu/_base/applications/krecipes/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/dolphin/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/krecipes/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/system/dolphin/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/krecipes/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/dolphin/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/krecipes/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/system/dolphin/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/dolphin/debian/changelog b/ubuntu/_base/applications/system/dolphin/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/dolphin/debian/changelog
rename to ubuntu/_base/applications/system/dolphin/debian/changelog
diff --git a/ubuntu/_base/applications/krusader/debian/compat b/ubuntu/_base/applications/system/dolphin/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/krusader/debian/compat
rename to ubuntu/_base/applications/system/dolphin/debian/compat
diff --git a/ubuntu/_base/applications/dolphin/debian/control b/ubuntu/_base/applications/system/dolphin/debian/control
similarity index 100%
rename from ubuntu/_base/applications/dolphin/debian/control
rename to ubuntu/_base/applications/system/dolphin/debian/control
diff --git a/ubuntu/_base/applications/dolphin/debian/copyright b/ubuntu/_base/applications/system/dolphin/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/dolphin/debian/copyright
rename to ubuntu/_base/applications/system/dolphin/debian/copyright
diff --git a/ubuntu/_base/applications/knetworkmanager8/debian/patches/series b/ubuntu/_base/applications/system/dolphin/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/knetworkmanager8/debian/patches/series
rename to ubuntu/_base/applications/system/dolphin/debian/patches/series
diff --git a/ubuntu/_base/applications/dolphin/debian/rules b/ubuntu/_base/applications/system/dolphin/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/dolphin/debian/rules
rename to ubuntu/_base/applications/system/dolphin/debian/rules
diff --git a/ubuntu/_base/applications/krusader/debian/source/format b/ubuntu/_base/applications/system/dolphin/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/krusader/debian/source/format
rename to ubuntu/_base/applications/system/dolphin/debian/source/format
diff --git a/ubuntu/_base/applications/krusader/debian/source/options b/ubuntu/_base/applications/system/dolphin/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/krusader/debian/source/options
rename to ubuntu/_base/applications/system/dolphin/debian/source/options
diff --git a/ubuntu/_base/applications/krename/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/katapult/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/krename/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/system/katapult/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/krename/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/katapult/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/krename/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/system/katapult/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/katapult/debian/changelog b/ubuntu/_base/applications/system/katapult/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/katapult/debian/changelog
rename to ubuntu/_base/applications/system/katapult/debian/changelog
diff --git a/ubuntu/_base/applications/kscope/debian/compat b/ubuntu/_base/applications/system/katapult/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kscope/debian/compat
rename to ubuntu/_base/applications/system/katapult/debian/compat
diff --git a/ubuntu/_base/applications/katapult/debian/control b/ubuntu/_base/applications/system/katapult/debian/control
similarity index 100%
rename from ubuntu/_base/applications/katapult/debian/control
rename to ubuntu/_base/applications/system/katapult/debian/control
diff --git a/ubuntu/_base/applications/katapult/debian/copyright b/ubuntu/_base/applications/system/katapult/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/katapult/debian/copyright
rename to ubuntu/_base/applications/system/katapult/debian/copyright
diff --git a/ubuntu/_base/applications/katapult/debian/docs b/ubuntu/_base/applications/system/katapult/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/katapult/debian/docs
rename to ubuntu/_base/applications/system/katapult/debian/docs
diff --git a/ubuntu/_base/applications/katapult/debian/katapult-trinity.lintian b/ubuntu/_base/applications/system/katapult/debian/katapult-trinity.lintian
similarity index 100%
rename from ubuntu/_base/applications/katapult/debian/katapult-trinity.lintian
rename to ubuntu/_base/applications/system/katapult/debian/katapult-trinity.lintian
diff --git a/ubuntu/_base/applications/katapult/debian/menu b/ubuntu/_base/applications/system/katapult/debian/menu
similarity index 100%
rename from ubuntu/_base/applications/katapult/debian/menu
rename to ubuntu/_base/applications/system/katapult/debian/menu
diff --git a/ubuntu/_base/applications/knmap/debian/patches/series b/ubuntu/_base/applications/system/katapult/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/knmap/debian/patches/series
rename to ubuntu/_base/applications/system/katapult/debian/patches/series
diff --git a/ubuntu/_base/applications/katapult/debian/rules b/ubuntu/_base/applications/system/katapult/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/katapult/debian/rules
rename to ubuntu/_base/applications/system/katapult/debian/rules
diff --git a/ubuntu/_base/applications/kscope/debian/source/format b/ubuntu/_base/applications/system/katapult/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kscope/debian/source/format
rename to ubuntu/_base/applications/system/katapult/debian/source/format
diff --git a/ubuntu/_base/applications/kscope/debian/source/options b/ubuntu/_base/applications/system/katapult/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kscope/debian/source/options
rename to ubuntu/_base/applications/system/katapult/debian/source/options
diff --git a/ubuntu/_base/applications/knemo/debian/README.Debian b/ubuntu/_base/applications/system/kbfx/debian/README.Debian
similarity index 100%
rename from ubuntu/_base/applications/knemo/debian/README.Debian
rename to ubuntu/_base/applications/system/kbfx/debian/README.Debian
diff --git a/ubuntu/_base/applications/krusader/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/kbfx/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/krusader/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/system/kbfx/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/krusader/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/kbfx/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/krusader/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/system/kbfx/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kbfx/debian/changelog b/ubuntu/_base/applications/system/kbfx/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kbfx/debian/changelog
rename to ubuntu/_base/applications/system/kbfx/debian/changelog
diff --git a/ubuntu/_base/applications/ksensors/debian/compat b/ubuntu/_base/applications/system/kbfx/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/ksensors/debian/compat
rename to ubuntu/_base/applications/system/kbfx/debian/compat
diff --git a/ubuntu/_base/applications/kbfx/debian/control b/ubuntu/_base/applications/system/kbfx/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kbfx/debian/control
rename to ubuntu/_base/applications/system/kbfx/debian/control
diff --git a/ubuntu/_base/applications/kbfx/debian/copyright b/ubuntu/_base/applications/system/kbfx/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kbfx/debian/copyright
rename to ubuntu/_base/applications/system/kbfx/debian/copyright
diff --git a/ubuntu/_base/applications/kbfx/debian/docs b/ubuntu/_base/applications/system/kbfx/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/kbfx/debian/docs
rename to ubuntu/_base/applications/system/kbfx/debian/docs
diff --git a/ubuntu/_base/applications/kbfx/debian/kbfx-trinity.lintian b/ubuntu/_base/applications/system/kbfx/debian/kbfx-trinity.lintian
similarity index 100%
rename from ubuntu/_base/applications/kbfx/debian/kbfx-trinity.lintian
rename to ubuntu/_base/applications/system/kbfx/debian/kbfx-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/patches/series b/ubuntu/_base/applications/system/kbfx/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/koffice/debian/patches/series
rename to ubuntu/_base/applications/system/kbfx/debian/patches/series
diff --git a/ubuntu/_base/applications/kbfx/debian/postinst b/ubuntu/_base/applications/system/kbfx/debian/postinst
similarity index 100%
rename from ubuntu/_base/applications/kbfx/debian/postinst
rename to ubuntu/_base/applications/system/kbfx/debian/postinst
diff --git a/ubuntu/_base/applications/kbfx/debian/rules b/ubuntu/_base/applications/system/kbfx/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kbfx/debian/rules
rename to ubuntu/_base/applications/system/kbfx/debian/rules
diff --git a/ubuntu/_base/applications/ksensors/debian/source/format b/ubuntu/_base/applications/system/kbfx/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/ksensors/debian/source/format
rename to ubuntu/_base/applications/system/kbfx/debian/source/format
diff --git a/ubuntu/_base/applications/ksensors/debian/source/options b/ubuntu/_base/applications/system/kbfx/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/ksensors/debian/source/options
rename to ubuntu/_base/applications/system/kbfx/debian/source/options
diff --git a/ubuntu/_base/applications/kbfx/debian/watch b/ubuntu/_base/applications/system/kbfx/debian/watch
similarity index 100%
rename from ubuntu/_base/applications/kbfx/debian/watch
rename to ubuntu/_base/applications/system/kbfx/debian/watch
diff --git a/ubuntu/_base/applications/kscope/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/kcmautostart/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kscope/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/system/kcmautostart/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kscope/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/kcmautostart/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kscope/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/system/kcmautostart/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kcmautostart/debian/changelog b/ubuntu/_base/applications/system/kcmautostart/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kcmautostart/debian/changelog
rename to ubuntu/_base/applications/system/kcmautostart/debian/changelog
diff --git a/ubuntu/_base/applications/kshowmail/debian/compat b/ubuntu/_base/applications/system/kcmautostart/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kshowmail/debian/compat
rename to ubuntu/_base/applications/system/kcmautostart/debian/compat
diff --git a/ubuntu/_base/applications/kcmautostart/debian/control b/ubuntu/_base/applications/system/kcmautostart/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kcmautostart/debian/control
rename to ubuntu/_base/applications/system/kcmautostart/debian/control
diff --git a/ubuntu/_base/applications/kcmautostart/debian/copyright b/ubuntu/_base/applications/system/kcmautostart/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kcmautostart/debian/copyright
rename to ubuntu/_base/applications/system/kcmautostart/debian/copyright
diff --git a/ubuntu/_base/applications/kerberostray/debian/docs b/ubuntu/_base/applications/system/kcmautostart/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/kerberostray/debian/docs
rename to ubuntu/_base/applications/system/kcmautostart/debian/docs
diff --git a/ubuntu/_base/applications/kompose/debian/patches/series b/ubuntu/_base/applications/system/kcmautostart/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/kompose/debian/patches/series
rename to ubuntu/_base/applications/system/kcmautostart/debian/patches/series
diff --git a/ubuntu/_base/applications/kshutdown/debian/rules b/ubuntu/_base/applications/system/kcmautostart/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kshutdown/debian/rules
rename to ubuntu/_base/applications/system/kcmautostart/debian/rules
diff --git a/ubuntu/_base/applications/kshowmail/debian/source/format b/ubuntu/_base/applications/system/kcmautostart/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kshowmail/debian/source/format
rename to ubuntu/_base/applications/system/kcmautostart/debian/source/format
diff --git a/ubuntu/_base/applications/kshowmail/debian/source/options b/ubuntu/_base/applications/system/kcmautostart/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kshowmail/debian/source/options
rename to ubuntu/_base/applications/system/kcmautostart/debian/source/options
diff --git a/ubuntu/_base/applications/ksensors/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/kdbusnotification/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/ksensors/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/system/kdbusnotification/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/ksensors/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/kdbusnotification/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/ksensors/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/system/kdbusnotification/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kdbusnotification/debian/changelog b/ubuntu/_base/applications/system/kdbusnotification/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kdbusnotification/debian/changelog
rename to ubuntu/_base/applications/system/kdbusnotification/debian/changelog
diff --git a/ubuntu/_base/applications/kshutdown/debian/compat b/ubuntu/_base/applications/system/kdbusnotification/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kshutdown/debian/compat
rename to ubuntu/_base/applications/system/kdbusnotification/debian/compat
diff --git a/ubuntu/_base/applications/kdbusnotification/debian/control b/ubuntu/_base/applications/system/kdbusnotification/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kdbusnotification/debian/control
rename to ubuntu/_base/applications/system/kdbusnotification/debian/control
diff --git a/ubuntu/_base/applications/kdbusnotification/debian/copyright b/ubuntu/_base/applications/system/kdbusnotification/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kdbusnotification/debian/copyright
rename to ubuntu/_base/applications/system/kdbusnotification/debian/copyright
diff --git a/ubuntu/_base/applications/knetstats/debian/docs b/ubuntu/_base/applications/system/kdbusnotification/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/knetstats/debian/docs
rename to ubuntu/_base/applications/system/kdbusnotification/debian/docs
diff --git a/ubuntu/_base/applications/knemo/debian/rules b/ubuntu/_base/applications/system/kdbusnotification/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/knemo/debian/rules
rename to ubuntu/_base/applications/system/kdbusnotification/debian/rules
diff --git a/ubuntu/_base/applications/kshutdown/debian/source/format b/ubuntu/_base/applications/system/kdbusnotification/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kshutdown/debian/source/format
rename to ubuntu/_base/applications/system/kdbusnotification/debian/source/format
diff --git a/ubuntu/_base/applications/kshutdown/debian/source/options b/ubuntu/_base/applications/system/kdbusnotification/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kshutdown/debian/source/options
rename to ubuntu/_base/applications/system/kdbusnotification/debian/source/options
diff --git a/ubuntu/_base/applications/kshowmail/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/klamav/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kshowmail/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/system/klamav/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kshowmail/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/klamav/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kshowmail/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/system/klamav/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/klamav/debian/changelog b/ubuntu/_base/applications/system/klamav/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/klamav/debian/changelog
rename to ubuntu/_base/applications/system/klamav/debian/changelog
diff --git a/ubuntu/_base/applications/ksplash-engine-moodin/debian/compat b/ubuntu/_base/applications/system/klamav/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/ksplash-engine-moodin/debian/compat
rename to ubuntu/_base/applications/system/klamav/debian/compat
diff --git a/ubuntu/_base/applications/klamav/debian/control b/ubuntu/_base/applications/system/klamav/debian/control
similarity index 100%
rename from ubuntu/_base/applications/klamav/debian/control
rename to ubuntu/_base/applications/system/klamav/debian/control
diff --git a/ubuntu/_base/applications/klamav/debian/copyright b/ubuntu/_base/applications/system/klamav/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/klamav/debian/copyright
rename to ubuntu/_base/applications/system/klamav/debian/copyright
diff --git a/ubuntu/_base/applications/kstreamripper/debian/docs b/ubuntu/_base/applications/system/klamav/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/kstreamripper/debian/docs
rename to ubuntu/_base/applications/system/klamav/debian/docs
diff --git a/ubuntu/_base/applications/klamav/debian/klamav-trinity.menu b/ubuntu/_base/applications/system/klamav/debian/klamav-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/klamav/debian/klamav-trinity.menu
rename to ubuntu/_base/applications/system/klamav/debian/klamav-trinity.menu
diff --git a/ubuntu/_base/applications/kpowersave/debian/patches/series b/ubuntu/_base/applications/system/klamav/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/kpowersave/debian/patches/series
rename to ubuntu/_base/applications/system/klamav/debian/patches/series
diff --git a/ubuntu/_base/applications/knetload/debian/rules b/ubuntu/_base/applications/system/klamav/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/knetload/debian/rules
rename to ubuntu/_base/applications/system/klamav/debian/rules
diff --git a/ubuntu/_base/applications/ksplash-engine-moodin/debian/source/format b/ubuntu/_base/applications/system/klamav/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/ksplash-engine-moodin/debian/source/format
rename to ubuntu/_base/applications/system/klamav/debian/source/format
diff --git a/ubuntu/_base/applications/ksplash-engine-moodin/debian/source/options b/ubuntu/_base/applications/system/klamav/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/ksplash-engine-moodin/debian/source/options
rename to ubuntu/_base/applications/system/klamav/debian/source/options
diff --git a/ubuntu/_base/applications/krusader/debian/README.Debian b/ubuntu/_base/applications/system/knemo/debian/README.Debian
similarity index 100%
rename from ubuntu/_base/applications/krusader/debian/README.Debian
rename to ubuntu/_base/applications/system/knemo/debian/README.Debian
diff --git a/ubuntu/_base/applications/kshutdown/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/knemo/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kshutdown/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/system/knemo/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kshutdown/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/knemo/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kshutdown/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/system/knemo/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/knemo/debian/changelog b/ubuntu/_base/applications/system/knemo/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/knemo/debian/changelog
rename to ubuntu/_base/applications/system/knemo/debian/changelog
diff --git a/ubuntu/_base/applications/ksquirrel/debian/compat b/ubuntu/_base/applications/system/knemo/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/ksquirrel/debian/compat
rename to ubuntu/_base/applications/system/knemo/debian/compat
diff --git a/ubuntu/_base/applications/knemo/debian/control b/ubuntu/_base/applications/system/knemo/debian/control
similarity index 100%
rename from ubuntu/_base/applications/knemo/debian/control
rename to ubuntu/_base/applications/system/knemo/debian/control
diff --git a/ubuntu/_base/applications/knemo/debian/copyright b/ubuntu/_base/applications/system/knemo/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/knemo/debian/copyright
rename to ubuntu/_base/applications/system/knemo/debian/copyright
diff --git a/ubuntu/_base/applications/knemo/debian/dirs b/ubuntu/_base/applications/system/knemo/debian/dirs
similarity index 100%
rename from ubuntu/_base/applications/knemo/debian/dirs
rename to ubuntu/_base/applications/system/knemo/debian/dirs
diff --git a/ubuntu/_base/applications/knemo/debian/docs b/ubuntu/_base/applications/system/knemo/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/knemo/debian/docs
rename to ubuntu/_base/applications/system/knemo/debian/docs
diff --git a/ubuntu/_base/applications/krename/debian/patches/series b/ubuntu/_base/applications/system/knemo/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/krename/debian/patches/series
rename to ubuntu/_base/applications/system/knemo/debian/patches/series
diff --git a/ubuntu/_base/applications/kompose/debian/rules b/ubuntu/_base/applications/system/knemo/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kompose/debian/rules
rename to ubuntu/_base/applications/system/knemo/debian/rules
diff --git a/ubuntu/_base/applications/ksquirrel/debian/source/format b/ubuntu/_base/applications/system/knemo/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/ksquirrel/debian/source/format
rename to ubuntu/_base/applications/system/knemo/debian/source/format
diff --git a/ubuntu/_base/applications/ksquirrel/debian/source/options b/ubuntu/_base/applications/system/knemo/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/ksquirrel/debian/source/options
rename to ubuntu/_base/applications/system/knemo/debian/source/options
diff --git a/ubuntu/_base/applications/ksplash-engine-moodin/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/knetload/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/ksplash-engine-moodin/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/system/knetload/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/ksplash-engine-moodin/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/knetload/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/ksplash-engine-moodin/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/system/knetload/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/knetload/debian/changelog b/ubuntu/_base/applications/system/knetload/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/knetload/debian/changelog
rename to ubuntu/_base/applications/system/knetload/debian/changelog
diff --git a/ubuntu/_base/applications/kstreamripper/debian/compat b/ubuntu/_base/applications/system/knetload/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kstreamripper/debian/compat
rename to ubuntu/_base/applications/system/knetload/debian/compat
diff --git a/ubuntu/_base/applications/knetload/debian/control b/ubuntu/_base/applications/system/knetload/debian/control
similarity index 100%
rename from ubuntu/_base/applications/knetload/debian/control
rename to ubuntu/_base/applications/system/knetload/debian/control
diff --git a/ubuntu/_base/applications/knetload/debian/copyright b/ubuntu/_base/applications/system/knetload/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/knetload/debian/copyright
rename to ubuntu/_base/applications/system/knetload/debian/copyright
diff --git a/ubuntu/_base/applications/knetload/debian/dirs b/ubuntu/_base/applications/system/knetload/debian/dirs
similarity index 100%
rename from ubuntu/_base/applications/knetload/debian/dirs
rename to ubuntu/_base/applications/system/knetload/debian/dirs
diff --git a/ubuntu/_base/applications/kvpnc/debian/docs b/ubuntu/_base/applications/system/knetload/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/kvpnc/debian/docs
rename to ubuntu/_base/applications/system/knetload/debian/docs
diff --git a/ubuntu/_base/applications/knetload/debian/knetload-trinity.install b/ubuntu/_base/applications/system/knetload/debian/knetload-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/knetload/debian/knetload-trinity.install
rename to ubuntu/_base/applications/system/knetload/debian/knetload-trinity.install
diff --git a/ubuntu/_base/applications/knetload/debian/knetload.xpm b/ubuntu/_base/applications/system/knetload/debian/knetload.xpm
similarity index 100%
rename from ubuntu/_base/applications/knetload/debian/knetload.xpm
rename to ubuntu/_base/applications/system/knetload/debian/knetload.xpm
diff --git a/ubuntu/_base/applications/knetload/debian/menu b/ubuntu/_base/applications/system/knetload/debian/menu
similarity index 100%
rename from ubuntu/_base/applications/knetload/debian/menu
rename to ubuntu/_base/applications/system/knetload/debian/menu
diff --git a/ubuntu/_base/applications/kxmleditor/debian/patches/series b/ubuntu/_base/applications/system/knetload/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/kxmleditor/debian/patches/series
rename to ubuntu/_base/applications/system/knetload/debian/patches/series
diff --git a/ubuntu/_base/applications/kooldock/debian/rules b/ubuntu/_base/applications/system/knetload/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kooldock/debian/rules
rename to ubuntu/_base/applications/system/knetload/debian/rules
diff --git a/ubuntu/_base/applications/kstreamripper/debian/source/format b/ubuntu/_base/applications/system/knetload/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kstreamripper/debian/source/format
rename to ubuntu/_base/applications/system/knetload/debian/source/format
diff --git a/ubuntu/_base/applications/kstreamripper/debian/source/options b/ubuntu/_base/applications/system/knetload/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kstreamripper/debian/source/options
rename to ubuntu/_base/applications/system/knetload/debian/source/options
diff --git a/ubuntu/_base/applications/kstreamripper/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/knetstats/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kstreamripper/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/system/knetstats/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kstreamripper/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/knetstats/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kstreamripper/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/system/knetstats/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/knetstats/debian/changelog b/ubuntu/_base/applications/system/knetstats/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/knetstats/debian/changelog
rename to ubuntu/_base/applications/system/knetstats/debian/changelog
diff --git a/ubuntu/_base/applications/ksystemlog/debian/compat b/ubuntu/_base/applications/system/knetstats/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/ksystemlog/debian/compat
rename to ubuntu/_base/applications/system/knetstats/debian/compat
diff --git a/ubuntu/_base/applications/knetstats/debian/control b/ubuntu/_base/applications/system/knetstats/debian/control
similarity index 100%
rename from ubuntu/_base/applications/knetstats/debian/control
rename to ubuntu/_base/applications/system/knetstats/debian/control
diff --git a/ubuntu/_base/applications/knetstats/debian/copyright b/ubuntu/_base/applications/system/knetstats/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/knetstats/debian/copyright
rename to ubuntu/_base/applications/system/knetstats/debian/copyright
diff --git a/ubuntu/_base/applications/knutclient/debian/docs b/ubuntu/_base/applications/system/knetstats/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/knutclient/debian/docs
rename to ubuntu/_base/applications/system/knetstats/debian/docs
diff --git a/ubuntu/_base/applications/krusader/debian/patches/series b/ubuntu/_base/applications/system/knetstats/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/krusader/debian/patches/series
rename to ubuntu/_base/applications/system/knetstats/debian/patches/series
diff --git a/ubuntu/_base/applications/ksplash-engine-moodin/debian/rules b/ubuntu/_base/applications/system/knetstats/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/ksplash-engine-moodin/debian/rules
rename to ubuntu/_base/applications/system/knetstats/debian/rules
diff --git a/ubuntu/_base/applications/ksystemlog/debian/source/format b/ubuntu/_base/applications/system/knetstats/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/ksystemlog/debian/source/format
rename to ubuntu/_base/applications/system/knetstats/debian/source/format
diff --git a/ubuntu/_base/applications/ksystemlog/debian/source/options b/ubuntu/_base/applications/system/knetstats/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/ksystemlog/debian/source/options
rename to ubuntu/_base/applications/system/knetstats/debian/source/options
diff --git a/ubuntu/_base/applications/ksystemlog/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/kooldock/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/ksystemlog/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/system/kooldock/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/ksystemlog/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/kooldock/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/ksystemlog/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/system/kooldock/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kooldock/debian/changelog b/ubuntu/_base/applications/system/kooldock/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kooldock/debian/changelog
rename to ubuntu/_base/applications/system/kooldock/debian/changelog
diff --git a/ubuntu/_base/applications/ktechlab/debian/compat b/ubuntu/_base/applications/system/kooldock/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/ktechlab/debian/compat
rename to ubuntu/_base/applications/system/kooldock/debian/compat
diff --git a/ubuntu/_base/applications/kooldock/debian/control b/ubuntu/_base/applications/system/kooldock/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kooldock/debian/control
rename to ubuntu/_base/applications/system/kooldock/debian/control
diff --git a/ubuntu/_base/applications/kooldock/debian/copyright b/ubuntu/_base/applications/system/kooldock/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kooldock/debian/copyright
rename to ubuntu/_base/applications/system/kooldock/debian/copyright
diff --git a/ubuntu/_base/applications/kooldock/debian/docs b/ubuntu/_base/applications/system/kooldock/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/kooldock/debian/docs
rename to ubuntu/_base/applications/system/kooldock/debian/docs
diff --git a/ubuntu/_base/applications/kooldock/debian/menu b/ubuntu/_base/applications/system/kooldock/debian/menu
similarity index 100%
rename from ubuntu/_base/applications/kooldock/debian/menu
rename to ubuntu/_base/applications/system/kooldock/debian/menu
diff --git a/ubuntu/_base/applications/kshowmail/debian/rules b/ubuntu/_base/applications/system/kooldock/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kshowmail/debian/rules
rename to ubuntu/_base/applications/system/kooldock/debian/rules
diff --git a/ubuntu/_base/applications/ktechlab/debian/source/format b/ubuntu/_base/applications/system/kooldock/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/ktechlab/debian/source/format
rename to ubuntu/_base/applications/system/kooldock/debian/source/format
diff --git a/ubuntu/_base/applications/ktechlab/debian/source/options b/ubuntu/_base/applications/system/kooldock/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/ktechlab/debian/source/options
rename to ubuntu/_base/applications/system/kooldock/debian/source/options
diff --git a/ubuntu/_base/applications/ktechlab/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/kpowersave/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/ktechlab/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/system/kpowersave/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/ktechlab/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/kpowersave/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/ktechlab/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/system/kpowersave/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kpowersave/debian/changelog b/ubuntu/_base/applications/system/kpowersave/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kpowersave/debian/changelog
rename to ubuntu/_base/applications/system/kpowersave/debian/changelog
diff --git a/ubuntu/_base/applications/ktorrent/debian/compat b/ubuntu/_base/applications/system/kpowersave/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/ktorrent/debian/compat
rename to ubuntu/_base/applications/system/kpowersave/debian/compat
diff --git a/ubuntu/_base/applications/kpowersave/debian/control b/ubuntu/_base/applications/system/kpowersave/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kpowersave/debian/control
rename to ubuntu/_base/applications/system/kpowersave/debian/control
diff --git a/ubuntu/_base/applications/kpowersave/debian/copyright b/ubuntu/_base/applications/system/kpowersave/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kpowersave/debian/copyright
rename to ubuntu/_base/applications/system/kpowersave/debian/copyright
diff --git a/ubuntu/_base/applications/kpowersave/debian/install b/ubuntu/_base/applications/system/kpowersave/debian/install
similarity index 100%
rename from ubuntu/_base/applications/kpowersave/debian/install
rename to ubuntu/_base/applications/system/kpowersave/debian/install
diff --git a/ubuntu/_base/applications/kpowersave/debian/kpowersave-trinity.linda b/ubuntu/_base/applications/system/kpowersave/debian/kpowersave-trinity.linda
similarity index 100%
rename from ubuntu/_base/applications/kpowersave/debian/kpowersave-trinity.linda
rename to ubuntu/_base/applications/system/kpowersave/debian/kpowersave-trinity.linda
diff --git a/ubuntu/_base/applications/kpowersave/debian/kpowersave-trinity.lintian b/ubuntu/_base/applications/system/kpowersave/debian/kpowersave-trinity.lintian
similarity index 100%
rename from ubuntu/_base/applications/kpowersave/debian/kpowersave-trinity.lintian
rename to ubuntu/_base/applications/system/kpowersave/debian/kpowersave-trinity.lintian
diff --git a/ubuntu/_base/applications/kpowersave/debian/kpowersave.xpm b/ubuntu/_base/applications/system/kpowersave/debian/kpowersave.xpm
similarity index 100%
rename from ubuntu/_base/applications/kpowersave/debian/kpowersave.xpm
rename to ubuntu/_base/applications/system/kpowersave/debian/kpowersave.xpm
diff --git a/ubuntu/_base/applications/kpowersave/debian/menu b/ubuntu/_base/applications/system/kpowersave/debian/menu
similarity index 100%
rename from ubuntu/_base/applications/kpowersave/debian/menu
rename to ubuntu/_base/applications/system/kpowersave/debian/menu
diff --git a/ubuntu/_base/applications/ksensors/debian/patches/series b/ubuntu/_base/applications/system/kpowersave/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/ksensors/debian/patches/series
rename to ubuntu/_base/applications/system/kpowersave/debian/patches/series
diff --git a/ubuntu/_base/applications/kpowersave/debian/postinst b/ubuntu/_base/applications/system/kpowersave/debian/postinst
similarity index 100%
rename from ubuntu/_base/applications/kpowersave/debian/postinst
rename to ubuntu/_base/applications/system/kpowersave/debian/postinst
diff --git a/ubuntu/_base/applications/kpowersave/debian/postrm b/ubuntu/_base/applications/system/kpowersave/debian/postrm
similarity index 100%
rename from ubuntu/_base/applications/kpowersave/debian/postrm
rename to ubuntu/_base/applications/system/kpowersave/debian/postrm
diff --git a/ubuntu/_base/applications/kpowersave/debian/preinst b/ubuntu/_base/applications/system/kpowersave/debian/preinst
similarity index 100%
rename from ubuntu/_base/applications/kpowersave/debian/preinst
rename to ubuntu/_base/applications/system/kpowersave/debian/preinst
diff --git a/ubuntu/_base/applications/kpowersave/debian/rules b/ubuntu/_base/applications/system/kpowersave/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kpowersave/debian/rules
rename to ubuntu/_base/applications/system/kpowersave/debian/rules
diff --git a/ubuntu/_base/applications/ktorrent/debian/source/format b/ubuntu/_base/applications/system/kpowersave/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/ktorrent/debian/source/format
rename to ubuntu/_base/applications/system/kpowersave/debian/source/format
diff --git a/ubuntu/_base/applications/ktorrent/debian/source/options b/ubuntu/_base/applications/system/kpowersave/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/ktorrent/debian/source/options
rename to ubuntu/_base/applications/system/kpowersave/debian/source/options
diff --git a/ubuntu/_base/applications/tde-guidance/debian/README.Debian b/ubuntu/_base/applications/system/krusader/debian/README.Debian
similarity index 100%
rename from ubuntu/_base/applications/tde-guidance/debian/README.Debian
rename to ubuntu/_base/applications/system/krusader/debian/README.Debian
diff --git a/ubuntu/_base/applications/ktorrent/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/krusader/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/ktorrent/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/system/krusader/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/ktorrent/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/krusader/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/ktorrent/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/system/krusader/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/krusader/debian/changelog b/ubuntu/_base/applications/system/krusader/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/krusader/debian/changelog
rename to ubuntu/_base/applications/system/krusader/debian/changelog
diff --git a/ubuntu/_base/applications/kvirc/debian/compat b/ubuntu/_base/applications/system/krusader/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kvirc/debian/compat
rename to ubuntu/_base/applications/system/krusader/debian/compat
diff --git a/ubuntu/_base/applications/krusader/debian/control b/ubuntu/_base/applications/system/krusader/debian/control
similarity index 100%
rename from ubuntu/_base/applications/krusader/debian/control
rename to ubuntu/_base/applications/system/krusader/debian/control
diff --git a/ubuntu/_base/applications/krusader/debian/copyright b/ubuntu/_base/applications/system/krusader/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/krusader/debian/copyright
rename to ubuntu/_base/applications/system/krusader/debian/copyright
diff --git a/ubuntu/_base/applications/krusader/debian/docs b/ubuntu/_base/applications/system/krusader/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/krusader/debian/docs
rename to ubuntu/_base/applications/system/krusader/debian/docs
diff --git a/ubuntu/_base/applications/krusader/debian/krusader.lintian-overrides b/ubuntu/_base/applications/system/krusader/debian/krusader.lintian-overrides
similarity index 100%
rename from ubuntu/_base/applications/krusader/debian/krusader.lintian-overrides
rename to ubuntu/_base/applications/system/krusader/debian/krusader.lintian-overrides
diff --git a/ubuntu/_base/applications/krusader/debian/menu b/ubuntu/_base/applications/system/krusader/debian/menu
similarity index 100%
rename from ubuntu/_base/applications/krusader/debian/menu
rename to ubuntu/_base/applications/system/krusader/debian/menu
diff --git a/ubuntu/_base/applications/ksystemlog/debian/patches/series b/ubuntu/_base/applications/system/krusader/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/ksystemlog/debian/patches/series
rename to ubuntu/_base/applications/system/krusader/debian/patches/series
diff --git a/ubuntu/_base/applications/krusader/debian/rules b/ubuntu/_base/applications/system/krusader/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/krusader/debian/rules
rename to ubuntu/_base/applications/system/krusader/debian/rules
diff --git a/ubuntu/_base/applications/krusader/debian/source.lintian-overrides b/ubuntu/_base/applications/system/krusader/debian/source.lintian-overrides
similarity index 100%
rename from ubuntu/_base/applications/krusader/debian/source.lintian-overrides
rename to ubuntu/_base/applications/system/krusader/debian/source.lintian-overrides
diff --git a/ubuntu/_base/applications/kvirc/debian/source/format b/ubuntu/_base/applications/system/krusader/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kvirc/debian/source/format
rename to ubuntu/_base/applications/system/krusader/debian/source/format
diff --git a/ubuntu/_base/applications/kvirc/debian/source/options b/ubuntu/_base/applications/system/krusader/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kvirc/debian/source/options
rename to ubuntu/_base/applications/system/krusader/debian/source/options
diff --git a/ubuntu/_base/applications/krusader/debian/watch b/ubuntu/_base/applications/system/krusader/debian/watch
similarity index 100%
rename from ubuntu/_base/applications/krusader/debian/watch
rename to ubuntu/_base/applications/system/krusader/debian/watch
diff --git a/ubuntu/_base/applications/kvkbd/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/kshutdown/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kvkbd/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/system/kshutdown/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kvkbd/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/kshutdown/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kvkbd/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/system/kshutdown/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kshutdown/debian/changelog b/ubuntu/_base/applications/system/kshutdown/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kshutdown/debian/changelog
rename to ubuntu/_base/applications/system/kshutdown/debian/changelog
diff --git a/ubuntu/_base/applications/kvkbd/debian/compat b/ubuntu/_base/applications/system/kshutdown/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kvkbd/debian/compat
rename to ubuntu/_base/applications/system/kshutdown/debian/compat
diff --git a/ubuntu/_base/applications/kshutdown/debian/control b/ubuntu/_base/applications/system/kshutdown/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kshutdown/debian/control
rename to ubuntu/_base/applications/system/kshutdown/debian/control
diff --git a/ubuntu/_base/applications/kshutdown/debian/copyright b/ubuntu/_base/applications/system/kshutdown/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kshutdown/debian/copyright
rename to ubuntu/_base/applications/system/kshutdown/debian/copyright
diff --git a/ubuntu/_base/applications/kshutdown/debian/dirs b/ubuntu/_base/applications/system/kshutdown/debian/dirs
similarity index 100%
rename from ubuntu/_base/applications/kshutdown/debian/dirs
rename to ubuntu/_base/applications/system/kshutdown/debian/dirs
diff --git a/ubuntu/_base/applications/kshutdown/debian/docs b/ubuntu/_base/applications/system/kshutdown/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/kshutdown/debian/docs
rename to ubuntu/_base/applications/system/kshutdown/debian/docs
diff --git a/ubuntu/_base/applications/kstreamripper/debian/rules b/ubuntu/_base/applications/system/kshutdown/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kstreamripper/debian/rules
rename to ubuntu/_base/applications/system/kshutdown/debian/rules
diff --git a/ubuntu/_base/applications/kvkbd/debian/source/format b/ubuntu/_base/applications/system/kshutdown/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kvkbd/debian/source/format
rename to ubuntu/_base/applications/system/kshutdown/debian/source/format
diff --git a/ubuntu/_base/applications/kvkbd/debian/source/options b/ubuntu/_base/applications/system/kshutdown/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kvkbd/debian/source/options
rename to ubuntu/_base/applications/system/kshutdown/debian/source/options
diff --git a/ubuntu/_base/applications/kvpnc/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/ksystemlog/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kvpnc/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/system/ksystemlog/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kvpnc/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/ksystemlog/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kvpnc/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/system/ksystemlog/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/ksystemlog/debian/changelog b/ubuntu/_base/applications/system/ksystemlog/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/ksystemlog/debian/changelog
rename to ubuntu/_base/applications/system/ksystemlog/debian/changelog
diff --git a/ubuntu/_base/applications/kvpnc/debian/compat b/ubuntu/_base/applications/system/ksystemlog/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kvpnc/debian/compat
rename to ubuntu/_base/applications/system/ksystemlog/debian/compat
diff --git a/ubuntu/_base/applications/ksystemlog/debian/control b/ubuntu/_base/applications/system/ksystemlog/debian/control
similarity index 100%
rename from ubuntu/_base/applications/ksystemlog/debian/control
rename to ubuntu/_base/applications/system/ksystemlog/debian/control
diff --git a/ubuntu/_base/applications/ksystemlog/debian/copyright b/ubuntu/_base/applications/system/ksystemlog/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/ksystemlog/debian/copyright
rename to ubuntu/_base/applications/system/ksystemlog/debian/copyright
diff --git a/ubuntu/_base/applications/ksystemlog/debian/docs b/ubuntu/_base/applications/system/ksystemlog/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/ksystemlog/debian/docs
rename to ubuntu/_base/applications/system/ksystemlog/debian/docs
diff --git a/ubuntu/_base/applications/ksystemlog/debian/menu b/ubuntu/_base/applications/system/ksystemlog/debian/menu
similarity index 100%
rename from ubuntu/_base/applications/ksystemlog/debian/menu
rename to ubuntu/_base/applications/system/ksystemlog/debian/menu
diff --git a/ubuntu/_base/applications/ktorrent/debian/patches/series b/ubuntu/_base/applications/system/ksystemlog/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/ktorrent/debian/patches/series
rename to ubuntu/_base/applications/system/ksystemlog/debian/patches/series
diff --git a/ubuntu/_base/applications/ksystemlog/debian/rules b/ubuntu/_base/applications/system/ksystemlog/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/ksystemlog/debian/rules
rename to ubuntu/_base/applications/system/ksystemlog/debian/rules
diff --git a/ubuntu/_base/applications/kvpnc/debian/source/format b/ubuntu/_base/applications/system/ksystemlog/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kvpnc/debian/source/format
rename to ubuntu/_base/applications/system/ksystemlog/debian/source/format
diff --git a/ubuntu/_base/applications/kvpnc/debian/source/options b/ubuntu/_base/applications/system/ksystemlog/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kvpnc/debian/source/options
rename to ubuntu/_base/applications/system/ksystemlog/debian/source/options
diff --git a/ubuntu/_base/applications/kxmleditor/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/kvkbd/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/kxmleditor/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/system/kvkbd/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kxmleditor/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/kvkbd/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/kxmleditor/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/system/kvkbd/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kvkbd/debian/changelog b/ubuntu/_base/applications/system/kvkbd/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kvkbd/debian/changelog
rename to ubuntu/_base/applications/system/kvkbd/debian/changelog
diff --git a/ubuntu/_base/applications/kxmleditor/debian/compat b/ubuntu/_base/applications/system/kvkbd/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/kxmleditor/debian/compat
rename to ubuntu/_base/applications/system/kvkbd/debian/compat
diff --git a/ubuntu/_base/applications/kvkbd/debian/control b/ubuntu/_base/applications/system/kvkbd/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kvkbd/debian/control
rename to ubuntu/_base/applications/system/kvkbd/debian/control
diff --git a/ubuntu/_base/applications/kvkbd/debian/copyright b/ubuntu/_base/applications/system/kvkbd/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kvkbd/debian/copyright
rename to ubuntu/_base/applications/system/kvkbd/debian/copyright
diff --git a/ubuntu/_base/applications/kvkbd/debian/docs b/ubuntu/_base/applications/system/kvkbd/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/kvkbd/debian/docs
rename to ubuntu/_base/applications/system/kvkbd/debian/docs
diff --git a/ubuntu/_base/applications/kvirc/debian/patches/series b/ubuntu/_base/applications/system/kvkbd/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/kvirc/debian/patches/series
rename to ubuntu/_base/applications/system/kvkbd/debian/patches/series
diff --git a/ubuntu/_base/applications/kvkbd/debian/rules b/ubuntu/_base/applications/system/kvkbd/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kvkbd/debian/rules
rename to ubuntu/_base/applications/system/kvkbd/debian/rules
diff --git a/ubuntu/_base/applications/kxmleditor/debian/source/format b/ubuntu/_base/applications/system/kvkbd/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/kxmleditor/debian/source/format
rename to ubuntu/_base/applications/system/kvkbd/debian/source/format
diff --git a/ubuntu/_base/applications/kxmleditor/debian/source/options b/ubuntu/_base/applications/system/kvkbd/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/kxmleditor/debian/source/options
rename to ubuntu/_base/applications/system/kvkbd/debian/source/options
diff --git a/ubuntu/_base/applications/smartcardauth/debian/changelog b/ubuntu/_base/applications/system/smartcardauth/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/smartcardauth/debian/changelog
rename to ubuntu/_base/applications/system/smartcardauth/debian/changelog
diff --git a/ubuntu/_base/applications/mathemagics/debian/compat b/ubuntu/_base/applications/system/smartcardauth/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/mathemagics/debian/compat
rename to ubuntu/_base/applications/system/smartcardauth/debian/compat
diff --git a/ubuntu/_base/applications/smartcardauth/debian/control b/ubuntu/_base/applications/system/smartcardauth/debian/control
similarity index 100%
rename from ubuntu/_base/applications/smartcardauth/debian/control
rename to ubuntu/_base/applications/system/smartcardauth/debian/control
diff --git a/ubuntu/_base/applications/smartcardauth/debian/dirs b/ubuntu/_base/applications/system/smartcardauth/debian/dirs
similarity index 100%
rename from ubuntu/_base/applications/smartcardauth/debian/dirs
rename to ubuntu/_base/applications/system/smartcardauth/debian/dirs
diff --git a/ubuntu/_base/applications/smartcardauth/debian/rules b/ubuntu/_base/applications/system/smartcardauth/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/smartcardauth/debian/rules
rename to ubuntu/_base/applications/system/smartcardauth/debian/rules
diff --git a/ubuntu/_base/applications/mathemagics/debian/source/format b/ubuntu/_base/applications/system/smartcardauth/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/mathemagics/debian/source/format
rename to ubuntu/_base/applications/system/smartcardauth/debian/source/format
diff --git a/ubuntu/_base/applications/mathemagics/debian/source/options b/ubuntu/_base/applications/system/smartcardauth/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/mathemagics/debian/source/options
rename to ubuntu/_base/applications/system/smartcardauth/debian/source/options
diff --git a/ubuntu/_base/applications/smartcardauth/debian/triggers b/ubuntu/_base/applications/system/smartcardauth/debian/triggers
similarity index 100%
rename from ubuntu/_base/applications/smartcardauth/debian/triggers
rename to ubuntu/_base/applications/system/smartcardauth/debian/triggers
diff --git a/ubuntu/_base/applications/mathemagics/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/tastymenu/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/mathemagics/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/system/tastymenu/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/mathemagics/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/tastymenu/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/mathemagics/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/system/tastymenu/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/tastymenu/debian/changelog b/ubuntu/_base/applications/system/tastymenu/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/tastymenu/debian/changelog
rename to ubuntu/_base/applications/system/tastymenu/debian/changelog
diff --git a/ubuntu/_base/applications/mplayerthumbs/debian/compat b/ubuntu/_base/applications/system/tastymenu/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/mplayerthumbs/debian/compat
rename to ubuntu/_base/applications/system/tastymenu/debian/compat
diff --git a/ubuntu/_base/applications/tastymenu/debian/control b/ubuntu/_base/applications/system/tastymenu/debian/control
similarity index 100%
rename from ubuntu/_base/applications/tastymenu/debian/control
rename to ubuntu/_base/applications/system/tastymenu/debian/control
diff --git a/ubuntu/_base/applications/tastymenu/debian/copyright b/ubuntu/_base/applications/system/tastymenu/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/tastymenu/debian/copyright
rename to ubuntu/_base/applications/system/tastymenu/debian/copyright
diff --git a/ubuntu/_base/applications/qalculate-tde/debian/patches/series b/ubuntu/_base/applications/system/tastymenu/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/qalculate-tde/debian/patches/series
rename to ubuntu/_base/applications/system/tastymenu/debian/patches/series
diff --git a/ubuntu/_base/applications/kxmleditor/debian/rules b/ubuntu/_base/applications/system/tastymenu/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kxmleditor/debian/rules
rename to ubuntu/_base/applications/system/tastymenu/debian/rules
diff --git a/ubuntu/_base/applications/mplayerthumbs/debian/source/format b/ubuntu/_base/applications/system/tastymenu/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/mplayerthumbs/debian/source/format
rename to ubuntu/_base/applications/system/tastymenu/debian/source/format
diff --git a/ubuntu/_base/applications/mplayerthumbs/debian/source/options b/ubuntu/_base/applications/system/tastymenu/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/mplayerthumbs/debian/source/options
rename to ubuntu/_base/applications/system/tastymenu/debian/source/options
diff --git a/ubuntu/_base/applications/mplayerthumbs/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/tdedocker/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/mplayerthumbs/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/system/tdedocker/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/tdedocker/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/tdedocker/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/tdedocker/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/system/tdedocker/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/tdedocker/debian/changelog b/ubuntu/_base/applications/system/tdedocker/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/tdedocker/debian/changelog
rename to ubuntu/_base/applications/system/tdedocker/debian/changelog
diff --git a/ubuntu/_base/applications/piklab/debian/compat b/ubuntu/_base/applications/system/tdedocker/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/piklab/debian/compat
rename to ubuntu/_base/applications/system/tdedocker/debian/compat
diff --git a/ubuntu/_base/applications/tdedocker/debian/control b/ubuntu/_base/applications/system/tdedocker/debian/control
similarity index 100%
rename from ubuntu/_base/applications/tdedocker/debian/control
rename to ubuntu/_base/applications/system/tdedocker/debian/control
diff --git a/ubuntu/_base/applications/tdedocker/debian/copyright b/ubuntu/_base/applications/system/tdedocker/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/tdedocker/debian/copyright
rename to ubuntu/_base/applications/system/tdedocker/debian/copyright
diff --git a/ubuntu/_base/applications/tdedocker/debian/docs b/ubuntu/_base/applications/system/tdedocker/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/tdedocker/debian/docs
rename to ubuntu/_base/applications/system/tdedocker/debian/docs
diff --git a/ubuntu/_base/applications/kvpnc/debian/rules b/ubuntu/_base/applications/system/tdedocker/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kvpnc/debian/rules
rename to ubuntu/_base/applications/system/tdedocker/debian/rules
diff --git a/ubuntu/_base/applications/piklab/debian/source/format b/ubuntu/_base/applications/system/tdedocker/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/piklab/debian/source/format
rename to ubuntu/_base/applications/system/tdedocker/debian/source/format
diff --git a/ubuntu/_base/applications/piklab/debian/source/options b/ubuntu/_base/applications/system/tdedocker/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/piklab/debian/source/options
rename to ubuntu/_base/applications/system/tdedocker/debian/source/options
diff --git a/ubuntu/_base/applications/tdedocker/debian/tdedocker-trinity.menu b/ubuntu/_base/applications/system/tdedocker/debian/tdedocker-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/tdedocker/debian/tdedocker-trinity.menu
rename to ubuntu/_base/applications/system/tdedocker/debian/tdedocker-trinity.menu
diff --git a/ubuntu/_base/applications/tdepowersave/debian/acpi-support/policy-funcs b/ubuntu/_base/applications/system/tdepowersave/debian/acpi-support/policy-funcs
similarity index 100%
rename from ubuntu/_base/applications/tdepowersave/debian/acpi-support/policy-funcs
rename to ubuntu/_base/applications/system/tdepowersave/debian/acpi-support/policy-funcs
diff --git a/ubuntu/_base/applications/piklab/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/tdepowersave/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/piklab/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/system/tdepowersave/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/mplayerthumbs/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/tdepowersave/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/mplayerthumbs/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/system/tdepowersave/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/tdepowersave/debian/changelog b/ubuntu/_base/applications/system/tdepowersave/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/tdepowersave/debian/changelog
rename to ubuntu/_base/applications/system/tdepowersave/debian/changelog
diff --git a/ubuntu/_base/applications/potracegui/debian/compat b/ubuntu/_base/applications/system/tdepowersave/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/potracegui/debian/compat
rename to ubuntu/_base/applications/system/tdepowersave/debian/compat
diff --git a/ubuntu/_base/applications/tdepowersave/debian/control b/ubuntu/_base/applications/system/tdepowersave/debian/control
similarity index 100%
rename from ubuntu/_base/applications/tdepowersave/debian/control
rename to ubuntu/_base/applications/system/tdepowersave/debian/control
diff --git a/ubuntu/_base/applications/tdepowersave/debian/copyright b/ubuntu/_base/applications/system/tdepowersave/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/tdepowersave/debian/copyright
rename to ubuntu/_base/applications/system/tdepowersave/debian/copyright
diff --git a/ubuntu/_base/applications/tdepowersave/debian/install b/ubuntu/_base/applications/system/tdepowersave/debian/install
similarity index 100%
rename from ubuntu/_base/applications/tdepowersave/debian/install
rename to ubuntu/_base/applications/system/tdepowersave/debian/install
diff --git a/ubuntu/_base/applications/tdepowersave/debian/menu b/ubuntu/_base/applications/system/tdepowersave/debian/menu
similarity index 100%
rename from ubuntu/_base/applications/tdepowersave/debian/menu
rename to ubuntu/_base/applications/system/tdepowersave/debian/menu
diff --git a/ubuntu/_base/applications/kvkbd/debian/patches/series b/ubuntu/_base/applications/system/tdepowersave/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/kvkbd/debian/patches/series
rename to ubuntu/_base/applications/system/tdepowersave/debian/patches/series
diff --git a/ubuntu/_base/applications/tdepowersave/debian/postrm b/ubuntu/_base/applications/system/tdepowersave/debian/postrm
similarity index 100%
rename from ubuntu/_base/applications/tdepowersave/debian/postrm
rename to ubuntu/_base/applications/system/tdepowersave/debian/postrm
diff --git a/ubuntu/_base/applications/tdepowersave/debian/preinst b/ubuntu/_base/applications/system/tdepowersave/debian/preinst
similarity index 100%
rename from ubuntu/_base/applications/tdepowersave/debian/preinst
rename to ubuntu/_base/applications/system/tdepowersave/debian/preinst
diff --git a/ubuntu/_base/applications/tdepowersave/debian/rules b/ubuntu/_base/applications/system/tdepowersave/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/tdepowersave/debian/rules
rename to ubuntu/_base/applications/system/tdepowersave/debian/rules
diff --git a/ubuntu/_base/applications/potracegui/debian/source/format b/ubuntu/_base/applications/system/tdepowersave/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/potracegui/debian/source/format
rename to ubuntu/_base/applications/system/tdepowersave/debian/source/format
diff --git a/ubuntu/_base/applications/potracegui/debian/source/options b/ubuntu/_base/applications/system/tdepowersave/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/potracegui/debian/source/options
rename to ubuntu/_base/applications/system/tdepowersave/debian/source/options
diff --git a/ubuntu/_base/applications/tdepowersave/debian/tdepowersave-trinity.linda b/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.linda
similarity index 100%
rename from ubuntu/_base/applications/tdepowersave/debian/tdepowersave-trinity.linda
rename to ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.linda
diff --git a/ubuntu/_base/applications/tdepowersave/debian/tdepowersave-trinity.lintian b/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.lintian
similarity index 100%
rename from ubuntu/_base/applications/tdepowersave/debian/tdepowersave-trinity.lintian
rename to ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.lintian
diff --git a/ubuntu/_base/applications/tdepowersave/debian/tdepowersave-trinity.postinst b/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.postinst
similarity index 100%
rename from ubuntu/_base/applications/tdepowersave/debian/tdepowersave-trinity.postinst
rename to ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.postinst
diff --git a/ubuntu/_base/applications/tdepowersave/debian/tdepowersave.xpm b/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave.xpm
similarity index 100%
rename from ubuntu/_base/applications/tdepowersave/debian/tdepowersave.xpm
rename to ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave.xpm
diff --git a/ubuntu/_base/applications/yakuake/debian/README b/ubuntu/_base/applications/system/yakuake/debian/README
similarity index 100%
rename from ubuntu/_base/applications/yakuake/debian/README
rename to ubuntu/_base/applications/system/yakuake/debian/README
diff --git a/ubuntu/_base/applications/potracegui/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/yakuake/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/potracegui/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/system/yakuake/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/piklab/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/yakuake/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/piklab/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/system/yakuake/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/yakuake/debian/changelog b/ubuntu/_base/applications/system/yakuake/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/yakuake/debian/changelog
rename to ubuntu/_base/applications/system/yakuake/debian/changelog
diff --git a/ubuntu/_base/applications/qalculate-tde/debian/compat b/ubuntu/_base/applications/system/yakuake/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/qalculate-tde/debian/compat
rename to ubuntu/_base/applications/system/yakuake/debian/compat
diff --git a/ubuntu/_base/applications/yakuake/debian/control b/ubuntu/_base/applications/system/yakuake/debian/control
similarity index 100%
rename from ubuntu/_base/applications/yakuake/debian/control
rename to ubuntu/_base/applications/system/yakuake/debian/control
diff --git a/ubuntu/_base/applications/yakuake/debian/copyright b/ubuntu/_base/applications/system/yakuake/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/yakuake/debian/copyright
rename to ubuntu/_base/applications/system/yakuake/debian/copyright
diff --git a/ubuntu/_base/applications/kxmleditor/debian/docs b/ubuntu/_base/applications/system/yakuake/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/kxmleditor/debian/docs
rename to ubuntu/_base/applications/system/yakuake/debian/docs
diff --git a/ubuntu/_base/applications/yakuake/debian/icons/yakuake-16.xpm b/ubuntu/_base/applications/system/yakuake/debian/icons/yakuake-16.xpm
similarity index 100%
rename from ubuntu/_base/applications/yakuake/debian/icons/yakuake-16.xpm
rename to ubuntu/_base/applications/system/yakuake/debian/icons/yakuake-16.xpm
diff --git a/ubuntu/_base/applications/yakuake/debian/icons/yakuake.xpm b/ubuntu/_base/applications/system/yakuake/debian/icons/yakuake.xpm
similarity index 100%
rename from ubuntu/_base/applications/yakuake/debian/icons/yakuake.xpm
rename to ubuntu/_base/applications/system/yakuake/debian/icons/yakuake.xpm
diff --git a/ubuntu/_base/applications/kstreamripper/debian/patches/.gitignore b/ubuntu/_base/applications/system/yakuake/debian/patches/.gitignore
similarity index 100%
rename from ubuntu/_base/applications/kstreamripper/debian/patches/.gitignore
rename to ubuntu/_base/applications/system/yakuake/debian/patches/.gitignore
diff --git a/ubuntu/_base/applications/mathemagics/debian/rules b/ubuntu/_base/applications/system/yakuake/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/mathemagics/debian/rules
rename to ubuntu/_base/applications/system/yakuake/debian/rules
diff --git a/ubuntu/_base/applications/qalculate-tde/debian/source/format b/ubuntu/_base/applications/system/yakuake/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/qalculate-tde/debian/source/format
rename to ubuntu/_base/applications/system/yakuake/debian/source/format
diff --git a/ubuntu/_base/applications/qalculate-tde/debian/source/options b/ubuntu/_base/applications/system/yakuake/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/qalculate-tde/debian/source/options
rename to ubuntu/_base/applications/system/yakuake/debian/source/options
diff --git a/ubuntu/_base/applications/yakuake/debian/yakuake-trinity.install b/ubuntu/_base/applications/system/yakuake/debian/yakuake-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/yakuake/debian/yakuake-trinity.install
rename to ubuntu/_base/applications/system/yakuake/debian/yakuake-trinity.install
diff --git a/ubuntu/_base/applications/yakuake/debian/yakuake-trinity.menu b/ubuntu/_base/applications/system/yakuake/debian/yakuake-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/yakuake/debian/yakuake-trinity.menu
rename to ubuntu/_base/applications/system/yakuake/debian/yakuake-trinity.menu
diff --git a/ubuntu/_base/applications/qalculate-tde/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/qalculate-tde/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/tdeio/tdeio-apt/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/potracegui/debian/cdbs/versions.pl b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/potracegui/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/tdeio/tdeio-apt/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/tdeio-apt/debian/changelog b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/tdeio-apt/debian/changelog
rename to ubuntu/_base/applications/tdeio/tdeio-apt/debian/changelog
diff --git a/ubuntu/_base/applications/qt4-tqt-theme-engine/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/qt4-tqt-theme-engine/debian/compat
rename to ubuntu/_base/applications/tdeio/tdeio-apt/debian/compat
diff --git a/ubuntu/_base/applications/tdeio-apt/debian/control b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/control
similarity index 100%
rename from ubuntu/_base/applications/tdeio-apt/debian/control
rename to ubuntu/_base/applications/tdeio/tdeio-apt/debian/control
diff --git a/ubuntu/_base/applications/tdeio-apt/debian/copyright b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/tdeio-apt/debian/copyright
rename to ubuntu/_base/applications/tdeio/tdeio-apt/debian/copyright
diff --git a/ubuntu/_base/applications/mathemagics/debian/docs b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/mathemagics/debian/docs
rename to ubuntu/_base/applications/tdeio/tdeio-apt/debian/docs
diff --git a/ubuntu/_base/applications/mathemagics/debian/patches/series b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/mathemagics/debian/patches/series
rename to ubuntu/_base/applications/tdeio/tdeio-apt/debian/patches/series
diff --git a/ubuntu/_base/applications/potracegui/debian/rules b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/potracegui/debian/rules
rename to ubuntu/_base/applications/tdeio/tdeio-apt/debian/rules
diff --git a/ubuntu/_base/applications/qt4-tqt-theme-engine/debian/source/format b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/qt4-tqt-theme-engine/debian/source/format
rename to ubuntu/_base/applications/tdeio/tdeio-apt/debian/source/format
diff --git a/ubuntu/_base/applications/qt4-tqt-theme-engine/debian/source/options b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/qt4-tqt-theme-engine/debian/source/options
rename to ubuntu/_base/applications/tdeio/tdeio-apt/debian/source/options
diff --git a/ubuntu/_base/applications/rosegarden/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/rosegarden/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/tdeio/tdeio-ftps/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/qalculate-tde/debian/cdbs/versions.pl b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/qalculate-tde/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/tdeio/tdeio-ftps/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/tdeio-ftps/debian/changelog b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/tdeio-ftps/debian/changelog
rename to ubuntu/_base/applications/tdeio/tdeio-ftps/debian/changelog
diff --git a/ubuntu/_base/applications/rosegarden/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/rosegarden/debian/compat
rename to ubuntu/_base/applications/tdeio/tdeio-ftps/debian/compat
diff --git a/ubuntu/_base/applications/tdeio-ftps/debian/control b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/control
similarity index 100%
rename from ubuntu/_base/applications/tdeio-ftps/debian/control
rename to ubuntu/_base/applications/tdeio/tdeio-ftps/debian/control
diff --git a/ubuntu/_base/applications/tdeio-ftps/debian/copyright b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/tdeio-ftps/debian/copyright
rename to ubuntu/_base/applications/tdeio/tdeio-ftps/debian/copyright
diff --git a/ubuntu/_base/applications/tdeio-ftps/debian/docs b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/tdeio-ftps/debian/docs
rename to ubuntu/_base/applications/tdeio/tdeio-ftps/debian/docs
diff --git a/ubuntu/_base/applications/tde-style-baghira/debian/rules b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/tde-style-baghira/debian/rules
rename to ubuntu/_base/applications/tdeio/tdeio-ftps/debian/rules
diff --git a/ubuntu/_base/applications/rosegarden/debian/source/format b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/rosegarden/debian/source/format
rename to ubuntu/_base/applications/tdeio/tdeio-ftps/debian/source/format
diff --git a/ubuntu/_base/applications/rosegarden/debian/source/options b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/rosegarden/debian/source/options
rename to ubuntu/_base/applications/tdeio/tdeio-ftps/debian/source/options
diff --git a/ubuntu/_base/applications/smb4k/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/smb4k/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/tdeio/tdeio-gopher/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/rosegarden/debian/cdbs/versions.pl b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/rosegarden/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/tdeio/tdeio-gopher/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/tdeio-gopher/debian/changelog b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/tdeio-gopher/debian/changelog
rename to ubuntu/_base/applications/tdeio/tdeio-gopher/debian/changelog
diff --git a/ubuntu/_base/applications/smartcardauth/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/smartcardauth/debian/compat
rename to ubuntu/_base/applications/tdeio/tdeio-gopher/debian/compat
diff --git a/ubuntu/_base/applications/tdeio-gopher/debian/control b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/control
similarity index 100%
rename from ubuntu/_base/applications/tdeio-gopher/debian/control
rename to ubuntu/_base/applications/tdeio/tdeio-gopher/debian/control
diff --git a/ubuntu/_base/applications/tdeio-gopher/debian/copyright b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/tdeio-gopher/debian/copyright
rename to ubuntu/_base/applications/tdeio/tdeio-gopher/debian/copyright
diff --git a/ubuntu/_base/applications/piklab/debian/patches/series b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/piklab/debian/patches/series
rename to ubuntu/_base/applications/tdeio/tdeio-gopher/debian/patches/series
diff --git a/ubuntu/_base/applications/tdeio-gopher/debian/rules b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/tdeio-gopher/debian/rules
rename to ubuntu/_base/applications/tdeio/tdeio-gopher/debian/rules
diff --git a/ubuntu/_base/applications/smartcardauth/debian/source/format b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/smartcardauth/debian/source/format
rename to ubuntu/_base/applications/tdeio/tdeio-gopher/debian/source/format
diff --git a/ubuntu/_base/applications/smartcardauth/debian/source/options b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/smartcardauth/debian/source/options
rename to ubuntu/_base/applications/tdeio/tdeio-gopher/debian/source/options
diff --git a/ubuntu/_base/applications/soundkonverter/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/soundkonverter/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/tdeio/tdeio-locate/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/smb4k/debian/cdbs/versions.pl b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/smb4k/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/tdeio/tdeio-locate/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/tdeio-locate/debian/changelog b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/tdeio-locate/debian/changelog
rename to ubuntu/_base/applications/tdeio/tdeio-locate/debian/changelog
diff --git a/ubuntu/_base/applications/smb4k/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/smb4k/debian/compat
rename to ubuntu/_base/applications/tdeio/tdeio-locate/debian/compat
diff --git a/ubuntu/_base/applications/tdeio-locate/debian/control b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/control
similarity index 100%
rename from ubuntu/_base/applications/tdeio-locate/debian/control
rename to ubuntu/_base/applications/tdeio/tdeio-locate/debian/control
diff --git a/ubuntu/_base/applications/tdeio-locate/debian/copyright b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/tdeio-locate/debian/copyright
rename to ubuntu/_base/applications/tdeio/tdeio-locate/debian/copyright
diff --git a/ubuntu/_base/applications/qt4-tqt-theme-engine/debian/patches/series b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/qt4-tqt-theme-engine/debian/patches/series
rename to ubuntu/_base/applications/tdeio/tdeio-locate/debian/patches/series
diff --git a/ubuntu/_base/applications/tdeio-locate/debian/rules b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/tdeio-locate/debian/rules
rename to ubuntu/_base/applications/tdeio/tdeio-locate/debian/rules
diff --git a/ubuntu/_base/applications/smb4k/debian/source/format b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/smb4k/debian/source/format
rename to ubuntu/_base/applications/tdeio/tdeio-locate/debian/source/format
diff --git a/ubuntu/_base/applications/smb4k/debian/source/options b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/smb4k/debian/source/options
rename to ubuntu/_base/applications/tdeio/tdeio-locate/debian/source/options
diff --git a/ubuntu/_base/applications/tastymenu/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/tastymenu/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/tdeio/tdeio-sword/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/soundkonverter/debian/cdbs/versions.pl b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/soundkonverter/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/tdeio/tdeio-sword/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/tdeio-sword/debian/changelog b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/tdeio-sword/debian/changelog
rename to ubuntu/_base/applications/tdeio/tdeio-sword/debian/changelog
diff --git a/ubuntu/_base/applications/soundkonverter/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/soundkonverter/debian/compat
rename to ubuntu/_base/applications/tdeio/tdeio-sword/debian/compat
diff --git a/ubuntu/_base/applications/tdeio-sword/debian/control b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/control
similarity index 100%
rename from ubuntu/_base/applications/tdeio-sword/debian/control
rename to ubuntu/_base/applications/tdeio/tdeio-sword/debian/control
diff --git a/ubuntu/_base/applications/tdeio-sword/debian/copyright b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/tdeio-sword/debian/copyright
rename to ubuntu/_base/applications/tdeio/tdeio-sword/debian/copyright
diff --git a/ubuntu/_base/applications/tdeio-sword/debian/docs b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/tdeio-sword/debian/docs
rename to ubuntu/_base/applications/tdeio/tdeio-sword/debian/docs
diff --git a/ubuntu/_base/applications/tde-style-domino/debian/rules b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/tde-style-domino/debian/rules
rename to ubuntu/_base/applications/tdeio/tdeio-sword/debian/rules
diff --git a/ubuntu/_base/applications/soundkonverter/debian/source/format b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/soundkonverter/debian/source/format
rename to ubuntu/_base/applications/tdeio/tdeio-sword/debian/source/format
diff --git a/ubuntu/_base/applications/soundkonverter/debian/source/options b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/soundkonverter/debian/source/options
rename to ubuntu/_base/applications/tdeio/tdeio-sword/debian/source/options
diff --git a/ubuntu/_base/applications/tde-style-baghira/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/tde-style-baghira/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/tastymenu/debian/cdbs/versions.pl b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/tastymenu/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/tdeio-umountwrapper/debian/changelog b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/tdeio-umountwrapper/debian/changelog
rename to ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/changelog
diff --git a/ubuntu/_base/applications/tastymenu/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/tastymenu/debian/compat
rename to ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/compat
diff --git a/ubuntu/_base/applications/tdeio-umountwrapper/debian/control b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/control
similarity index 100%
rename from ubuntu/_base/applications/tdeio-umountwrapper/debian/control
rename to ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/control
diff --git a/ubuntu/_base/applications/tdeio-umountwrapper/debian/copyright b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/tdeio-umountwrapper/debian/copyright
rename to ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/copyright
diff --git a/ubuntu/_base/applications/mplayerthumbs/debian/docs b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/mplayerthumbs/debian/docs
rename to ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/docs
diff --git a/ubuntu/_base/applications/rosegarden/debian/patches/series b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/rosegarden/debian/patches/series
rename to ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/patches/series
diff --git a/ubuntu/_base/applications/tdeio-umountwrapper/debian/postinst b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/postinst
similarity index 100%
rename from ubuntu/_base/applications/tdeio-umountwrapper/debian/postinst
rename to ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/postinst
diff --git a/ubuntu/_base/applications/tde-systemsettings/debian/rules b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/tde-systemsettings/debian/rules
rename to ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/rules
diff --git a/ubuntu/_base/applications/tastymenu/debian/source/format b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/tastymenu/debian/source/format
rename to ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/source/format
diff --git a/ubuntu/_base/applications/tastymenu/debian/source/options b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/tastymenu/debian/source/options
rename to ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/source/options
diff --git a/ubuntu/_base/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4 b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
similarity index 100%
rename from ubuntu/_base/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
rename to ubuntu/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
diff --git a/ubuntu/_base/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde4 b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde4
similarity index 100%
rename from ubuntu/_base/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde4
rename to ubuntu/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde4
diff --git a/ubuntu/_base/applications/tde-style-domino/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/tde-style-domino/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/themes/gtk-qt-engine/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/tde-style-baghira/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/tde-style-baghira/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/themes/gtk-qt-engine/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/gtk-qt-engine/debian/changelog b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/gtk-qt-engine/debian/changelog
rename to ubuntu/_base/applications/themes/gtk-qt-engine/debian/changelog
diff --git a/ubuntu/_base/applications/tde-guidance/debian/compat b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/tde-guidance/debian/compat
rename to ubuntu/_base/applications/themes/gtk-qt-engine/debian/compat
diff --git a/ubuntu/_base/applications/gtk-qt-engine/debian/control b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/control
similarity index 100%
rename from ubuntu/_base/applications/gtk-qt-engine/debian/control
rename to ubuntu/_base/applications/themes/gtk-qt-engine/debian/control
diff --git a/ubuntu/_base/applications/gtk-qt-engine/debian/copyright b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/gtk-qt-engine/debian/copyright
rename to ubuntu/_base/applications/themes/gtk-qt-engine/debian/copyright
diff --git a/ubuntu/_base/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs
similarity index 100%
rename from ubuntu/_base/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs
rename to ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs
diff --git a/ubuntu/_base/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.install b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.install
rename to ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.install
diff --git a/ubuntu/_base/applications/gtk-qt-engine/debian/gtk-qt-engine.rc.sh b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
similarity index 100%
rename from ubuntu/_base/applications/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
rename to ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
diff --git a/ubuntu/_base/applications/tde-guidance/debian/patches/series b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/tde-guidance/debian/patches/series
rename to ubuntu/_base/applications/themes/gtk-qt-engine/debian/patches/series
diff --git a/ubuntu/_base/applications/gtk-qt-engine/debian/rules b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/gtk-qt-engine/debian/rules
rename to ubuntu/_base/applications/themes/gtk-qt-engine/debian/rules
diff --git a/ubuntu/_base/applications/tde-guidance/debian/source/format b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/tde-guidance/debian/source/format
rename to ubuntu/_base/applications/themes/gtk-qt-engine/debian/source/format
diff --git a/ubuntu/_base/applications/tde-guidance/debian/source/options b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/tde-guidance/debian/source/options
rename to ubuntu/_base/applications/themes/gtk-qt-engine/debian/source/options
diff --git a/ubuntu/_base/applications/gtk3-tqt-engine/debian/changelog b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/gtk3-tqt-engine/debian/changelog
rename to ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/changelog
diff --git a/ubuntu/_base/applications/tde-style-baghira/debian/compat b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/tde-style-baghira/debian/compat
rename to ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/compat
diff --git a/ubuntu/_base/applications/gtk3-tqt-engine/debian/control b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/control
similarity index 100%
rename from ubuntu/_base/applications/gtk3-tqt-engine/debian/control
rename to ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/control
diff --git a/ubuntu/_base/applications/kerberostray/debian/copyright b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kerberostray/debian/copyright
rename to ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/copyright
diff --git a/ubuntu/_base/applications/tde-style-qtcurve/debian/patches/series b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/tde-style-qtcurve/debian/patches/series
rename to ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/patches/series
diff --git a/ubuntu/_base/applications/gtk3-tqt-engine/debian/rules b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/gtk3-tqt-engine/debian/rules
rename to ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/rules
diff --git a/ubuntu/_base/applications/tde-style-baghira/debian/source/format b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/tde-style-baghira/debian/source/format
rename to ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/source/format
diff --git a/ubuntu/_base/applications/tde-style-baghira/debian/source/options b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/tde-style-baghira/debian/source/options
rename to ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/source/options
diff --git a/ubuntu/_base/applications/tde-style-ia-ora/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/kgtk-qt3/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/tde-style-ia-ora/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/themes/kgtk-qt3/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/tde-style-domino/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/kgtk-qt3/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/tde-style-domino/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/themes/kgtk-qt3/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kgtk-qt3/debian/changelog b/ubuntu/_base/applications/themes/kgtk-qt3/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kgtk-qt3/debian/changelog
rename to ubuntu/_base/applications/themes/kgtk-qt3/debian/changelog
diff --git a/ubuntu/_base/applications/tde-style-domino/debian/compat b/ubuntu/_base/applications/themes/kgtk-qt3/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/tde-style-domino/debian/compat
rename to ubuntu/_base/applications/themes/kgtk-qt3/debian/compat
diff --git a/ubuntu/_base/applications/kgtk-qt3/debian/control b/ubuntu/_base/applications/themes/kgtk-qt3/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kgtk-qt3/debian/control
rename to ubuntu/_base/applications/themes/kgtk-qt3/debian/control
diff --git a/ubuntu/_base/applications/kgtk-qt3/debian/copyright b/ubuntu/_base/applications/themes/kgtk-qt3/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kgtk-qt3/debian/copyright
rename to ubuntu/_base/applications/themes/kgtk-qt3/debian/copyright
diff --git a/ubuntu/_base/applications/kgtk-qt3/debian/kgtk-qt3-trinity.lintian b/ubuntu/_base/applications/themes/kgtk-qt3/debian/kgtk-qt3-trinity.lintian
similarity index 100%
rename from ubuntu/_base/applications/kgtk-qt3/debian/kgtk-qt3-trinity.lintian
rename to ubuntu/_base/applications/themes/kgtk-qt3/debian/kgtk-qt3-trinity.lintian
diff --git a/ubuntu/_base/applications/tde-systemsettings/debian/patches/series b/ubuntu/_base/applications/themes/kgtk-qt3/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/tde-systemsettings/debian/patches/series
rename to ubuntu/_base/applications/themes/kgtk-qt3/debian/patches/series
diff --git a/ubuntu/_base/applications/kgtk-qt3/debian/preload b/ubuntu/_base/applications/themes/kgtk-qt3/debian/preload
similarity index 100%
rename from ubuntu/_base/applications/kgtk-qt3/debian/preload
rename to ubuntu/_base/applications/themes/kgtk-qt3/debian/preload
diff --git a/ubuntu/_base/applications/kgtk-qt3/debian/rules b/ubuntu/_base/applications/themes/kgtk-qt3/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kgtk-qt3/debian/rules
rename to ubuntu/_base/applications/themes/kgtk-qt3/debian/rules
diff --git a/ubuntu/_base/applications/tde-style-domino/debian/source/format b/ubuntu/_base/applications/themes/kgtk-qt3/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/tde-style-domino/debian/source/format
rename to ubuntu/_base/applications/themes/kgtk-qt3/debian/source/format
diff --git a/ubuntu/_base/applications/tde-style-domino/debian/source/options b/ubuntu/_base/applications/themes/kgtk-qt3/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/tde-style-domino/debian/source/options
rename to ubuntu/_base/applications/themes/kgtk-qt3/debian/source/options
diff --git a/ubuntu/_base/applications/tde-style-lipstik/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/tde-style-lipstik/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/tde-style-ia-ora/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/tde-style-ia-ora/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/ksplash-engine-moodin/debian/changelog b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/ksplash-engine-moodin/debian/changelog
rename to ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/changelog
diff --git a/ubuntu/_base/applications/tde-style-ia-ora/debian/compat b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/tde-style-ia-ora/debian/compat
rename to ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/compat
diff --git a/ubuntu/_base/applications/ksplash-engine-moodin/debian/control b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/control
similarity index 100%
rename from ubuntu/_base/applications/ksplash-engine-moodin/debian/control
rename to ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/control
diff --git a/ubuntu/_base/applications/ksplash-engine-moodin/debian/copyright b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/ksplash-engine-moodin/debian/copyright
rename to ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/copyright
diff --git a/ubuntu/_base/applications/ksplash-engine-moodin/debian/dirs b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/dirs
similarity index 100%
rename from ubuntu/_base/applications/ksplash-engine-moodin/debian/dirs
rename to ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/dirs
diff --git a/ubuntu/_base/applications/ktechlab/debian/patches/.gitignore b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/patches/.gitignore
similarity index 100%
rename from ubuntu/_base/applications/ktechlab/debian/patches/.gitignore
rename to ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/patches/.gitignore
diff --git a/ubuntu/_base/applications/tdedocker/debian/rules b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/tdedocker/debian/rules
rename to ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/rules
diff --git a/ubuntu/_base/applications/tde-style-ia-ora/debian/source/format b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/tde-style-ia-ora/debian/source/format
rename to ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/source/format
diff --git a/ubuntu/_base/applications/tde-style-ia-ora/debian/source/options b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/tde-style-ia-ora/debian/source/options
rename to ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/source/options
diff --git a/ubuntu/_base/applications/qt4-tqt-theme-engine/debian/changelog b/ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/qt4-tqt-theme-engine/debian/changelog
rename to ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/changelog
diff --git a/ubuntu/_base/applications/tde-style-lipstik/debian/compat b/ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/tde-style-lipstik/debian/compat
rename to ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/compat
diff --git a/ubuntu/_base/applications/qt4-tqt-theme-engine/debian/control b/ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/control
similarity index 100%
rename from ubuntu/_base/applications/qt4-tqt-theme-engine/debian/control
rename to ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/control
diff --git a/ubuntu/_base/applications/qt4-tqt-theme-engine/debian/copyright b/ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/qt4-tqt-theme-engine/debian/copyright
rename to ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/copyright
diff --git a/ubuntu/_base/applications/tdeio-apt/debian/patches/series b/ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/tdeio-apt/debian/patches/series
rename to ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/patches/series
diff --git a/ubuntu/_base/applications/qt4-tqt-theme-engine/debian/rules b/ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/qt4-tqt-theme-engine/debian/rules
rename to ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/rules
diff --git a/ubuntu/_base/applications/tde-style-lipstik/debian/source/format b/ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/tde-style-lipstik/debian/source/format
rename to ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/source/format
diff --git a/ubuntu/_base/applications/tde-style-lipstik/debian/source/options b/ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/tde-style-lipstik/debian/source/options
rename to ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/source/options
diff --git a/ubuntu/_base/applications/tde-style-qtcurve/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/tde-style-baghira/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/tde-style-qtcurve/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/themes/tde-style-baghira/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/tde-style-lipstik/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/tde-style-baghira/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/tde-style-lipstik/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/themes/tde-style-baghira/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/tde-style-baghira/debian/changelog b/ubuntu/_base/applications/themes/tde-style-baghira/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/tde-style-baghira/debian/changelog
rename to ubuntu/_base/applications/themes/tde-style-baghira/debian/changelog
diff --git a/ubuntu/_base/applications/tde-style-qtcurve/debian/compat b/ubuntu/_base/applications/themes/tde-style-baghira/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/tde-style-qtcurve/debian/compat
rename to ubuntu/_base/applications/themes/tde-style-baghira/debian/compat
diff --git a/ubuntu/_base/applications/tde-style-baghira/debian/control b/ubuntu/_base/applications/themes/tde-style-baghira/debian/control
similarity index 100%
rename from ubuntu/_base/applications/tde-style-baghira/debian/control
rename to ubuntu/_base/applications/themes/tde-style-baghira/debian/control
diff --git a/ubuntu/_base/applications/tde-style-baghira/debian/copyright b/ubuntu/_base/applications/themes/tde-style-baghira/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/tde-style-baghira/debian/copyright
rename to ubuntu/_base/applications/themes/tde-style-baghira/debian/copyright
diff --git a/ubuntu/_base/applications/tastymenu/debian/patches/series b/ubuntu/_base/applications/themes/tde-style-baghira/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/tastymenu/debian/patches/series
rename to ubuntu/_base/applications/themes/tde-style-baghira/debian/patches/series
diff --git a/ubuntu/_base/applications/tdeio-apt/debian/rules b/ubuntu/_base/applications/themes/tde-style-baghira/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/tdeio-apt/debian/rules
rename to ubuntu/_base/applications/themes/tde-style-baghira/debian/rules
diff --git a/ubuntu/_base/applications/tde-style-qtcurve/debian/source/format b/ubuntu/_base/applications/themes/tde-style-baghira/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/tde-style-qtcurve/debian/source/format
rename to ubuntu/_base/applications/themes/tde-style-baghira/debian/source/format
diff --git a/ubuntu/_base/applications/tde-style-qtcurve/debian/source/options b/ubuntu/_base/applications/themes/tde-style-baghira/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/tde-style-qtcurve/debian/source/options
rename to ubuntu/_base/applications/themes/tde-style-baghira/debian/source/options
diff --git a/ubuntu/_base/applications/tde-style-baghira/debian/tde-style-baghira-trinity.docs b/ubuntu/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.docs
similarity index 100%
rename from ubuntu/_base/applications/tde-style-baghira/debian/tde-style-baghira-trinity.docs
rename to ubuntu/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.docs
diff --git a/ubuntu/_base/applications/tde-style-baghira/debian/tde-style-baghira-trinity.lintian b/ubuntu/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.lintian
similarity index 100%
rename from ubuntu/_base/applications/tde-style-baghira/debian/tde-style-baghira-trinity.lintian
rename to ubuntu/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.lintian
diff --git a/ubuntu/_base/applications/tde-style-baghira/debian/tde-style-baghira-trinity.menu b/ubuntu/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/tde-style-baghira/debian/tde-style-baghira-trinity.menu
rename to ubuntu/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.menu
diff --git a/ubuntu/_base/applications/tde-systemsettings/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/tde-style-domino/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/tde-systemsettings/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/themes/tde-style-domino/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/tde-style-qtcurve/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/tde-style-domino/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/tde-style-qtcurve/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/themes/tde-style-domino/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/tde-style-domino/debian/changelog b/ubuntu/_base/applications/themes/tde-style-domino/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/tde-style-domino/debian/changelog
rename to ubuntu/_base/applications/themes/tde-style-domino/debian/changelog
diff --git a/ubuntu/_base/applications/tde-systemsettings/debian/compat b/ubuntu/_base/applications/themes/tde-style-domino/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/tde-systemsettings/debian/compat
rename to ubuntu/_base/applications/themes/tde-style-domino/debian/compat
diff --git a/ubuntu/_base/applications/tde-style-domino/debian/control b/ubuntu/_base/applications/themes/tde-style-domino/debian/control
similarity index 100%
rename from ubuntu/_base/applications/tde-style-domino/debian/control
rename to ubuntu/_base/applications/themes/tde-style-domino/debian/control
diff --git a/ubuntu/_base/applications/tde-style-domino/debian/copyright b/ubuntu/_base/applications/themes/tde-style-domino/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/tde-style-domino/debian/copyright
rename to ubuntu/_base/applications/themes/tde-style-domino/debian/copyright
diff --git a/ubuntu/_base/applications/tde-style-baghira/debian/patches/series b/ubuntu/_base/applications/themes/tde-style-domino/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/tde-style-baghira/debian/patches/series
rename to ubuntu/_base/applications/themes/tde-style-domino/debian/patches/series
diff --git a/ubuntu/_base/applications/tdeio-ftps/debian/rules b/ubuntu/_base/applications/themes/tde-style-domino/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/tdeio-ftps/debian/rules
rename to ubuntu/_base/applications/themes/tde-style-domino/debian/rules
diff --git a/ubuntu/_base/applications/tde-systemsettings/debian/source/format b/ubuntu/_base/applications/themes/tde-style-domino/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/tde-systemsettings/debian/source/format
rename to ubuntu/_base/applications/themes/tde-style-domino/debian/source/format
diff --git a/ubuntu/_base/applications/tde-systemsettings/debian/source/options b/ubuntu/_base/applications/themes/tde-style-domino/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/tde-systemsettings/debian/source/options
rename to ubuntu/_base/applications/themes/tde-style-domino/debian/source/options
diff --git a/ubuntu/_base/applications/tdedocker/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/tdedocker/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/themes/tde-style-ia-ora/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/tde-systemsettings/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/tde-systemsettings/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/themes/tde-style-ia-ora/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/tde-style-ia-ora/debian/changelog b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/tde-style-ia-ora/debian/changelog
rename to ubuntu/_base/applications/themes/tde-style-ia-ora/debian/changelog
diff --git a/ubuntu/_base/applications/tdedocker/debian/compat b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/tdedocker/debian/compat
rename to ubuntu/_base/applications/themes/tde-style-ia-ora/debian/compat
diff --git a/ubuntu/_base/applications/tde-style-ia-ora/debian/control b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/control
similarity index 100%
rename from ubuntu/_base/applications/tde-style-ia-ora/debian/control
rename to ubuntu/_base/applications/themes/tde-style-ia-ora/debian/control
diff --git a/ubuntu/_base/applications/tde-style-ia-ora/debian/copyright b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/tde-style-ia-ora/debian/copyright
rename to ubuntu/_base/applications/themes/tde-style-ia-ora/debian/copyright
diff --git a/ubuntu/_base/applications/tde-style-domino/debian/patches/series b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/tde-style-domino/debian/patches/series
rename to ubuntu/_base/applications/themes/tde-style-ia-ora/debian/patches/series
diff --git a/ubuntu/_base/applications/mplayerthumbs/debian/rules b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/mplayerthumbs/debian/rules
rename to ubuntu/_base/applications/themes/tde-style-ia-ora/debian/rules
diff --git a/ubuntu/_base/applications/tdedocker/debian/source/format b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/tdedocker/debian/source/format
rename to ubuntu/_base/applications/themes/tde-style-ia-ora/debian/source/format
diff --git a/ubuntu/_base/applications/tdedocker/debian/source/options b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/tdedocker/debian/source/options
rename to ubuntu/_base/applications/themes/tde-style-ia-ora/debian/source/options
diff --git a/ubuntu/_base/applications/tdeio-apt/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/tdeio-apt/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/themes/tde-style-lipstik/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/tdeio-apt/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/tdeio-apt/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/themes/tde-style-lipstik/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/tde-style-lipstik/debian/changelog b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/tde-style-lipstik/debian/changelog
rename to ubuntu/_base/applications/themes/tde-style-lipstik/debian/changelog
diff --git a/ubuntu/_base/applications/tdeio-apt/debian/compat b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/tdeio-apt/debian/compat
rename to ubuntu/_base/applications/themes/tde-style-lipstik/debian/compat
diff --git a/ubuntu/_base/applications/tde-style-lipstik/debian/control b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/control
similarity index 100%
rename from ubuntu/_base/applications/tde-style-lipstik/debian/control
rename to ubuntu/_base/applications/themes/tde-style-lipstik/debian/control
diff --git a/ubuntu/_base/applications/tde-style-lipstik/debian/copyright b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/tde-style-lipstik/debian/copyright
rename to ubuntu/_base/applications/themes/tde-style-lipstik/debian/copyright
diff --git a/ubuntu/_base/applications/tde-style-lipstik/debian/docs b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/tde-style-lipstik/debian/docs
rename to ubuntu/_base/applications/themes/tde-style-lipstik/debian/docs
diff --git a/ubuntu/_base/applications/soundkonverter/debian/patches/.gitignore b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/patches/.gitignore
similarity index 100%
rename from ubuntu/_base/applications/soundkonverter/debian/patches/.gitignore
rename to ubuntu/_base/applications/themes/tde-style-lipstik/debian/patches/.gitignore
diff --git a/ubuntu/_base/applications/tastymenu/debian/rules b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/tastymenu/debian/rules
rename to ubuntu/_base/applications/themes/tde-style-lipstik/debian/rules
diff --git a/ubuntu/_base/applications/tdeio-apt/debian/source/format b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/tdeio-apt/debian/source/format
rename to ubuntu/_base/applications/themes/tde-style-lipstik/debian/source/format
diff --git a/ubuntu/_base/applications/tdeio-apt/debian/source/options b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/tdeio-apt/debian/source/options
rename to ubuntu/_base/applications/themes/tde-style-lipstik/debian/source/options
diff --git a/ubuntu/_base/applications/tdeio-ftps/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/tdeio-ftps/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/themes/tde-style-qtcurve/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/tdeio-ftps/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/tdeio-ftps/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/themes/tde-style-qtcurve/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/tde-style-qtcurve/debian/changelog b/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/tde-style-qtcurve/debian/changelog
rename to ubuntu/_base/applications/themes/tde-style-qtcurve/debian/changelog
diff --git a/ubuntu/_base/applications/tdeio-ftps/debian/compat b/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/tdeio-ftps/debian/compat
rename to ubuntu/_base/applications/themes/tde-style-qtcurve/debian/compat
diff --git a/ubuntu/_base/applications/tde-style-qtcurve/debian/control b/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/control
similarity index 100%
rename from ubuntu/_base/applications/tde-style-qtcurve/debian/control
rename to ubuntu/_base/applications/themes/tde-style-qtcurve/debian/control
diff --git a/ubuntu/_base/applications/tde-style-qtcurve/debian/copyright b/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/tde-style-qtcurve/debian/copyright
rename to ubuntu/_base/applications/themes/tde-style-qtcurve/debian/copyright
diff --git a/ubuntu/_base/applications/tde-style-qtcurve/debian/docs b/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/tde-style-qtcurve/debian/docs
rename to ubuntu/_base/applications/themes/tde-style-qtcurve/debian/docs
diff --git a/ubuntu/_base/applications/tdeio-gopher/debian/patches/series b/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/tdeio-gopher/debian/patches/series
rename to ubuntu/_base/applications/themes/tde-style-qtcurve/debian/patches/series
diff --git a/ubuntu/_base/applications/tde-style-qtcurve/debian/rules b/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/tde-style-qtcurve/debian/rules
rename to ubuntu/_base/applications/themes/tde-style-qtcurve/debian/rules
diff --git a/ubuntu/_base/applications/tde-style-qtcurve/debian/scan-version b/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/scan-version
similarity index 100%
rename from ubuntu/_base/applications/tde-style-qtcurve/debian/scan-version
rename to ubuntu/_base/applications/themes/tde-style-qtcurve/debian/scan-version
diff --git a/ubuntu/_base/applications/tdeio-ftps/debian/source/format b/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/tdeio-ftps/debian/source/format
rename to ubuntu/_base/applications/themes/tde-style-qtcurve/debian/source/format
diff --git a/ubuntu/_base/applications/tdeio-ftps/debian/source/options b/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/tdeio-ftps/debian/source/options
rename to ubuntu/_base/applications/themes/tde-style-qtcurve/debian/source/options
diff --git a/ubuntu/_base/applications/tde-style-qtcurve/debian/tde-style-qtcurve-trinity.install b/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/tde-style-qtcurve-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/tde-style-qtcurve/debian/tde-style-qtcurve-trinity.install
rename to ubuntu/_base/applications/themes/tde-style-qtcurve/debian/tde-style-qtcurve-trinity.install
diff --git a/ubuntu/_base/applications/tdmtheme/debian/README.Debian b/ubuntu/_base/applications/themes/tdmtheme/debian/README.Debian
similarity index 100%
rename from ubuntu/_base/applications/tdmtheme/debian/README.Debian
rename to ubuntu/_base/applications/themes/tdmtheme/debian/README.Debian
diff --git a/ubuntu/_base/applications/tdeio-gopher/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/tdmtheme/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/tdeio-gopher/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/themes/tdmtheme/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/tdeio-gopher/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/tdmtheme/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/tdeio-gopher/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/themes/tdmtheme/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/tdmtheme/debian/changelog b/ubuntu/_base/applications/themes/tdmtheme/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/tdmtheme/debian/changelog
rename to ubuntu/_base/applications/themes/tdmtheme/debian/changelog
diff --git a/ubuntu/_base/applications/tdeio-gopher/debian/compat b/ubuntu/_base/applications/themes/tdmtheme/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/tdeio-gopher/debian/compat
rename to ubuntu/_base/applications/themes/tdmtheme/debian/compat
diff --git a/ubuntu/_base/applications/tdmtheme/debian/control b/ubuntu/_base/applications/themes/tdmtheme/debian/control
similarity index 100%
rename from ubuntu/_base/applications/tdmtheme/debian/control
rename to ubuntu/_base/applications/themes/tdmtheme/debian/control
diff --git a/ubuntu/_base/applications/tdmtheme/debian/copyright b/ubuntu/_base/applications/themes/tdmtheme/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/tdmtheme/debian/copyright
rename to ubuntu/_base/applications/themes/tdmtheme/debian/copyright
diff --git a/ubuntu/_base/applications/tdeio-apt/debian/docs b/ubuntu/_base/applications/themes/tdmtheme/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/tdeio-apt/debian/docs
rename to ubuntu/_base/applications/themes/tdmtheme/debian/docs
diff --git a/ubuntu/_base/applications/tde-style-lipstik/debian/patches/.gitignore b/ubuntu/_base/applications/themes/tdmtheme/debian/patches/.gitignore
similarity index 100%
rename from ubuntu/_base/applications/tde-style-lipstik/debian/patches/.gitignore
rename to ubuntu/_base/applications/themes/tdmtheme/debian/patches/.gitignore
diff --git a/ubuntu/_base/applications/tdeio-sword/debian/rules b/ubuntu/_base/applications/themes/tdmtheme/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/tdeio-sword/debian/rules
rename to ubuntu/_base/applications/themes/tdmtheme/debian/rules
diff --git a/ubuntu/_base/applications/tdeio-gopher/debian/source/format b/ubuntu/_base/applications/themes/tdmtheme/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/tdeio-gopher/debian/source/format
rename to ubuntu/_base/applications/themes/tdmtheme/debian/source/format
diff --git a/ubuntu/_base/applications/tdeio-gopher/debian/source/options b/ubuntu/_base/applications/themes/tdmtheme/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/tdeio-gopher/debian/source/options
rename to ubuntu/_base/applications/themes/tdmtheme/debian/source/options
diff --git a/ubuntu/_base/applications/tdmtheme/debian/tdmtheme-trinity.lintian b/ubuntu/_base/applications/themes/tdmtheme/debian/tdmtheme-trinity.lintian
similarity index 100%
rename from ubuntu/_base/applications/tdmtheme/debian/tdmtheme-trinity.lintian
rename to ubuntu/_base/applications/themes/tdmtheme/debian/tdmtheme-trinity.lintian
diff --git a/ubuntu/_base/applications/tdeio-locate/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/twin-style-crystal/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/tdeio-locate/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/themes/twin-style-crystal/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/tdeio-locate/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/twin-style-crystal/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/tdeio-locate/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/themes/twin-style-crystal/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/twin-style-crystal/debian/changelog b/ubuntu/_base/applications/themes/twin-style-crystal/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/twin-style-crystal/debian/changelog
rename to ubuntu/_base/applications/themes/twin-style-crystal/debian/changelog
diff --git a/ubuntu/_base/applications/tdeio-locate/debian/compat b/ubuntu/_base/applications/themes/twin-style-crystal/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/tdeio-locate/debian/compat
rename to ubuntu/_base/applications/themes/twin-style-crystal/debian/compat
diff --git a/ubuntu/_base/applications/twin-style-crystal/debian/control b/ubuntu/_base/applications/themes/twin-style-crystal/debian/control
similarity index 100%
rename from ubuntu/_base/applications/twin-style-crystal/debian/control
rename to ubuntu/_base/applications/themes/twin-style-crystal/debian/control
diff --git a/ubuntu/_base/applications/twin-style-crystal/debian/copyright b/ubuntu/_base/applications/themes/twin-style-crystal/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/twin-style-crystal/debian/copyright
rename to ubuntu/_base/applications/themes/twin-style-crystal/debian/copyright
diff --git a/ubuntu/_base/applications/twin-style-crystal/debian/dirs b/ubuntu/_base/applications/themes/twin-style-crystal/debian/dirs
similarity index 100%
rename from ubuntu/_base/applications/twin-style-crystal/debian/dirs
rename to ubuntu/_base/applications/themes/twin-style-crystal/debian/dirs
diff --git a/ubuntu/_base/applications/kpicosim/debian/docs b/ubuntu/_base/applications/themes/twin-style-crystal/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/kpicosim/debian/docs
rename to ubuntu/_base/applications/themes/twin-style-crystal/debian/docs
diff --git a/ubuntu/_base/applications/tdeio-locate/debian/patches/series b/ubuntu/_base/applications/themes/twin-style-crystal/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/tdeio-locate/debian/patches/series
rename to ubuntu/_base/applications/themes/twin-style-crystal/debian/patches/series
diff --git a/ubuntu/_base/applications/tdeio-umountwrapper/debian/rules b/ubuntu/_base/applications/themes/twin-style-crystal/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/tdeio-umountwrapper/debian/rules
rename to ubuntu/_base/applications/themes/twin-style-crystal/debian/rules
diff --git a/ubuntu/_base/applications/tdeio-locate/debian/source/format b/ubuntu/_base/applications/themes/twin-style-crystal/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/tdeio-locate/debian/source/format
rename to ubuntu/_base/applications/themes/twin-style-crystal/debian/source/format
diff --git a/ubuntu/_base/applications/tdeio-locate/debian/source/options b/ubuntu/_base/applications/themes/twin-style-crystal/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/tdeio-locate/debian/source/options
rename to ubuntu/_base/applications/themes/twin-style-crystal/debian/source/options
diff --git a/ubuntu/_base/applications/tdeio-sword/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/twin-style-suse2/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/tdeio-sword/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/themes/twin-style-suse2/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/tdeio-sword/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/twin-style-suse2/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/tdeio-sword/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/themes/twin-style-suse2/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/twin-style-suse2/debian/changelog b/ubuntu/_base/applications/themes/twin-style-suse2/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/twin-style-suse2/debian/changelog
rename to ubuntu/_base/applications/themes/twin-style-suse2/debian/changelog
diff --git a/ubuntu/_base/applications/tdeio-sword/debian/compat b/ubuntu/_base/applications/themes/twin-style-suse2/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/tdeio-sword/debian/compat
rename to ubuntu/_base/applications/themes/twin-style-suse2/debian/compat
diff --git a/ubuntu/_base/applications/twin-style-suse2/debian/control b/ubuntu/_base/applications/themes/twin-style-suse2/debian/control
similarity index 100%
rename from ubuntu/_base/applications/twin-style-suse2/debian/control
rename to ubuntu/_base/applications/themes/twin-style-suse2/debian/control
diff --git a/ubuntu/_base/applications/twin-style-suse2/debian/copyright b/ubuntu/_base/applications/themes/twin-style-suse2/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/twin-style-suse2/debian/copyright
rename to ubuntu/_base/applications/themes/twin-style-suse2/debian/copyright
diff --git a/ubuntu/_base/applications/tdeio-umountwrapper/debian/patches/series b/ubuntu/_base/applications/themes/twin-style-suse2/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/tdeio-umountwrapper/debian/patches/series
rename to ubuntu/_base/applications/themes/twin-style-suse2/debian/patches/series
diff --git a/ubuntu/_base/applications/tdesudo/debian/rules b/ubuntu/_base/applications/themes/twin-style-suse2/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/tdesudo/debian/rules
rename to ubuntu/_base/applications/themes/twin-style-suse2/debian/rules
diff --git a/ubuntu/_base/applications/tdeio-sword/debian/source/format b/ubuntu/_base/applications/themes/twin-style-suse2/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/tdeio-sword/debian/source/format
rename to ubuntu/_base/applications/themes/twin-style-suse2/debian/source/format
diff --git a/ubuntu/_base/applications/tdeio-sword/debian/source/options b/ubuntu/_base/applications/themes/twin-style-suse2/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/tdeio-sword/debian/source/options
rename to ubuntu/_base/applications/themes/twin-style-suse2/debian/source/options
diff --git a/ubuntu/_base/applications/abakus/debian/abakus-trinity.manpages b/ubuntu/_base/applications/utilities/abakus/debian/abakus-trinity.manpages
similarity index 100%
rename from ubuntu/_base/applications/abakus/debian/abakus-trinity.manpages
rename to ubuntu/_base/applications/utilities/abakus/debian/abakus-trinity.manpages
diff --git a/ubuntu/_base/applications/abakus/debian/abakus-trinity.menu b/ubuntu/_base/applications/utilities/abakus/debian/abakus-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/abakus/debian/abakus-trinity.menu
rename to ubuntu/_base/applications/utilities/abakus/debian/abakus-trinity.menu
diff --git a/ubuntu/_base/applications/abakus/debian/abakus.1 b/ubuntu/_base/applications/utilities/abakus/debian/abakus.1
similarity index 100%
rename from ubuntu/_base/applications/abakus/debian/abakus.1
rename to ubuntu/_base/applications/utilities/abakus/debian/abakus.1
diff --git a/ubuntu/_base/applications/tdeio-umountwrapper/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/abakus/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/tdeio-umountwrapper/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/utilities/abakus/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/tdeio-umountwrapper/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/abakus/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/tdeio-umountwrapper/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/utilities/abakus/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/abakus/debian/changelog b/ubuntu/_base/applications/utilities/abakus/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/abakus/debian/changelog
rename to ubuntu/_base/applications/utilities/abakus/debian/changelog
diff --git a/ubuntu/_base/applications/tdeio-umountwrapper/debian/compat b/ubuntu/_base/applications/utilities/abakus/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/tdeio-umountwrapper/debian/compat
rename to ubuntu/_base/applications/utilities/abakus/debian/compat
diff --git a/ubuntu/_base/applications/abakus/debian/control b/ubuntu/_base/applications/utilities/abakus/debian/control
similarity index 100%
rename from ubuntu/_base/applications/abakus/debian/control
rename to ubuntu/_base/applications/utilities/abakus/debian/control
diff --git a/ubuntu/_base/applications/abakus/debian/copyright b/ubuntu/_base/applications/utilities/abakus/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/abakus/debian/copyright
rename to ubuntu/_base/applications/utilities/abakus/debian/copyright
diff --git a/ubuntu/_base/applications/soundkonverter/debian/docs b/ubuntu/_base/applications/utilities/abakus/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/soundkonverter/debian/docs
rename to ubuntu/_base/applications/utilities/abakus/debian/docs
diff --git a/ubuntu/_base/applications/tdenetworkmanager/debian/patches/series b/ubuntu/_base/applications/utilities/abakus/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/tdenetworkmanager/debian/patches/series
rename to ubuntu/_base/applications/utilities/abakus/debian/patches/series
diff --git a/ubuntu/_base/applications/abakus/debian/rules b/ubuntu/_base/applications/utilities/abakus/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/abakus/debian/rules
rename to ubuntu/_base/applications/utilities/abakus/debian/rules
diff --git a/ubuntu/_base/applications/tdeio-umountwrapper/debian/source/format b/ubuntu/_base/applications/utilities/abakus/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/tdeio-umountwrapper/debian/source/format
rename to ubuntu/_base/applications/utilities/abakus/debian/source/format
diff --git a/ubuntu/_base/applications/tdeio-umountwrapper/debian/source/options b/ubuntu/_base/applications/utilities/abakus/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/tdeio-umountwrapper/debian/source/options
rename to ubuntu/_base/applications/utilities/abakus/debian/source/options
diff --git a/ubuntu/_base/applications/tdenetworkmanager/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/filelight/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/tdenetworkmanager/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/utilities/filelight/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/tdenetworkmanager/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/filelight/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/tdenetworkmanager/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/utilities/filelight/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/filelight/debian/changelog b/ubuntu/_base/applications/utilities/filelight/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/filelight/debian/changelog
rename to ubuntu/_base/applications/utilities/filelight/debian/changelog
diff --git a/ubuntu/_base/applications/tdenetworkmanager/debian/compat b/ubuntu/_base/applications/utilities/filelight/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/tdenetworkmanager/debian/compat
rename to ubuntu/_base/applications/utilities/filelight/debian/compat
diff --git a/ubuntu/_base/applications/filelight/debian/control b/ubuntu/_base/applications/utilities/filelight/debian/control
similarity index 100%
rename from ubuntu/_base/applications/filelight/debian/control
rename to ubuntu/_base/applications/utilities/filelight/debian/control
diff --git a/ubuntu/_base/applications/filelight/debian/copyright b/ubuntu/_base/applications/utilities/filelight/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/filelight/debian/copyright
rename to ubuntu/_base/applications/utilities/filelight/debian/copyright
diff --git a/ubuntu/_base/applications/filelight/debian/menu b/ubuntu/_base/applications/utilities/filelight/debian/menu
similarity index 100%
rename from ubuntu/_base/applications/filelight/debian/menu
rename to ubuntu/_base/applications/utilities/filelight/debian/menu
diff --git a/ubuntu/_base/applications/tdepacman/debian/patches/series b/ubuntu/_base/applications/utilities/filelight/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/tdepacman/debian/patches/series
rename to ubuntu/_base/applications/utilities/filelight/debian/patches/series
diff --git a/ubuntu/_base/applications/filelight/debian/rules b/ubuntu/_base/applications/utilities/filelight/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/filelight/debian/rules
rename to ubuntu/_base/applications/utilities/filelight/debian/rules
diff --git a/ubuntu/_base/applications/tdenetworkmanager/debian/source/format b/ubuntu/_base/applications/utilities/filelight/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/tdenetworkmanager/debian/source/format
rename to ubuntu/_base/applications/utilities/filelight/debian/source/format
diff --git a/ubuntu/_base/applications/tdenetworkmanager/debian/source/options b/ubuntu/_base/applications/utilities/filelight/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/tdenetworkmanager/debian/source/options
rename to ubuntu/_base/applications/utilities/filelight/debian/source/options
diff --git a/ubuntu/_base/applications/wlassistant/debian/README.Debian b/ubuntu/_base/applications/utilities/kbarcode/debian/README.Debian
similarity index 100%
rename from ubuntu/_base/applications/wlassistant/debian/README.Debian
rename to ubuntu/_base/applications/utilities/kbarcode/debian/README.Debian
diff --git a/ubuntu/_base/applications/tdepacman/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/kbarcode/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/tdepacman/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/utilities/kbarcode/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/tdepacman/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/kbarcode/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/tdepacman/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/utilities/kbarcode/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kbarcode/debian/changelog b/ubuntu/_base/applications/utilities/kbarcode/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kbarcode/debian/changelog
rename to ubuntu/_base/applications/utilities/kbarcode/debian/changelog
diff --git a/ubuntu/_base/applications/tdepacman/debian/compat b/ubuntu/_base/applications/utilities/kbarcode/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/tdepacman/debian/compat
rename to ubuntu/_base/applications/utilities/kbarcode/debian/compat
diff --git a/ubuntu/_base/applications/kbarcode/debian/control b/ubuntu/_base/applications/utilities/kbarcode/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kbarcode/debian/control
rename to ubuntu/_base/applications/utilities/kbarcode/debian/control
diff --git a/ubuntu/_base/applications/kbarcode/debian/copyright b/ubuntu/_base/applications/utilities/kbarcode/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kbarcode/debian/copyright
rename to ubuntu/_base/applications/utilities/kbarcode/debian/copyright
diff --git a/ubuntu/_base/applications/tdepacman/debian/docs b/ubuntu/_base/applications/utilities/kbarcode/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/tdepacman/debian/docs
rename to ubuntu/_base/applications/utilities/kbarcode/debian/docs
diff --git a/ubuntu/_base/applications/kbarcode/debian/menu b/ubuntu/_base/applications/utilities/kbarcode/debian/menu
similarity index 100%
rename from ubuntu/_base/applications/kbarcode/debian/menu
rename to ubuntu/_base/applications/utilities/kbarcode/debian/menu
diff --git a/ubuntu/_base/applications/tdmtheme/debian/patches/.gitignore b/ubuntu/_base/applications/utilities/kbarcode/debian/patches/.gitignore
similarity index 100%
rename from ubuntu/_base/applications/tdmtheme/debian/patches/.gitignore
rename to ubuntu/_base/applications/utilities/kbarcode/debian/patches/.gitignore
diff --git a/ubuntu/_base/applications/tde-style-ia-ora/debian/rules b/ubuntu/_base/applications/utilities/kbarcode/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/tde-style-ia-ora/debian/rules
rename to ubuntu/_base/applications/utilities/kbarcode/debian/rules
diff --git a/ubuntu/_base/applications/tdepacman/debian/source/format b/ubuntu/_base/applications/utilities/kbarcode/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/tdepacman/debian/source/format
rename to ubuntu/_base/applications/utilities/kbarcode/debian/source/format
diff --git a/ubuntu/_base/applications/tdepacman/debian/source/options b/ubuntu/_base/applications/utilities/kbarcode/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/tdepacman/debian/source/options
rename to ubuntu/_base/applications/utilities/kbarcode/debian/source/options
diff --git a/ubuntu/_base/applications/tdepowersave/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/kchmviewer/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/tdepowersave/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/utilities/kchmviewer/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/tdepowersave/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/kchmviewer/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/tdepowersave/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/utilities/kchmviewer/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kchmviewer/debian/changelog b/ubuntu/_base/applications/utilities/kchmviewer/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kchmviewer/debian/changelog
rename to ubuntu/_base/applications/utilities/kchmviewer/debian/changelog
diff --git a/ubuntu/_base/applications/tdepowersave/debian/compat b/ubuntu/_base/applications/utilities/kchmviewer/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/tdepowersave/debian/compat
rename to ubuntu/_base/applications/utilities/kchmviewer/debian/compat
diff --git a/ubuntu/_base/applications/kchmviewer/debian/control b/ubuntu/_base/applications/utilities/kchmviewer/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kchmviewer/debian/control
rename to ubuntu/_base/applications/utilities/kchmviewer/debian/control
diff --git a/ubuntu/_base/applications/kchmviewer/debian/copyright b/ubuntu/_base/applications/utilities/kchmviewer/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kchmviewer/debian/copyright
rename to ubuntu/_base/applications/utilities/kchmviewer/debian/copyright
diff --git a/ubuntu/_base/applications/kchmviewer/debian/dirs b/ubuntu/_base/applications/utilities/kchmviewer/debian/dirs
similarity index 100%
rename from ubuntu/_base/applications/kchmviewer/debian/dirs
rename to ubuntu/_base/applications/utilities/kchmviewer/debian/dirs
diff --git a/ubuntu/_base/applications/kchmviewer/debian/docs b/ubuntu/_base/applications/utilities/kchmviewer/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/kchmviewer/debian/docs
rename to ubuntu/_base/applications/utilities/kchmviewer/debian/docs
diff --git a/ubuntu/_base/applications/kchmviewer/debian/kchmviewer-trinity.menu b/ubuntu/_base/applications/utilities/kchmviewer/debian/kchmviewer-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/kchmviewer/debian/kchmviewer-trinity.menu
rename to ubuntu/_base/applications/utilities/kchmviewer/debian/kchmviewer-trinity.menu
diff --git a/ubuntu/_base/applications/yakuake/debian/patches/.gitignore b/ubuntu/_base/applications/utilities/kchmviewer/debian/patches/.gitignore
similarity index 100%
rename from ubuntu/_base/applications/yakuake/debian/patches/.gitignore
rename to ubuntu/_base/applications/utilities/kchmviewer/debian/patches/.gitignore
diff --git a/ubuntu/_base/applications/tde-style-lipstik/debian/rules b/ubuntu/_base/applications/utilities/kchmviewer/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/tde-style-lipstik/debian/rules
rename to ubuntu/_base/applications/utilities/kchmviewer/debian/rules
diff --git a/ubuntu/_base/applications/tdepowersave/debian/source/format b/ubuntu/_base/applications/utilities/kchmviewer/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/tdepowersave/debian/source/format
rename to ubuntu/_base/applications/utilities/kchmviewer/debian/source/format
diff --git a/ubuntu/_base/applications/tdepowersave/debian/source/options b/ubuntu/_base/applications/utilities/kchmviewer/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/tdepowersave/debian/source/options
rename to ubuntu/_base/applications/utilities/kchmviewer/debian/source/options
diff --git a/ubuntu/_base/applications/tdesudo/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/kcpuload/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/tdesudo/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/utilities/kcpuload/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/tdesudo/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/kcpuload/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/tdesudo/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/utilities/kcpuload/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kcpuload/debian/changelog b/ubuntu/_base/applications/utilities/kcpuload/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kcpuload/debian/changelog
rename to ubuntu/_base/applications/utilities/kcpuload/debian/changelog
diff --git a/ubuntu/_base/applications/tderadio/debian/compat b/ubuntu/_base/applications/utilities/kcpuload/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/tderadio/debian/compat
rename to ubuntu/_base/applications/utilities/kcpuload/debian/compat
diff --git a/ubuntu/_base/applications/kcpuload/debian/control b/ubuntu/_base/applications/utilities/kcpuload/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kcpuload/debian/control
rename to ubuntu/_base/applications/utilities/kcpuload/debian/control
diff --git a/ubuntu/_base/applications/kcpuload/debian/copyright b/ubuntu/_base/applications/utilities/kcpuload/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kcpuload/debian/copyright
rename to ubuntu/_base/applications/utilities/kcpuload/debian/copyright
diff --git a/ubuntu/_base/applications/kcpuload/debian/doc-base b/ubuntu/_base/applications/utilities/kcpuload/debian/doc-base
similarity index 100%
rename from ubuntu/_base/applications/kcpuload/debian/doc-base
rename to ubuntu/_base/applications/utilities/kcpuload/debian/doc-base
diff --git a/ubuntu/_base/applications/tdesudo/debian/docs b/ubuntu/_base/applications/utilities/kcpuload/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/tdesudo/debian/docs
rename to ubuntu/_base/applications/utilities/kcpuload/debian/docs
diff --git a/ubuntu/_base/applications/kcpuload/debian/kcpuload-trinity.install b/ubuntu/_base/applications/utilities/kcpuload/debian/kcpuload-trinity.install
similarity index 100%
rename from ubuntu/_base/applications/kcpuload/debian/kcpuload-trinity.install
rename to ubuntu/_base/applications/utilities/kcpuload/debian/kcpuload-trinity.install
diff --git a/ubuntu/_base/applications/kcpuload/debian/kcpuload-trinity.lintian b/ubuntu/_base/applications/utilities/kcpuload/debian/kcpuload-trinity.lintian
similarity index 100%
rename from ubuntu/_base/applications/kcpuload/debian/kcpuload-trinity.lintian
rename to ubuntu/_base/applications/utilities/kcpuload/debian/kcpuload-trinity.lintian
diff --git a/ubuntu/_base/applications/kcpuload/debian/kcpuload.xpm b/ubuntu/_base/applications/utilities/kcpuload/debian/kcpuload.xpm
similarity index 100%
rename from ubuntu/_base/applications/kcpuload/debian/kcpuload.xpm
rename to ubuntu/_base/applications/utilities/kcpuload/debian/kcpuload.xpm
diff --git a/ubuntu/_base/applications/kcpuload/debian/links b/ubuntu/_base/applications/utilities/kcpuload/debian/links
similarity index 100%
rename from ubuntu/_base/applications/kcpuload/debian/links
rename to ubuntu/_base/applications/utilities/kcpuload/debian/links
diff --git a/ubuntu/_base/applications/kcpuload/debian/menu b/ubuntu/_base/applications/utilities/kcpuload/debian/menu
similarity index 100%
rename from ubuntu/_base/applications/kcpuload/debian/menu
rename to ubuntu/_base/applications/utilities/kcpuload/debian/menu
diff --git a/ubuntu/_base/applications/kcpuload/debian/rules b/ubuntu/_base/applications/utilities/kcpuload/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/kcpuload/debian/rules
rename to ubuntu/_base/applications/utilities/kcpuload/debian/rules
diff --git a/ubuntu/_base/applications/tderadio/debian/source/format b/ubuntu/_base/applications/utilities/kcpuload/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/tderadio/debian/source/format
rename to ubuntu/_base/applications/utilities/kcpuload/debian/source/format
diff --git a/ubuntu/_base/applications/tderadio/debian/source/options b/ubuntu/_base/applications/utilities/kcpuload/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/tderadio/debian/source/options
rename to ubuntu/_base/applications/utilities/kcpuload/debian/source/options
diff --git a/ubuntu/_base/applications/tdesvn/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/kdirstat/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/tdesvn/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/utilities/kdirstat/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/tdesvn/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/kdirstat/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/tdesvn/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/utilities/kdirstat/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kdirstat/debian/changelog b/ubuntu/_base/applications/utilities/kdirstat/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kdirstat/debian/changelog
rename to ubuntu/_base/applications/utilities/kdirstat/debian/changelog
diff --git a/ubuntu/_base/applications/tdesudo/debian/compat b/ubuntu/_base/applications/utilities/kdirstat/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/tdesudo/debian/compat
rename to ubuntu/_base/applications/utilities/kdirstat/debian/compat
diff --git a/ubuntu/_base/applications/kdirstat/debian/control b/ubuntu/_base/applications/utilities/kdirstat/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kdirstat/debian/control
rename to ubuntu/_base/applications/utilities/kdirstat/debian/control
diff --git a/ubuntu/_base/applications/kdirstat/debian/copyright b/ubuntu/_base/applications/utilities/kdirstat/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kdirstat/debian/copyright
rename to ubuntu/_base/applications/utilities/kdirstat/debian/copyright
diff --git a/ubuntu/_base/applications/kdirstat/debian/docs b/ubuntu/_base/applications/utilities/kdirstat/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/kdirstat/debian/docs
rename to ubuntu/_base/applications/utilities/kdirstat/debian/docs
diff --git a/ubuntu/_base/applications/tdepowersave/debian/patches/series b/ubuntu/_base/applications/utilities/kdirstat/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/tdepowersave/debian/patches/series
rename to ubuntu/_base/applications/utilities/kdirstat/debian/patches/series
diff --git a/ubuntu/_base/applications/tdmtheme/debian/rules b/ubuntu/_base/applications/utilities/kdirstat/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/tdmtheme/debian/rules
rename to ubuntu/_base/applications/utilities/kdirstat/debian/rules
diff --git a/ubuntu/_base/applications/tdesudo/debian/source/format b/ubuntu/_base/applications/utilities/kdirstat/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/tdesudo/debian/source/format
rename to ubuntu/_base/applications/utilities/kdirstat/debian/source/format
diff --git a/ubuntu/_base/applications/tdesudo/debian/source/options b/ubuntu/_base/applications/utilities/kdirstat/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/tdesudo/debian/source/options
rename to ubuntu/_base/applications/utilities/kdirstat/debian/source/options
diff --git a/ubuntu/_base/applications/tdmtheme/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/keep/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/tdmtheme/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/utilities/keep/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/tdmtheme/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/keep/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/tdmtheme/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/utilities/keep/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/keep/debian/changelog b/ubuntu/_base/applications/utilities/keep/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/keep/debian/changelog
rename to ubuntu/_base/applications/utilities/keep/debian/changelog
diff --git a/ubuntu/_base/applications/tdesvn/debian/compat b/ubuntu/_base/applications/utilities/keep/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/tdesvn/debian/compat
rename to ubuntu/_base/applications/utilities/keep/debian/compat
diff --git a/ubuntu/_base/applications/keep/debian/control b/ubuntu/_base/applications/utilities/keep/debian/control
similarity index 100%
rename from ubuntu/_base/applications/keep/debian/control
rename to ubuntu/_base/applications/utilities/keep/debian/control
diff --git a/ubuntu/_base/applications/keep/debian/copyright b/ubuntu/_base/applications/utilities/keep/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/keep/debian/copyright
rename to ubuntu/_base/applications/utilities/keep/debian/copyright
diff --git a/ubuntu/_base/applications/tdesvn/debian/docs b/ubuntu/_base/applications/utilities/keep/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/tdesvn/debian/docs
rename to ubuntu/_base/applications/utilities/keep/debian/docs
diff --git a/ubuntu/_base/applications/tdesudo/debian/patches/series b/ubuntu/_base/applications/utilities/keep/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/tdesudo/debian/patches/series
rename to ubuntu/_base/applications/utilities/keep/debian/patches/series
diff --git a/ubuntu/_base/applications/tdenetworkmanager/debian/rules b/ubuntu/_base/applications/utilities/keep/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/tdenetworkmanager/debian/rules
rename to ubuntu/_base/applications/utilities/keep/debian/rules
diff --git a/ubuntu/_base/applications/tdesvn/debian/source/format b/ubuntu/_base/applications/utilities/keep/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/tdesvn/debian/source/format
rename to ubuntu/_base/applications/utilities/keep/debian/source/format
diff --git a/ubuntu/_base/applications/tdesvn/debian/source/options b/ubuntu/_base/applications/utilities/keep/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/tdesvn/debian/source/options
rename to ubuntu/_base/applications/utilities/keep/debian/source/options
diff --git a/ubuntu/_base/applications/tellico/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/knutclient/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/tellico/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/utilities/knutclient/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/tellico/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/knutclient/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/tellico/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/utilities/knutclient/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/knutclient/debian/changelog b/ubuntu/_base/applications/utilities/knutclient/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/knutclient/debian/changelog
rename to ubuntu/_base/applications/utilities/knutclient/debian/changelog
diff --git a/ubuntu/_base/applications/tdmtheme/debian/compat b/ubuntu/_base/applications/utilities/knutclient/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/tdmtheme/debian/compat
rename to ubuntu/_base/applications/utilities/knutclient/debian/compat
diff --git a/ubuntu/_base/applications/knutclient/debian/control b/ubuntu/_base/applications/utilities/knutclient/debian/control
similarity index 100%
rename from ubuntu/_base/applications/knutclient/debian/control
rename to ubuntu/_base/applications/utilities/knutclient/debian/control
diff --git a/ubuntu/_base/applications/knutclient/debian/copyright b/ubuntu/_base/applications/utilities/knutclient/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/knutclient/debian/copyright
rename to ubuntu/_base/applications/utilities/knutclient/debian/copyright
diff --git a/ubuntu/_base/applications/twin-style-crystal/debian/docs b/ubuntu/_base/applications/utilities/knutclient/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/twin-style-crystal/debian/docs
rename to ubuntu/_base/applications/utilities/knutclient/debian/docs
diff --git a/ubuntu/_base/applications/knutclient/debian/knutclient-trinity.menu b/ubuntu/_base/applications/utilities/knutclient/debian/knutclient-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/knutclient/debian/knutclient-trinity.menu
rename to ubuntu/_base/applications/utilities/knutclient/debian/knutclient-trinity.menu
diff --git a/ubuntu/_base/applications/twin-style-crystal/debian/rules b/ubuntu/_base/applications/utilities/knutclient/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/twin-style-crystal/debian/rules
rename to ubuntu/_base/applications/utilities/knutclient/debian/rules
diff --git a/ubuntu/_base/applications/tdmtheme/debian/source/format b/ubuntu/_base/applications/utilities/knutclient/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/tdmtheme/debian/source/format
rename to ubuntu/_base/applications/utilities/knutclient/debian/source/format
diff --git a/ubuntu/_base/applications/tdmtheme/debian/source/options b/ubuntu/_base/applications/utilities/knutclient/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/tdmtheme/debian/source/options
rename to ubuntu/_base/applications/utilities/knutclient/debian/source/options
diff --git a/ubuntu/_base/applications/tork/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/kompose/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/tork/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/utilities/kompose/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/tork/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/kompose/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/tork/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/utilities/kompose/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kompose/debian/changelog b/ubuntu/_base/applications/utilities/kompose/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/kompose/debian/changelog
rename to ubuntu/_base/applications/utilities/kompose/debian/changelog
diff --git a/ubuntu/_base/applications/tellico/debian/compat b/ubuntu/_base/applications/utilities/kompose/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/tellico/debian/compat
rename to ubuntu/_base/applications/utilities/kompose/debian/compat
diff --git a/ubuntu/_base/applications/kompose/debian/control b/ubuntu/_base/applications/utilities/kompose/debian/control
similarity index 100%
rename from ubuntu/_base/applications/kompose/debian/control
rename to ubuntu/_base/applications/utilities/kompose/debian/control
diff --git a/ubuntu/_base/applications/kompose/debian/copyright b/ubuntu/_base/applications/utilities/kompose/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/kompose/debian/copyright
rename to ubuntu/_base/applications/utilities/kompose/debian/copyright
diff --git a/ubuntu/_base/applications/tdeio-umountwrapper/debian/docs b/ubuntu/_base/applications/utilities/kompose/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/tdeio-umountwrapper/debian/docs
rename to ubuntu/_base/applications/utilities/kompose/debian/docs
diff --git a/ubuntu/_base/applications/kompose/debian/kompose-trinity.menu b/ubuntu/_base/applications/utilities/kompose/debian/kompose-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/kompose/debian/kompose-trinity.menu
rename to ubuntu/_base/applications/utilities/kompose/debian/kompose-trinity.menu
diff --git a/ubuntu/_base/applications/tdesvn/debian/patches/series b/ubuntu/_base/applications/utilities/kompose/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/tdesvn/debian/patches/series
rename to ubuntu/_base/applications/utilities/kompose/debian/patches/series
diff --git a/ubuntu/_base/applications/tdepacman/debian/rules b/ubuntu/_base/applications/utilities/kompose/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/tdepacman/debian/rules
rename to ubuntu/_base/applications/utilities/kompose/debian/rules
diff --git a/ubuntu/_base/applications/tellico/debian/source/format b/ubuntu/_base/applications/utilities/kompose/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/tellico/debian/source/format
rename to ubuntu/_base/applications/utilities/kompose/debian/source/format
diff --git a/ubuntu/_base/applications/tellico/debian/source/options b/ubuntu/_base/applications/utilities/kompose/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/tellico/debian/source/options
rename to ubuntu/_base/applications/utilities/kompose/debian/source/options
diff --git a/ubuntu/_base/applications/twin-style-crystal/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/krename/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/twin-style-crystal/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/utilities/krename/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/twin-style-crystal/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/krename/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/twin-style-crystal/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/utilities/krename/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/krename/debian/changelog b/ubuntu/_base/applications/utilities/krename/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/krename/debian/changelog
rename to ubuntu/_base/applications/utilities/krename/debian/changelog
diff --git a/ubuntu/_base/applications/tork/debian/compat b/ubuntu/_base/applications/utilities/krename/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/tork/debian/compat
rename to ubuntu/_base/applications/utilities/krename/debian/compat
diff --git a/ubuntu/_base/applications/krename/debian/control b/ubuntu/_base/applications/utilities/krename/debian/control
similarity index 100%
rename from ubuntu/_base/applications/krename/debian/control
rename to ubuntu/_base/applications/utilities/krename/debian/control
diff --git a/ubuntu/_base/applications/krename/debian/copyright b/ubuntu/_base/applications/utilities/krename/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/krename/debian/copyright
rename to ubuntu/_base/applications/utilities/krename/debian/copyright
diff --git a/ubuntu/_base/applications/tork/debian/docs b/ubuntu/_base/applications/utilities/krename/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/tork/debian/docs
rename to ubuntu/_base/applications/utilities/krename/debian/docs
diff --git a/ubuntu/_base/applications/twin-style-crystal/debian/patches/series b/ubuntu/_base/applications/utilities/krename/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/twin-style-crystal/debian/patches/series
rename to ubuntu/_base/applications/utilities/krename/debian/patches/series
diff --git a/ubuntu/_base/applications/twin-style-suse2/debian/rules b/ubuntu/_base/applications/utilities/krename/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/twin-style-suse2/debian/rules
rename to ubuntu/_base/applications/utilities/krename/debian/rules
diff --git a/ubuntu/_base/applications/tork/debian/source/format b/ubuntu/_base/applications/utilities/krename/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/tork/debian/source/format
rename to ubuntu/_base/applications/utilities/krename/debian/source/format
diff --git a/ubuntu/_base/applications/tork/debian/source/options b/ubuntu/_base/applications/utilities/krename/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/tork/debian/source/options
rename to ubuntu/_base/applications/utilities/krename/debian/source/options
diff --git a/ubuntu/_base/applications/twin-style-suse2/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/ksensors/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/twin-style-suse2/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/utilities/ksensors/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/twin-style-suse2/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/ksensors/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/twin-style-suse2/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/utilities/ksensors/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/ksensors/debian/changelog b/ubuntu/_base/applications/utilities/ksensors/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/ksensors/debian/changelog
rename to ubuntu/_base/applications/utilities/ksensors/debian/changelog
diff --git a/ubuntu/_base/applications/twin-style-crystal/debian/compat b/ubuntu/_base/applications/utilities/ksensors/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/twin-style-crystal/debian/compat
rename to ubuntu/_base/applications/utilities/ksensors/debian/compat
diff --git a/ubuntu/_base/applications/ksensors/debian/control b/ubuntu/_base/applications/utilities/ksensors/debian/control
similarity index 100%
rename from ubuntu/_base/applications/ksensors/debian/control
rename to ubuntu/_base/applications/utilities/ksensors/debian/control
diff --git a/ubuntu/_base/applications/ksensors/debian/copyright b/ubuntu/_base/applications/utilities/ksensors/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/ksensors/debian/copyright
rename to ubuntu/_base/applications/utilities/ksensors/debian/copyright
diff --git a/ubuntu/_base/applications/ksensors/debian/dirs b/ubuntu/_base/applications/utilities/ksensors/debian/dirs
similarity index 100%
rename from ubuntu/_base/applications/ksensors/debian/dirs
rename to ubuntu/_base/applications/utilities/ksensors/debian/dirs
diff --git a/ubuntu/_base/applications/yakuake/debian/docs b/ubuntu/_base/applications/utilities/ksensors/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/yakuake/debian/docs
rename to ubuntu/_base/applications/utilities/ksensors/debian/docs
diff --git a/ubuntu/_base/applications/ksensors/debian/ksensors-trinity.menu b/ubuntu/_base/applications/utilities/ksensors/debian/ksensors-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/ksensors/debian/ksensors-trinity.menu
rename to ubuntu/_base/applications/utilities/ksensors/debian/ksensors-trinity.menu
diff --git a/ubuntu/_base/applications/twin-style-suse2/debian/patches/series b/ubuntu/_base/applications/utilities/ksensors/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/twin-style-suse2/debian/patches/series
rename to ubuntu/_base/applications/utilities/ksensors/debian/patches/series
diff --git a/ubuntu/_base/applications/ksensors/debian/rules b/ubuntu/_base/applications/utilities/ksensors/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/ksensors/debian/rules
rename to ubuntu/_base/applications/utilities/ksensors/debian/rules
diff --git a/ubuntu/_base/applications/twin-style-crystal/debian/source/format b/ubuntu/_base/applications/utilities/ksensors/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/twin-style-crystal/debian/source/format
rename to ubuntu/_base/applications/utilities/ksensors/debian/source/format
diff --git a/ubuntu/_base/applications/twin-style-crystal/debian/source/options b/ubuntu/_base/applications/utilities/ksensors/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/twin-style-crystal/debian/source/options
rename to ubuntu/_base/applications/utilities/ksensors/debian/source/options
diff --git a/ubuntu/_base/applications/wlassistant/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/mathemagics/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/wlassistant/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/utilities/mathemagics/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/wlassistant/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/mathemagics/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/wlassistant/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/utilities/mathemagics/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/mathemagics/debian/changelog b/ubuntu/_base/applications/utilities/mathemagics/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/mathemagics/debian/changelog
rename to ubuntu/_base/applications/utilities/mathemagics/debian/changelog
diff --git a/ubuntu/_base/applications/twin-style-suse2/debian/compat b/ubuntu/_base/applications/utilities/mathemagics/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/twin-style-suse2/debian/compat
rename to ubuntu/_base/applications/utilities/mathemagics/debian/compat
diff --git a/ubuntu/_base/applications/mathemagics/debian/control b/ubuntu/_base/applications/utilities/mathemagics/debian/control
similarity index 100%
rename from ubuntu/_base/applications/mathemagics/debian/control
rename to ubuntu/_base/applications/utilities/mathemagics/debian/control
diff --git a/ubuntu/_base/applications/mathemagics/debian/copyright b/ubuntu/_base/applications/utilities/mathemagics/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/mathemagics/debian/copyright
rename to ubuntu/_base/applications/utilities/mathemagics/debian/copyright
diff --git a/ubuntu/_base/applications/tdmtheme/debian/docs b/ubuntu/_base/applications/utilities/mathemagics/debian/docs
similarity index 100%
rename from ubuntu/_base/applications/tdmtheme/debian/docs
rename to ubuntu/_base/applications/utilities/mathemagics/debian/docs
diff --git a/ubuntu/_base/applications/wlassistant/debian/patches/series b/ubuntu/_base/applications/utilities/mathemagics/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/wlassistant/debian/patches/series
rename to ubuntu/_base/applications/utilities/mathemagics/debian/patches/series
diff --git a/ubuntu/_base/applications/yakuake/debian/rules b/ubuntu/_base/applications/utilities/mathemagics/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/yakuake/debian/rules
rename to ubuntu/_base/applications/utilities/mathemagics/debian/rules
diff --git a/ubuntu/_base/applications/twin-style-suse2/debian/source/format b/ubuntu/_base/applications/utilities/mathemagics/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/twin-style-suse2/debian/source/format
rename to ubuntu/_base/applications/utilities/mathemagics/debian/source/format
diff --git a/ubuntu/_base/applications/twin-style-suse2/debian/source/options b/ubuntu/_base/applications/utilities/mathemagics/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/twin-style-suse2/debian/source/options
rename to ubuntu/_base/applications/utilities/mathemagics/debian/source/options
diff --git a/ubuntu/_base/applications/yakuake/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/qalculate-tde/debian/cdbs/debian-tde.mk
similarity index 100%
rename from ubuntu/_base/applications/yakuake/debian/cdbs/debian-tde.mk
rename to ubuntu/_base/applications/utilities/qalculate-tde/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/yakuake/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/qalculate-tde/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/_base/applications/yakuake/debian/cdbs/versions.pl
rename to ubuntu/_base/applications/utilities/qalculate-tde/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/qalculate-tde/debian/changelog b/ubuntu/_base/applications/utilities/qalculate-tde/debian/changelog
similarity index 100%
rename from ubuntu/_base/applications/qalculate-tde/debian/changelog
rename to ubuntu/_base/applications/utilities/qalculate-tde/debian/changelog
diff --git a/ubuntu/_base/applications/wlassistant/debian/compat b/ubuntu/_base/applications/utilities/qalculate-tde/debian/compat
similarity index 100%
rename from ubuntu/_base/applications/wlassistant/debian/compat
rename to ubuntu/_base/applications/utilities/qalculate-tde/debian/compat
diff --git a/ubuntu/_base/applications/qalculate-tde/debian/control b/ubuntu/_base/applications/utilities/qalculate-tde/debian/control
similarity index 100%
rename from ubuntu/_base/applications/qalculate-tde/debian/control
rename to ubuntu/_base/applications/utilities/qalculate-tde/debian/control
diff --git a/ubuntu/_base/applications/qalculate-tde/debian/copyright b/ubuntu/_base/applications/utilities/qalculate-tde/debian/copyright
similarity index 100%
rename from ubuntu/_base/applications/qalculate-tde/debian/copyright
rename to ubuntu/_base/applications/utilities/qalculate-tde/debian/copyright
diff --git a/ubuntu/_base/applications/tde-style-ia-ora/debian/patches/series b/ubuntu/_base/applications/utilities/qalculate-tde/debian/patches/series
similarity index 100%
rename from ubuntu/_base/applications/tde-style-ia-ora/debian/patches/series
rename to ubuntu/_base/applications/utilities/qalculate-tde/debian/patches/series
diff --git a/ubuntu/_base/applications/qalculate-tde/debian/qalculate-tde.1 b/ubuntu/_base/applications/utilities/qalculate-tde/debian/qalculate-tde.1
similarity index 100%
rename from ubuntu/_base/applications/qalculate-tde/debian/qalculate-tde.1
rename to ubuntu/_base/applications/utilities/qalculate-tde/debian/qalculate-tde.1
diff --git a/ubuntu/_base/applications/qalculate-tde/debian/qalculate-trinity.manpages b/ubuntu/_base/applications/utilities/qalculate-tde/debian/qalculate-trinity.manpages
similarity index 100%
rename from ubuntu/_base/applications/qalculate-tde/debian/qalculate-trinity.manpages
rename to ubuntu/_base/applications/utilities/qalculate-tde/debian/qalculate-trinity.manpages
diff --git a/ubuntu/_base/applications/qalculate-tde/debian/qalculate-trinity.menu b/ubuntu/_base/applications/utilities/qalculate-tde/debian/qalculate-trinity.menu
similarity index 100%
rename from ubuntu/_base/applications/qalculate-tde/debian/qalculate-trinity.menu
rename to ubuntu/_base/applications/utilities/qalculate-tde/debian/qalculate-trinity.menu
diff --git a/ubuntu/_base/applications/qalculate-tde/debian/qalculate-trinity.postinst b/ubuntu/_base/applications/utilities/qalculate-tde/debian/qalculate-trinity.postinst
similarity index 100%
rename from ubuntu/_base/applications/qalculate-tde/debian/qalculate-trinity.postinst
rename to ubuntu/_base/applications/utilities/qalculate-tde/debian/qalculate-trinity.postinst
diff --git a/ubuntu/_base/applications/qalculate-tde/debian/qalculate-trinity.prerm b/ubuntu/_base/applications/utilities/qalculate-tde/debian/qalculate-trinity.prerm
similarity index 100%
rename from ubuntu/_base/applications/qalculate-tde/debian/qalculate-trinity.prerm
rename to ubuntu/_base/applications/utilities/qalculate-tde/debian/qalculate-trinity.prerm
diff --git a/ubuntu/_base/applications/qalculate-tde/debian/rules b/ubuntu/_base/applications/utilities/qalculate-tde/debian/rules
similarity index 100%
rename from ubuntu/_base/applications/qalculate-tde/debian/rules
rename to ubuntu/_base/applications/utilities/qalculate-tde/debian/rules
diff --git a/ubuntu/_base/applications/wlassistant/debian/source/format b/ubuntu/_base/applications/utilities/qalculate-tde/debian/source/format
similarity index 100%
rename from ubuntu/_base/applications/wlassistant/debian/source/format
rename to ubuntu/_base/applications/utilities/qalculate-tde/debian/source/format
diff --git a/ubuntu/_base/applications/wlassistant/debian/source/options b/ubuntu/_base/applications/utilities/qalculate-tde/debian/source/options
similarity index 100%
rename from ubuntu/_base/applications/wlassistant/debian/source/options
rename to ubuntu/_base/applications/utilities/qalculate-tde/debian/source/options
diff --git a/ubuntu/_base/applications/qalculate-tde/debian/watch b/ubuntu/_base/applications/utilities/qalculate-tde/debian/watch
similarity index 100%
rename from ubuntu/_base/applications/qalculate-tde/debian/watch
rename to ubuntu/_base/applications/utilities/qalculate-tde/debian/watch
diff --git a/ubuntu/_base/applications/yakuake/debian/compat b/ubuntu/_base/applications/yakuake/debian/compat
deleted file mode 100644
index ec635144f..000000000
--- a/ubuntu/_base/applications/yakuake/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/ubuntu/_base/applications/yakuake/debian/source/format b/ubuntu/_base/applications/yakuake/debian/source/format
deleted file mode 100644
index 163aaf8d8..000000000
--- a/ubuntu/_base/applications/yakuake/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/ubuntu/_base/applications/yakuake/debian/source/options b/ubuntu/_base/applications/yakuake/debian/source/options
deleted file mode 100644
index 72f1f5450..000000000
--- a/ubuntu/_base/applications/yakuake/debian/source/options
+++ /dev/null
@@ -1,6 +0,0 @@
-# Use xz instead of gzip
-compression = "xz"
-compression-level = 9
-
-# Don't run differences
-diff-ignore = .*