diff --git a/package/public/a52dec/a52dec.cache b/package/base/a52dec/a52dec.cache
similarity index 100%
rename from package/public/a52dec/a52dec.cache
rename to package/base/a52dec/a52dec.cache
diff --git a/package/public/a52dec/a52dec.desc b/package/base/a52dec/a52dec.desc
similarity index 100%
rename from package/public/a52dec/a52dec.desc
rename to package/base/a52dec/a52dec.desc
diff --git a/package/mnemoc/boehm-gc/boehm-gc.cache b/package/base/boehm-gc/boehm-gc.cache
similarity index 100%
rename from package/mnemoc/boehm-gc/boehm-gc.cache
rename to package/base/boehm-gc/boehm-gc.cache
diff --git a/package/mnemoc/boehm-gc/boehm-gc.conf b/package/base/boehm-gc/boehm-gc.conf
similarity index 100%
rename from package/mnemoc/boehm-gc/boehm-gc.conf
rename to package/base/boehm-gc/boehm-gc.conf
diff --git a/package/mnemoc/boehm-gc/boehm-gc.desc b/package/base/boehm-gc/boehm-gc.desc
similarity index 100%
rename from package/mnemoc/boehm-gc/boehm-gc.desc
rename to package/base/boehm-gc/boehm-gc.desc
diff --git a/package/public/cairomm/cairomm.cache b/package/base/cairomm/cairomm.cache
similarity index 100%
rename from package/public/cairomm/cairomm.cache
rename to package/base/cairomm/cairomm.cache
diff --git a/package/public/cairomm/cairomm.desc b/package/base/cairomm/cairomm.desc
similarity index 100%
rename from package/public/cairomm/cairomm.desc
rename to package/base/cairomm/cairomm.desc
diff --git a/package/public/cdparanoia/cdparanoia.cache b/package/base/cdparanoia/cdparanoia.cache
similarity index 100%
rename from package/public/cdparanoia/cdparanoia.cache
rename to package/base/cdparanoia/cdparanoia.cache
diff --git a/package/public/cdparanoia/cdparanoia.conf b/package/base/cdparanoia/cdparanoia.conf
similarity index 100%
rename from package/public/cdparanoia/cdparanoia.conf
rename to package/base/cdparanoia/cdparanoia.conf
diff --git a/package/public/cdparanoia/cdparanoia.desc b/package/base/cdparanoia/cdparanoia.desc
similarity index 100%
rename from package/public/cdparanoia/cdparanoia.desc
rename to package/base/cdparanoia/cdparanoia.desc
diff --git a/package/public/cdparanoia/gcc34.patch b/package/base/cdparanoia/gcc34.patch
similarity index 100%
rename from package/public/cdparanoia/gcc34.patch
rename to package/base/cdparanoia/gcc34.patch
diff --git a/package/public/cdrdao/cdrdao.cache b/package/base/cdrdao/cdrdao.cache
similarity index 100%
rename from package/public/cdrdao/cdrdao.cache
rename to package/base/cdrdao/cdrdao.cache
diff --git a/package/public/cdrdao/cdrdao.conf b/package/base/cdrdao/cdrdao.conf
similarity index 100%
rename from package/public/cdrdao/cdrdao.conf
rename to package/base/cdrdao/cdrdao.conf
diff --git a/package/public/cdrdao/cdrdao.desc b/package/base/cdrdao/cdrdao.desc
similarity index 100%
rename from package/public/cdrdao/cdrdao.desc
rename to package/base/cdrdao/cdrdao.desc
diff --git a/package/public/cdrdao/make-more.diff b/package/base/cdrdao/make-more.diff
similarity index 100%
rename from package/public/cdrdao/make-more.diff
rename to package/base/cdrdao/make-more.diff
diff --git a/package/praenti/cups/cups.cache b/package/base/cups/cups.cache
similarity index 100%
rename from package/praenti/cups/cups.cache
rename to package/base/cups/cups.cache
diff --git a/package/praenti/cups/cups.conf b/package/base/cups/cups.conf
similarity index 100%
rename from package/praenti/cups/cups.conf
rename to package/base/cups/cups.conf
diff --git a/package/praenti/cups/cups.desc b/package/base/cups/cups.desc
similarity index 100%
rename from package/praenti/cups/cups.desc
rename to package/base/cups/cups.desc
diff --git a/package/praenti/cups/cups.init b/package/base/cups/cups.init
similarity index 100%
rename from package/praenti/cups/cups.init
rename to package/base/cups/cups.init
diff --git a/package/praenti/cups/hotfix.diff_x86_64 b/package/base/cups/hotfix.diff_x86_64
similarity index 100%
rename from package/praenti/cups/hotfix.diff_x86_64
rename to package/base/cups/hotfix.diff_x86_64
diff --git a/package/praenti/cups/noinit.patch b/package/base/cups/noinit.patch
similarity index 100%
rename from package/praenti/cups/noinit.patch
rename to package/base/cups/noinit.patch
diff --git a/package/praenti/cups/setprinter.patch b/package/base/cups/setprinter.patch
similarity index 100%
rename from package/praenti/cups/setprinter.patch
rename to package/base/cups/setprinter.patch
diff --git a/package/tsa/cyrus-sasl2/cyrus-sasl2.cache b/package/base/cyrus-sasl2/cyrus-sasl2.cache
similarity index 100%
rename from package/tsa/cyrus-sasl2/cyrus-sasl2.cache
rename to package/base/cyrus-sasl2/cyrus-sasl2.cache
diff --git a/package/tsa/cyrus-sasl2/cyrus-sasl2.desc b/package/base/cyrus-sasl2/cyrus-sasl2.desc
similarity index 100%
rename from package/tsa/cyrus-sasl2/cyrus-sasl2.desc
rename to package/base/cyrus-sasl2/cyrus-sasl2.desc
diff --git a/package/tsa/cyrus-sasl2/gcc40.patch b/package/base/cyrus-sasl2/gcc40.patch
similarity index 100%
rename from package/tsa/cyrus-sasl2/gcc40.patch
rename to package/base/cyrus-sasl2/gcc40.patch
diff --git a/package/fake/dvd+rwtools/dvd+rwtools.cache b/package/base/dvd+rwtools/dvd+rwtools.cache
similarity index 100%
rename from package/fake/dvd+rwtools/dvd+rwtools.cache
rename to package/base/dvd+rwtools/dvd+rwtools.cache
diff --git a/package/fake/dvd+rwtools/dvd+rwtools.conf b/package/base/dvd+rwtools/dvd+rwtools.conf
similarity index 100%
rename from package/fake/dvd+rwtools/dvd+rwtools.conf
rename to package/base/dvd+rwtools/dvd+rwtools.conf
diff --git a/package/fake/dvd+rwtools/dvd+rwtools.desc b/package/base/dvd+rwtools/dvd+rwtools.desc
similarity index 100%
rename from package/fake/dvd+rwtools/dvd+rwtools.desc
rename to package/base/dvd+rwtools/dvd+rwtools.desc
diff --git a/package/public/esound/esound.cache b/package/base/esound/esound.cache
similarity index 100%
rename from package/public/esound/esound.cache
rename to package/base/esound/esound.cache
diff --git a/package/public/esound/esound.conf b/package/base/esound/esound.conf
similarity index 100%
rename from package/public/esound/esound.conf
rename to package/base/esound/esound.conf
diff --git a/package/public/esound/esound.desc b/package/base/esound/esound.desc
similarity index 100%
rename from package/public/esound/esound.desc
rename to package/base/esound/esound.desc
diff --git a/package/pilot/etcnet/etcnet.cache b/package/base/etcnet/etcnet.cache
similarity index 100%
rename from package/pilot/etcnet/etcnet.cache
rename to package/base/etcnet/etcnet.cache
diff --git a/package/pilot/etcnet/etcnet.conf b/package/base/etcnet/etcnet.conf
similarity index 100%
rename from package/pilot/etcnet/etcnet.conf
rename to package/base/etcnet/etcnet.conf
diff --git a/package/pilot/etcnet/etcnet.desc b/package/base/etcnet/etcnet.desc
similarity index 100%
rename from package/pilot/etcnet/etcnet.desc
rename to package/base/etcnet/etcnet.desc
diff --git a/package/pilot/etcnet/force-symlinks.patch b/package/base/etcnet/force-symlinks.patch
similarity index 100%
rename from package/pilot/etcnet/force-symlinks.patch
rename to package/base/etcnet/force-symlinks.patch
diff --git a/package/pilot/etcnet/hotfix.patch b/package/base/etcnet/hotfix.patch
similarity index 100%
rename from package/pilot/etcnet/hotfix.patch
rename to package/base/etcnet/hotfix.patch
diff --git a/package/pilot/etcnet/network.init b/package/base/etcnet/network.init
similarity index 100%
rename from package/pilot/etcnet/network.init
rename to package/base/etcnet/network.init
diff --git a/package/stf/faac/faac.cache b/package/base/faac/faac.cache
similarity index 100%
rename from package/stf/faac/faac.cache
rename to package/base/faac/faac.cache
diff --git a/package/stf/faac/faac.conf b/package/base/faac/faac.conf
similarity index 100%
rename from package/stf/faac/faac.conf
rename to package/base/faac/faac.conf
diff --git a/package/stf/faac/faac.desc b/package/base/faac/faac.desc
similarity index 100%
rename from package/stf/faac/faac.desc
rename to package/base/faac/faac.desc
diff --git a/package/public/ffmpeg/ffmpeg.cache b/package/base/ffmpeg/ffmpeg.cache
similarity index 100%
rename from package/public/ffmpeg/ffmpeg.cache
rename to package/base/ffmpeg/ffmpeg.cache
diff --git a/package/public/ffmpeg/ffmpeg.conf b/package/base/ffmpeg/ffmpeg.conf
similarity index 100%
rename from package/public/ffmpeg/ffmpeg.conf
rename to package/base/ffmpeg/ffmpeg.conf
diff --git a/package/public/ffmpeg/ffmpeg.desc b/package/base/ffmpeg/ffmpeg.desc
similarity index 100%
rename from package/public/ffmpeg/ffmpeg.desc
rename to package/base/ffmpeg/ffmpeg.desc
diff --git a/package/nikolaus/flac/flac.cache b/package/base/flac/flac.cache
similarity index 100%
rename from package/nikolaus/flac/flac.cache
rename to package/base/flac/flac.cache
diff --git a/package/nikolaus/flac/flac.desc b/package/base/flac/flac.desc
similarity index 100%
rename from package/nikolaus/flac/flac.desc
rename to package/base/flac/flac.desc
diff --git a/package/nikolaus/flac/xmms-plugin-doublefree.patch b/package/base/flac/xmms-plugin-doublefree.patch
similarity index 100%
rename from package/nikolaus/flac/xmms-plugin-doublefree.patch
rename to package/base/flac/xmms-plugin-doublefree.patch
diff --git a/package/public/fribidi/fribidi.cache b/package/base/fribidi/fribidi.cache
similarity index 100%
rename from package/public/fribidi/fribidi.cache
rename to package/base/fribidi/fribidi.cache
diff --git a/package/public/fribidi/fribidi.conf b/package/base/fribidi/fribidi.conf
similarity index 100%
rename from package/public/fribidi/fribidi.conf
rename to package/base/fribidi/fribidi.conf
diff --git a/package/public/fribidi/fribidi.desc b/package/base/fribidi/fribidi.desc
similarity index 100%
rename from package/public/fribidi/fribidi.desc
rename to package/base/fribidi/fribidi.desc
diff --git a/package/public/fribidi/pkg-config-include-patch.patch b/package/base/fribidi/pkg-config-include-patch.patch
similarity index 100%
rename from package/public/fribidi/pkg-config-include-patch.patch
rename to package/base/fribidi/pkg-config-include-patch.patch
diff --git a/package/public/gpgme/gpgme.cache b/package/base/gpgme/gpgme.cache
similarity index 100%
rename from package/public/gpgme/gpgme.cache
rename to package/base/gpgme/gpgme.cache
diff --git a/package/public/gpgme/gpgme.conf b/package/base/gpgme/gpgme.conf
similarity index 100%
rename from package/public/gpgme/gpgme.conf
rename to package/base/gpgme/gpgme.conf
diff --git a/package/public/gpgme/gpgme.desc b/package/base/gpgme/gpgme.desc
similarity index 100%
rename from package/public/gpgme/gpgme.desc
rename to package/base/gpgme/gpgme.desc
diff --git a/package/public/graphicsmagick/graphicsmagick.cache b/package/base/graphicsmagick/graphicsmagick.cache
similarity index 100%
rename from package/public/graphicsmagick/graphicsmagick.cache
rename to package/base/graphicsmagick/graphicsmagick.cache
diff --git a/package/public/graphicsmagick/graphicsmagick.conf b/package/base/graphicsmagick/graphicsmagick.conf
similarity index 100%
rename from package/public/graphicsmagick/graphicsmagick.conf
rename to package/base/graphicsmagick/graphicsmagick.conf
diff --git a/package/public/graphicsmagick/graphicsmagick.desc b/package/base/graphicsmagick/graphicsmagick.desc
similarity index 100%
rename from package/public/graphicsmagick/graphicsmagick.desc
rename to package/base/graphicsmagick/graphicsmagick.desc
diff --git a/package/sirkull/hpijs/hpijs.cache b/package/base/hpijs/hpijs.cache
similarity index 100%
rename from package/sirkull/hpijs/hpijs.cache
rename to package/base/hpijs/hpijs.cache
diff --git a/package/sirkull/hpijs/hpijs.desc b/package/base/hpijs/hpijs.desc
similarity index 100%
rename from package/sirkull/hpijs/hpijs.desc
rename to package/base/hpijs/hpijs.desc
diff --git a/package/public/inkscape/inkscape.cache b/package/base/inkscape/inkscape.cache
similarity index 100%
rename from package/public/inkscape/inkscape.cache
rename to package/base/inkscape/inkscape.cache
diff --git a/package/public/inkscape/inkscape.conf b/package/base/inkscape/inkscape.conf
similarity index 100%
rename from package/public/inkscape/inkscape.conf
rename to package/base/inkscape/inkscape.conf
diff --git a/package/public/inkscape/inkscape.desc b/package/base/inkscape/inkscape.desc
similarity index 100%
rename from package/public/inkscape/inkscape.desc
rename to package/base/inkscape/inkscape.desc
diff --git a/package/fake/kaffeine/kaffeine.cache b/package/base/kaffeine/kaffeine.cache
similarity index 100%
rename from package/fake/kaffeine/kaffeine.cache
rename to package/base/kaffeine/kaffeine.cache
diff --git a/package/fake/kaffeine/kaffeine.conf b/package/base/kaffeine/kaffeine.conf
similarity index 100%
rename from package/fake/kaffeine/kaffeine.conf
rename to package/base/kaffeine/kaffeine.conf
diff --git a/package/fake/kaffeine/kaffeine.desc b/package/base/kaffeine/kaffeine.desc
similarity index 100%
rename from package/fake/kaffeine/kaffeine.desc
rename to package/base/kaffeine/kaffeine.desc
diff --git a/package/fake/kaffeine/kde354.patch b/package/base/kaffeine/kde354.patch
similarity index 100%
rename from package/fake/kaffeine/kde354.patch
rename to package/base/kaffeine/kde354.patch
diff --git a/package/stf/lcms/lcms.cache b/package/base/lcms/lcms.cache
similarity index 100%
rename from package/stf/lcms/lcms.cache
rename to package/base/lcms/lcms.cache
diff --git a/package/stf/lcms/lcms.desc b/package/base/lcms/lcms.desc
similarity index 100%
rename from package/stf/lcms/lcms.desc
rename to package/base/lcms/lcms.desc
diff --git a/package/tsa/leafnode/leafnode.cache b/package/base/leafnode/leafnode.cache
similarity index 100%
rename from package/tsa/leafnode/leafnode.cache
rename to package/base/leafnode/leafnode.cache
diff --git a/package/tsa/leafnode/leafnode.conf b/package/base/leafnode/leafnode.conf
similarity index 100%
rename from package/tsa/leafnode/leafnode.conf
rename to package/base/leafnode/leafnode.conf
diff --git a/package/tsa/leafnode/leafnode.desc b/package/base/leafnode/leafnode.desc
similarity index 100%
rename from package/tsa/leafnode/leafnode.desc
rename to package/base/leafnode/leafnode.desc
diff --git a/package/tsa/leafnode/postsysfiles.in b/package/base/leafnode/postsysfiles.in
similarity index 100%
rename from package/tsa/leafnode/postsysfiles.in
rename to package/base/leafnode/postsysfiles.in
diff --git a/package/daja77/libassuan/libassuan.cache b/package/base/libassuan/libassuan.cache
similarity index 100%
rename from package/daja77/libassuan/libassuan.cache
rename to package/base/libassuan/libassuan.cache
diff --git a/package/daja77/libassuan/libassuan.desc b/package/base/libassuan/libassuan.desc
similarity index 100%
rename from package/daja77/libassuan/libassuan.desc
rename to package/base/libassuan/libassuan.desc
diff --git a/package/stf/libcddb/libcddb.cache b/package/base/libcddb/libcddb.cache
similarity index 100%
rename from package/stf/libcddb/libcddb.cache
rename to package/base/libcddb/libcddb.cache
diff --git a/package/stf/libcddb/libcddb.desc b/package/base/libcddb/libcddb.desc
similarity index 100%
rename from package/stf/libcddb/libcddb.desc
rename to package/base/libcddb/libcddb.desc
diff --git a/package/avm/libcdio/libcdio.cache b/package/base/libcdio/libcdio.cache
similarity index 100%
rename from package/avm/libcdio/libcdio.cache
rename to package/base/libcdio/libcdio.cache
diff --git a/package/avm/libcdio/libcdio.desc b/package/base/libcdio/libcdio.desc
similarity index 100%
rename from package/avm/libcdio/libcdio.desc
rename to package/base/libcdio/libcdio.desc
diff --git a/package/stf/libdca/libdca.desc b/package/base/libdca/libdca.desc
similarity index 100%
rename from package/stf/libdca/libdca.desc
rename to package/base/libdca/libdca.desc
diff --git a/package/stf/libdvbpsi/libdvbpsi.cache b/package/base/libdvbpsi/libdvbpsi.cache
similarity index 100%
rename from package/stf/libdvbpsi/libdvbpsi.cache
rename to package/base/libdvbpsi/libdvbpsi.cache
diff --git a/package/stf/libdvbpsi/libdvbpsi.desc b/package/base/libdvbpsi/libdvbpsi.desc
similarity index 100%
rename from package/stf/libdvbpsi/libdvbpsi.desc
rename to package/base/libdvbpsi/libdvbpsi.desc
diff --git a/package/public/libdvdcss/libdvdcss.cache b/package/base/libdvdcss/libdvdcss.cache
similarity index 100%
rename from package/public/libdvdcss/libdvdcss.cache
rename to package/base/libdvdcss/libdvdcss.cache
diff --git a/package/public/libdvdcss/libdvdcss.desc b/package/base/libdvdcss/libdvdcss.desc
similarity index 100%
rename from package/public/libdvdcss/libdvdcss.desc
rename to package/base/libdvdcss/libdvdcss.desc
diff --git a/package/public/libdvdnav/devlevel.txt b/package/base/libdvdnav/devlevel.txt
similarity index 100%
rename from package/public/libdvdnav/devlevel.txt
rename to package/base/libdvdnav/devlevel.txt
diff --git a/package/public/libdvdnav/libdvdnav.cache b/package/base/libdvdnav/libdvdnav.cache
similarity index 100%
rename from package/public/libdvdnav/libdvdnav.cache
rename to package/base/libdvdnav/libdvdnav.cache
diff --git a/package/public/libdvdnav/libdvdnav.conf b/package/base/libdvdnav/libdvdnav.conf
similarity index 100%
rename from package/public/libdvdnav/libdvdnav.conf
rename to package/base/libdvdnav/libdvdnav.conf
diff --git a/package/public/libdvdnav/libdvdnav.desc b/package/base/libdvdnav/libdvdnav.desc
similarity index 100%
rename from package/public/libdvdnav/libdvdnav.desc
rename to package/base/libdvdnav/libdvdnav.desc
diff --git a/package/public/libdvdread/libdvdread.cache b/package/base/libdvdread/libdvdread.cache
similarity index 100%
rename from package/public/libdvdread/libdvdread.cache
rename to package/base/libdvdread/libdvdread.cache
diff --git a/package/public/libdvdread/libdvdread.conf b/package/base/libdvdread/libdvdread.conf
similarity index 100%
rename from package/public/libdvdread/libdvdread.conf
rename to package/base/libdvdread/libdvdread.conf
diff --git a/package/public/libdvdread/libdvdread.desc b/package/base/libdvdread/libdvdread.desc
similarity index 100%
rename from package/public/libdvdread/libdvdread.desc
rename to package/base/libdvdread/libdvdread.desc
diff --git a/package/stf/libexif/libexif.cache b/package/base/libexif/libexif.cache
similarity index 100%
rename from package/stf/libexif/libexif.cache
rename to package/base/libexif/libexif.cache
diff --git a/package/stf/libexif/libexif.desc b/package/base/libexif/libexif.desc
similarity index 100%
rename from package/stf/libexif/libexif.desc
rename to package/base/libexif/libexif.desc
diff --git a/package/mathieu/libgcrypt/libgcrypt.cache b/package/base/libgcrypt/libgcrypt.cache
similarity index 100%
rename from package/mathieu/libgcrypt/libgcrypt.cache
rename to package/base/libgcrypt/libgcrypt.cache
diff --git a/package/mathieu/libgcrypt/libgcrypt.desc b/package/base/libgcrypt/libgcrypt.desc
similarity index 100%
rename from package/mathieu/libgcrypt/libgcrypt.desc
rename to package/base/libgcrypt/libgcrypt.desc
diff --git a/package/a-tui/libgpg-error/libgpg-error.cache b/package/base/libgpg-error/libgpg-error.cache
similarity index 100%
rename from package/a-tui/libgpg-error/libgpg-error.cache
rename to package/base/libgpg-error/libgpg-error.cache
diff --git a/package/a-tui/libgpg-error/libgpg-error.desc b/package/base/libgpg-error/libgpg-error.desc
similarity index 100%
rename from package/a-tui/libgpg-error/libgpg-error.desc
rename to package/base/libgpg-error/libgpg-error.desc
diff --git a/package/daja77/libksba/libksba.cache b/package/base/libksba/libksba.cache
similarity index 100%
rename from package/daja77/libksba/libksba.cache
rename to package/base/libksba/libksba.cache
diff --git a/package/daja77/libksba/libksba.desc b/package/base/libksba/libksba.desc
similarity index 100%
rename from package/daja77/libksba/libksba.desc
rename to package/base/libksba/libksba.desc
diff --git a/package/praenti/libmikmod/libmikmod.cache b/package/base/libmikmod/libmikmod.cache
similarity index 100%
rename from package/praenti/libmikmod/libmikmod.cache
rename to package/base/libmikmod/libmikmod.cache
diff --git a/package/praenti/libmikmod/libmikmod.conf b/package/base/libmikmod/libmikmod.conf
similarity index 100%
rename from package/praenti/libmikmod/libmikmod.conf
rename to package/base/libmikmod/libmikmod.conf
diff --git a/package/praenti/libmikmod/libmikmod.desc b/package/base/libmikmod/libmikmod.desc
similarity index 100%
rename from package/praenti/libmikmod/libmikmod.desc
rename to package/base/libmikmod/libmikmod.desc
diff --git a/package/public/libmng/libmng.cache b/package/base/libmng/libmng.cache
similarity index 100%
rename from package/public/libmng/libmng.cache
rename to package/base/libmng/libmng.cache
diff --git a/package/public/libmng/libmng.conf b/package/base/libmng/libmng.conf
similarity index 100%
rename from package/public/libmng/libmng.conf
rename to package/base/libmng/libmng.conf
diff --git a/package/public/libmng/libmng.desc b/package/base/libmng/libmng.desc
similarity index 100%
rename from package/public/libmng/libmng.desc
rename to package/base/libmng/libmng.desc
diff --git a/package/public/libmpeg2/libmpeg2.cache b/package/base/libmpeg2/libmpeg2.cache
similarity index 100%
rename from package/public/libmpeg2/libmpeg2.cache
rename to package/base/libmpeg2/libmpeg2.cache
diff --git a/package/public/libmpeg2/libmpeg2.conf b/package/base/libmpeg2/libmpeg2.conf
similarity index 100%
rename from package/public/libmpeg2/libmpeg2.conf
rename to package/base/libmpeg2/libmpeg2.conf
diff --git a/package/public/libmpeg2/libmpeg2.desc b/package/base/libmpeg2/libmpeg2.desc
similarity index 100%
rename from package/public/libmpeg2/libmpeg2.desc
rename to package/base/libmpeg2/libmpeg2.desc
diff --git a/package/public/libmusicbrainz/libmusicbrainz.cache b/package/base/libmusicbrainz/libmusicbrainz.cache
similarity index 100%
rename from package/public/libmusicbrainz/libmusicbrainz.cache
rename to package/base/libmusicbrainz/libmusicbrainz.cache
diff --git a/package/public/libmusicbrainz/libmusicbrainz.desc b/package/base/libmusicbrainz/libmusicbrainz.desc
similarity index 100%
rename from package/public/libmusicbrainz/libmusicbrainz.desc
rename to package/base/libmusicbrainz/libmusicbrainz.desc
diff --git a/package/blindcoder/libsdl/libsdl.cache b/package/base/libsdl/libsdl.cache
similarity index 100%
rename from package/blindcoder/libsdl/libsdl.cache
rename to package/base/libsdl/libsdl.cache
diff --git a/package/blindcoder/libsdl/libsdl.conf b/package/base/libsdl/libsdl.conf
similarity index 100%
rename from package/blindcoder/libsdl/libsdl.conf
rename to package/base/libsdl/libsdl.conf
diff --git a/package/blindcoder/libsdl/libsdl.desc b/package/base/libsdl/libsdl.desc
similarity index 100%
rename from package/blindcoder/libsdl/libsdl.desc
rename to package/base/libsdl/libsdl.desc
diff --git a/package/blindcoder/libsdl/x86_64_xchgb.patch b/package/base/libsdl/x86_64_xchgb.patch
similarity index 100%
rename from package/blindcoder/libsdl/x86_64_xchgb.patch
rename to package/base/libsdl/x86_64_xchgb.patch
diff --git a/package/kasc/libsdl_console/libsdl_console.cache b/package/base/libsdl_console/libsdl_console.cache
similarity index 100%
rename from package/kasc/libsdl_console/libsdl_console.cache
rename to package/base/libsdl_console/libsdl_console.cache
diff --git a/package/kasc/libsdl_console/libsdl_console.conf b/package/base/libsdl_console/libsdl_console.conf
similarity index 100%
rename from package/kasc/libsdl_console/libsdl_console.conf
rename to package/base/libsdl_console/libsdl_console.conf
diff --git a/package/kasc/libsdl_console/libsdl_console.desc b/package/base/libsdl_console/libsdl_console.desc
similarity index 100%
rename from package/kasc/libsdl_console/libsdl_console.desc
rename to package/base/libsdl_console/libsdl_console.desc
diff --git a/package/kasc/libsdl_gfx/gcc40.patch b/package/base/libsdl_gfx/gcc40.patch
similarity index 100%
rename from package/kasc/libsdl_gfx/gcc40.patch
rename to package/base/libsdl_gfx/gcc40.patch
diff --git a/package/kasc/libsdl_gfx/libsdl_gfx.cache b/package/base/libsdl_gfx/libsdl_gfx.cache
similarity index 100%
rename from package/kasc/libsdl_gfx/libsdl_gfx.cache
rename to package/base/libsdl_gfx/libsdl_gfx.cache
diff --git a/package/kasc/libsdl_gfx/libsdl_gfx.conf b/package/base/libsdl_gfx/libsdl_gfx.conf
similarity index 100%
rename from package/kasc/libsdl_gfx/libsdl_gfx.conf
rename to package/base/libsdl_gfx/libsdl_gfx.conf
diff --git a/package/kasc/libsdl_gfx/libsdl_gfx.desc b/package/base/libsdl_gfx/libsdl_gfx.desc
similarity index 100%
rename from package/kasc/libsdl_gfx/libsdl_gfx.desc
rename to package/base/libsdl_gfx/libsdl_gfx.desc
diff --git a/package/blindcoder/libsdl_image/libsdl_image.cache b/package/base/libsdl_image/libsdl_image.cache
similarity index 100%
rename from package/blindcoder/libsdl_image/libsdl_image.cache
rename to package/base/libsdl_image/libsdl_image.cache
diff --git a/package/blindcoder/libsdl_image/libsdl_image.desc b/package/base/libsdl_image/libsdl_image.desc
similarity index 100%
rename from package/blindcoder/libsdl_image/libsdl_image.desc
rename to package/base/libsdl_image/libsdl_image.desc
diff --git a/package/blindcoder/libsdl_mixer/libsdl_mixer.cache b/package/base/libsdl_mixer/libsdl_mixer.cache
similarity index 100%
rename from package/blindcoder/libsdl_mixer/libsdl_mixer.cache
rename to package/base/libsdl_mixer/libsdl_mixer.cache
diff --git a/package/blindcoder/libsdl_mixer/libsdl_mixer.desc b/package/base/libsdl_mixer/libsdl_mixer.desc
similarity index 100%
rename from package/blindcoder/libsdl_mixer/libsdl_mixer.desc
rename to package/base/libsdl_mixer/libsdl_mixer.desc
diff --git a/package/blindcoder/libsdl_mixer/no-local-default-path.patch b/package/base/libsdl_mixer/no-local-default-path.patch
similarity index 100%
rename from package/blindcoder/libsdl_mixer/no-local-default-path.patch
rename to package/base/libsdl_mixer/no-local-default-path.patch
diff --git a/package/kasc/libsdl_net/libsdl_net.cache b/package/base/libsdl_net/libsdl_net.cache
similarity index 100%
rename from package/kasc/libsdl_net/libsdl_net.cache
rename to package/base/libsdl_net/libsdl_net.cache
diff --git a/package/kasc/libsdl_net/libsdl_net.desc b/package/base/libsdl_net/libsdl_net.desc
similarity index 100%
rename from package/kasc/libsdl_net/libsdl_net.desc
rename to package/base/libsdl_net/libsdl_net.desc
diff --git a/package/kasc/libsdl_perl/console_fix.patch b/package/base/libsdl_perl/console_fix.patch
similarity index 100%
rename from package/kasc/libsdl_perl/console_fix.patch
rename to package/base/libsdl_perl/console_fix.patch
diff --git a/package/kasc/libsdl_perl/libsdl_perl.cache b/package/base/libsdl_perl/libsdl_perl.cache
similarity index 100%
rename from package/kasc/libsdl_perl/libsdl_perl.cache
rename to package/base/libsdl_perl/libsdl_perl.cache
diff --git a/package/kasc/libsdl_perl/libsdl_perl.desc b/package/base/libsdl_perl/libsdl_perl.desc
similarity index 100%
rename from package/kasc/libsdl_perl/libsdl_perl.desc
rename to package/base/libsdl_perl/libsdl_perl.desc
diff --git a/package/kasc/libsdl_sound/libsdl_sound.cache b/package/base/libsdl_sound/libsdl_sound.cache
similarity index 100%
rename from package/kasc/libsdl_sound/libsdl_sound.cache
rename to package/base/libsdl_sound/libsdl_sound.cache
diff --git a/package/kasc/libsdl_sound/libsdl_sound.desc b/package/base/libsdl_sound/libsdl_sound.desc
similarity index 100%
rename from package/kasc/libsdl_sound/libsdl_sound.desc
rename to package/base/libsdl_sound/libsdl_sound.desc
diff --git a/package/kasc/libsdl_ttf/freetype.patch b/package/base/libsdl_ttf/freetype.patch
similarity index 100%
rename from package/kasc/libsdl_ttf/freetype.patch
rename to package/base/libsdl_ttf/freetype.patch
diff --git a/package/kasc/libsdl_ttf/libsdl_ttf.cache b/package/base/libsdl_ttf/libsdl_ttf.cache
similarity index 100%
rename from package/kasc/libsdl_ttf/libsdl_ttf.cache
rename to package/base/libsdl_ttf/libsdl_ttf.cache
diff --git a/package/kasc/libsdl_ttf/libsdl_ttf.desc b/package/base/libsdl_ttf/libsdl_ttf.desc
similarity index 100%
rename from package/kasc/libsdl_ttf/libsdl_ttf.desc
rename to package/base/libsdl_ttf/libsdl_ttf.desc
diff --git a/package/kasc/libsdlmm/libsdlmm.cache b/package/base/libsdlmm/libsdlmm.cache
similarity index 100%
rename from package/kasc/libsdlmm/libsdlmm.cache
rename to package/base/libsdlmm/libsdlmm.cache
diff --git a/package/kasc/libsdlmm/libsdlmm.desc b/package/base/libsdlmm/libsdlmm.desc
similarity index 100%
rename from package/kasc/libsdlmm/libsdlmm.desc
rename to package/base/libsdlmm/libsdlmm.desc
diff --git a/package/public/libsigc++/libsigc++.cache b/package/base/libsigc++/libsigc++.cache
similarity index 100%
rename from package/public/libsigc++/libsigc++.cache
rename to package/base/libsigc++/libsigc++.cache
diff --git a/package/public/libsigc++/libsigc++.desc b/package/base/libsigc++/libsigc++.desc
similarity index 100%
rename from package/public/libsigc++/libsigc++.desc
rename to package/base/libsigc++/libsigc++.desc
diff --git a/package/public/libusb/libusb.cache b/package/base/libusb/libusb.cache
similarity index 100%
rename from package/public/libusb/libusb.cache
rename to package/base/libusb/libusb.cache
diff --git a/package/public/libusb/libusb.conf b/package/base/libusb/libusb.conf
similarity index 100%
rename from package/public/libusb/libusb.conf
rename to package/base/libusb/libusb.conf
diff --git a/package/public/libusb/libusb.desc b/package/base/libusb/libusb.desc
similarity index 100%
rename from package/public/libusb/libusb.desc
rename to package/base/libusb/libusb.desc
diff --git a/package/public/lm_sensors/lm_sensors.cache b/package/base/lm_sensors/lm_sensors.cache
similarity index 100%
rename from package/public/lm_sensors/lm_sensors.cache
rename to package/base/lm_sensors/lm_sensors.cache
diff --git a/package/public/lm_sensors/lm_sensors.conf b/package/base/lm_sensors/lm_sensors.conf
similarity index 100%
rename from package/public/lm_sensors/lm_sensors.conf
rename to package/base/lm_sensors/lm_sensors.conf
diff --git a/package/public/lm_sensors/lm_sensors.desc b/package/base/lm_sensors/lm_sensors.desc
similarity index 100%
rename from package/public/lm_sensors/lm_sensors.desc
rename to package/base/lm_sensors/lm_sensors.desc
diff --git a/package/public/lm_sensors/no_install_i2c-dev.h.patch b/package/base/lm_sensors/no_install_i2c-dev.h.patch
similarity index 100%
rename from package/public/lm_sensors/no_install_i2c-dev.h.patch
rename to package/base/lm_sensors/no_install_i2c-dev.h.patch
diff --git a/package/mnemoc/lzo/lzo.cache b/package/base/lzo/lzo.cache
similarity index 100%
rename from package/mnemoc/lzo/lzo.cache
rename to package/base/lzo/lzo.cache
diff --git a/package/mnemoc/lzo/lzo.desc b/package/base/lzo/lzo.desc
similarity index 100%
rename from package/mnemoc/lzo/lzo.desc
rename to package/base/lzo/lzo.desc
diff --git a/package/public/mad/mad.cache b/package/base/mad/mad.cache
similarity index 100%
rename from package/public/mad/mad.cache
rename to package/base/mad/mad.cache
diff --git a/package/public/mad/mad.conf b/package/base/mad/mad.conf
similarity index 100%
rename from package/public/mad/mad.conf
rename to package/base/mad/mad.conf
diff --git a/package/public/mad/mad.desc b/package/base/mad/mad.desc
similarity index 100%
rename from package/public/mad/mad.desc
rename to package/base/mad/mad.desc
diff --git a/package/public/mdnsresponder/dont-change-libc-config-files.patch b/package/base/mdnsresponder/dont-change-libc-config-files.patch
similarity index 100%
rename from package/public/mdnsresponder/dont-change-libc-config-files.patch
rename to package/base/mdnsresponder/dont-change-libc-config-files.patch
diff --git a/package/public/mdnsresponder/dont-install-initscript.patch b/package/base/mdnsresponder/dont-install-initscript.patch
similarity index 100%
rename from package/public/mdnsresponder/dont-install-initscript.patch
rename to package/base/mdnsresponder/dont-install-initscript.patch
diff --git a/package/public/mdnsresponder/mdnsd.init b/package/base/mdnsresponder/mdnsd.init
similarity index 100%
rename from package/public/mdnsresponder/mdnsd.init
rename to package/base/mdnsresponder/mdnsd.init
diff --git a/package/public/mdnsresponder/mdnsresponder.cache b/package/base/mdnsresponder/mdnsresponder.cache
similarity index 100%
rename from package/public/mdnsresponder/mdnsresponder.cache
rename to package/base/mdnsresponder/mdnsresponder.cache
diff --git a/package/public/mdnsresponder/mdnsresponder.conf b/package/base/mdnsresponder/mdnsresponder.conf
similarity index 100%
rename from package/public/mdnsresponder/mdnsresponder.conf
rename to package/base/mdnsresponder/mdnsresponder.conf
diff --git a/package/public/mdnsresponder/mdnsresponder.desc b/package/base/mdnsresponder/mdnsresponder.desc
similarity index 100%
rename from package/public/mdnsresponder/mdnsresponder.desc
rename to package/base/mdnsresponder/mdnsresponder.desc
diff --git a/package/public/mdnsresponder/postinstall.sh b/package/base/mdnsresponder/postinstall.sh
similarity index 100%
rename from package/public/mdnsresponder/postinstall.sh
rename to package/base/mdnsresponder/postinstall.sh
diff --git a/package/jimmy/mplayer/config.hlp b/package/base/mplayer/config.hlp
similarity index 100%
rename from package/jimmy/mplayer/config.hlp
rename to package/base/mplayer/config.hlp
diff --git a/package/jimmy/mplayer/config.in b/package/base/mplayer/config.in
similarity index 100%
rename from package/jimmy/mplayer/config.in
rename to package/base/mplayer/config.in
diff --git a/package/jimmy/mplayer/inst-shared-pp.patch b/package/base/mplayer/inst-shared-pp.patch
similarity index 100%
rename from package/jimmy/mplayer/inst-shared-pp.patch
rename to package/base/mplayer/inst-shared-pp.patch
diff --git a/package/jimmy/mplayer/mplayer.cache b/package/base/mplayer/mplayer.cache
similarity index 100%
rename from package/jimmy/mplayer/mplayer.cache
rename to package/base/mplayer/mplayer.cache
diff --git a/package/jimmy/mplayer/mplayer.conf b/package/base/mplayer/mplayer.conf
similarity index 100%
rename from package/jimmy/mplayer/mplayer.conf
rename to package/base/mplayer/mplayer.conf
diff --git a/package/jimmy/mplayer/mplayer.desc b/package/base/mplayer/mplayer.desc
similarity index 100%
rename from package/jimmy/mplayer/mplayer.desc
rename to package/base/mplayer/mplayer.desc
diff --git a/package/jimmy/mplayer/mplayer.desktop b/package/base/mplayer/mplayer.desktop
similarity index 100%
rename from package/jimmy/mplayer/mplayer.desktop
rename to package/base/mplayer/mplayer.desktop
diff --git a/package/jimmy/mplayer/no-altivec.patch b/package/base/mplayer/no-altivec.patch
similarity index 100%
rename from package/jimmy/mplayer/no-altivec.patch
rename to package/base/mplayer/no-altivec.patch
diff --git a/package/blindcoder/nas/etc_nas_nasd.conf b/package/base/nas/etc_nas_nasd.conf
similarity index 100%
rename from package/blindcoder/nas/etc_nas_nasd.conf
rename to package/base/nas/etc_nas_nasd.conf
diff --git a/package/blindcoder/nas/nas.cache b/package/base/nas/nas.cache
similarity index 100%
rename from package/blindcoder/nas/nas.cache
rename to package/base/nas/nas.cache
diff --git a/package/blindcoder/nas/nas.conf b/package/base/nas/nas.conf
similarity index 100%
rename from package/blindcoder/nas/nas.conf
rename to package/base/nas/nas.conf
diff --git a/package/blindcoder/nas/nas.desc b/package/base/nas/nas.desc
similarity index 100%
rename from package/blindcoder/nas/nas.desc
rename to package/base/nas/nas.desc
diff --git a/package/blindcoder/nas/nasd.init b/package/base/nas/nasd.init
similarity index 100%
rename from package/blindcoder/nas/nasd.init
rename to package/base/nas/nasd.init
diff --git a/package/daja77/openexr/openexr-gcc4.patch b/package/base/openexr/openexr-gcc4.patch
similarity index 100%
rename from package/daja77/openexr/openexr-gcc4.patch
rename to package/base/openexr/openexr-gcc4.patch
diff --git a/package/daja77/openexr/openexr.cache b/package/base/openexr/openexr.cache
similarity index 100%
rename from package/daja77/openexr/openexr.cache
rename to package/base/openexr/openexr.cache
diff --git a/package/daja77/openexr/openexr.conf b/package/base/openexr/openexr.conf
similarity index 100%
rename from package/daja77/openexr/openexr.conf
rename to package/base/openexr/openexr.conf
diff --git a/package/daja77/openexr/openexr.desc b/package/base/openexr/openexr.desc
similarity index 100%
rename from package/daja77/openexr/openexr.desc
rename to package/base/openexr/openexr.desc
diff --git a/package/alessandro/php/config.hlp b/package/base/php/config.hlp
similarity index 100%
rename from package/alessandro/php/config.hlp
rename to package/base/php/config.hlp
diff --git a/package/alessandro/php/config.in b/package/base/php/config.in
similarity index 100%
rename from package/alessandro/php/config.in
rename to package/base/php/config.in
diff --git a/package/alessandro/php/php.cache b/package/base/php/php.cache
similarity index 100%
rename from package/alessandro/php/php.cache
rename to package/base/php/php.cache
diff --git a/package/alessandro/php/php.conf b/package/base/php/php.conf
similarity index 100%
rename from package/alessandro/php/php.conf
rename to package/base/php/php.conf
diff --git a/package/alessandro/php/php.desc b/package/base/php/php.desc
similarity index 100%
rename from package/alessandro/php/php.desc
rename to package/base/php/php.desc
diff --git a/package/alessandro/php/php4/apsx-fix.patch b/package/base/php/php4/apsx-fix.patch
similarity index 100%
rename from package/alessandro/php/php4/apsx-fix.patch
rename to package/base/php/php4/apsx-fix.patch
diff --git a/package/alessandro/php/php4/errno.patch b/package/base/php/php4/errno.patch
similarity index 100%
rename from package/alessandro/php/php4/errno.patch
rename to package/base/php/php4/errno.patch
diff --git a/package/alessandro/php/php5/do-not-touch-httpd-conf.patch b/package/base/php/php5/do-not-touch-httpd-conf.patch
similarity index 100%
rename from package/alessandro/php/php5/do-not-touch-httpd-conf.patch
rename to package/base/php/php5/do-not-touch-httpd-conf.patch
diff --git a/package/fake/pinentry/pinentry.cache b/package/base/pinentry/pinentry.cache
similarity index 100%
rename from package/fake/pinentry/pinentry.cache
rename to package/base/pinentry/pinentry.cache
diff --git a/package/fake/pinentry/pinentry.desc b/package/base/pinentry/pinentry.desc
similarity index 100%
rename from package/fake/pinentry/pinentry.desc
rename to package/base/pinentry/pinentry.desc
diff --git a/package/alessandro/postfix/postfix.cache b/package/base/postfix/postfix.cache
similarity index 100%
rename from package/alessandro/postfix/postfix.cache
rename to package/base/postfix/postfix.cache
diff --git a/package/alessandro/postfix/postfix.conf b/package/base/postfix/postfix.conf
similarity index 100%
rename from package/alessandro/postfix/postfix.conf
rename to package/base/postfix/postfix.conf
diff --git a/package/alessandro/postfix/postfix.desc b/package/base/postfix/postfix.desc
similarity index 100%
rename from package/alessandro/postfix/postfix.desc
rename to package/base/postfix/postfix.desc
diff --git a/package/alessandro/postfix/postfix.init b/package/base/postfix/postfix.init
similarity index 100%
rename from package/alessandro/postfix/postfix.init
rename to package/base/postfix/postfix.init
diff --git a/package/alessandro/postfix/postsysfiles.in b/package/base/postfix/postsysfiles.in
similarity index 100%
rename from package/alessandro/postfix/postsysfiles.in
rename to package/base/postfix/postsysfiles.in
diff --git a/package/michiel/postgresql/missing-infodir.patch b/package/base/postgresql/missing-infodir.patch
similarity index 100%
rename from package/michiel/postgresql/missing-infodir.patch
rename to package/base/postgresql/missing-infodir.patch
diff --git a/package/michiel/postgresql/postgresql.cache b/package/base/postgresql/postgresql.cache
similarity index 100%
rename from package/michiel/postgresql/postgresql.cache
rename to package/base/postgresql/postgresql.cache
diff --git a/package/michiel/postgresql/postgresql.conf b/package/base/postgresql/postgresql.conf
similarity index 100%
rename from package/michiel/postgresql/postgresql.conf
rename to package/base/postgresql/postgresql.conf
diff --git a/package/michiel/postgresql/postgresql.desc b/package/base/postgresql/postgresql.desc
similarity index 100%
rename from package/michiel/postgresql/postgresql.desc
rename to package/base/postgresql/postgresql.desc
diff --git a/package/michiel/postgresql/postgresql.init b/package/base/postgresql/postgresql.init
similarity index 100%
rename from package/michiel/postgresql/postgresql.init
rename to package/base/postgresql/postgresql.init
diff --git a/package/michiel/postgresql/postsysfiles.in b/package/base/postgresql/postsysfiles.in
similarity index 100%
rename from package/michiel/postgresql/postsysfiles.in
rename to package/base/postgresql/postsysfiles.in
diff --git a/package/michiel/postgresql/stone_mod_pgsql.sh b/package/base/postgresql/stone_mod_pgsql.sh
similarity index 100%
rename from package/michiel/postgresql/stone_mod_pgsql.sh
rename to package/base/postgresql/stone_mod_pgsql.sh
diff --git a/package/daja77/pth/head-tail.patch b/package/base/pth/head-tail.patch
similarity index 100%
rename from package/daja77/pth/head-tail.patch
rename to package/base/pth/head-tail.patch
diff --git a/package/daja77/pth/pth.cache b/package/base/pth/pth.cache
similarity index 100%
rename from package/daja77/pth/pth.cache
rename to package/base/pth/pth.cache
diff --git a/package/daja77/pth/pth.desc b/package/base/pth/pth.desc
similarity index 100%
rename from package/daja77/pth/pth.desc
rename to package/base/pth/pth.desc
diff --git a/package/stefanp/qca/const-cast-hotfix.patch.qca-tls b/package/base/qca/const-cast-hotfix.patch.qca-tls
similarity index 100%
rename from package/stefanp/qca/const-cast-hotfix.patch.qca-tls
rename to package/base/qca/const-cast-hotfix.patch.qca-tls
diff --git a/package/stefanp/qca/qca.cache b/package/base/qca/qca.cache
similarity index 100%
rename from package/stefanp/qca/qca.cache
rename to package/base/qca/qca.cache
diff --git a/package/stefanp/qca/qca.desc b/package/base/qca/qca.desc
similarity index 100%
rename from package/stefanp/qca/qca.desc
rename to package/base/qca/qca.desc
diff --git a/package/avm/rtsp/rtsp.cache b/package/base/rtsp/rtsp.cache
similarity index 100%
rename from package/avm/rtsp/rtsp.cache
rename to package/base/rtsp/rtsp.cache
diff --git a/package/avm/rtsp/rtsp.conf b/package/base/rtsp/rtsp.conf
similarity index 100%
rename from package/avm/rtsp/rtsp.conf
rename to package/base/rtsp/rtsp.conf
diff --git a/package/avm/rtsp/rtsp.desc b/package/base/rtsp/rtsp.desc
similarity index 100%
rename from package/avm/rtsp/rtsp.desc
rename to package/base/rtsp/rtsp.desc
diff --git a/package/kasc/swig/swig.cache b/package/base/swig/swig.cache
similarity index 100%
rename from package/kasc/swig/swig.cache
rename to package/base/swig/swig.cache
diff --git a/package/kasc/swig/swig.desc b/package/base/swig/swig.desc
similarity index 100%
rename from package/kasc/swig/swig.desc
rename to package/base/swig/swig.desc
diff --git a/package/public/taglib/taglib.cache b/package/base/taglib/taglib.cache
similarity index 100%
rename from package/public/taglib/taglib.cache
rename to package/base/taglib/taglib.cache
diff --git a/package/public/taglib/taglib.desc b/package/base/taglib/taglib.desc
similarity index 100%
rename from package/public/taglib/taglib.desc
rename to package/base/taglib/taglib.desc
diff --git a/package/stf/tunepimp/pthread_kill.patch b/package/base/tunepimp/pthread_kill.patch
similarity index 100%
rename from package/stf/tunepimp/pthread_kill.patch
rename to package/base/tunepimp/pthread_kill.patch
diff --git a/package/stf/tunepimp/tunepimp.cache b/package/base/tunepimp/tunepimp.cache
similarity index 100%
rename from package/stf/tunepimp/tunepimp.cache
rename to package/base/tunepimp/tunepimp.cache
diff --git a/package/stf/tunepimp/tunepimp.desc b/package/base/tunepimp/tunepimp.desc
similarity index 100%
rename from package/stf/tunepimp/tunepimp.desc
rename to package/base/tunepimp/tunepimp.desc
diff --git a/package/public/unrar/no-exceptions.patch b/package/base/unrar/no-exceptions.patch
similarity index 100%
rename from package/public/unrar/no-exceptions.patch
rename to package/base/unrar/no-exceptions.patch
diff --git a/package/public/unrar/unrar.cache b/package/base/unrar/unrar.cache
similarity index 100%
rename from package/public/unrar/unrar.cache
rename to package/base/unrar/unrar.cache
diff --git a/package/public/unrar/unrar.conf b/package/base/unrar/unrar.conf
similarity index 100%
rename from package/public/unrar/unrar.conf
rename to package/base/unrar/unrar.conf
diff --git a/package/public/unrar/unrar.desc b/package/base/unrar/unrar.desc
similarity index 100%
rename from package/public/unrar/unrar.desc
rename to package/base/unrar/unrar.desc
diff --git a/package/public/vlc/vlc.cache b/package/base/vlc/vlc.cache
similarity index 100%
rename from package/public/vlc/vlc.cache
rename to package/base/vlc/vlc.cache
diff --git a/package/public/vlc/vlc.conf b/package/base/vlc/vlc.conf
similarity index 100%
rename from package/public/vlc/vlc.conf
rename to package/base/vlc/vlc.conf
diff --git a/package/public/vlc/vlc.desc b/package/base/vlc/vlc.desc
similarity index 100%
rename from package/public/vlc/vlc.desc
rename to package/base/vlc/vlc.desc
diff --git a/package/public/vlc/wxwidgets.patch b/package/base/vlc/wxwidgets.patch
similarity index 100%
rename from package/public/vlc/wxwidgets.patch
rename to package/base/vlc/wxwidgets.patch
diff --git a/package/avm/vobcopy/notinlocal.patch b/package/base/vobcopy/notinlocal.patch
similarity index 100%
rename from package/avm/vobcopy/notinlocal.patch
rename to package/base/vobcopy/notinlocal.patch
diff --git a/package/avm/vobcopy/vobcopy.cache b/package/base/vobcopy/vobcopy.cache
similarity index 100%
rename from package/avm/vobcopy/vobcopy.cache
rename to package/base/vobcopy/vobcopy.cache
diff --git a/package/avm/vobcopy/vobcopy.desc b/package/base/vobcopy/vobcopy.desc
similarity index 100%
rename from package/avm/vobcopy/vobcopy.desc
rename to package/base/vobcopy/vobcopy.desc
diff --git a/package/esden/w3m/w3m-0.5.1-gpm_fix-1.patch b/package/base/w3m/w3m-0.5.1-gpm_fix-1.patch
similarity index 100%
rename from package/esden/w3m/w3m-0.5.1-gpm_fix-1.patch
rename to package/base/w3m/w3m-0.5.1-gpm_fix-1.patch
diff --git a/package/esden/w3m/w3m.cache b/package/base/w3m/w3m.cache
similarity index 100%
rename from package/esden/w3m/w3m.cache
rename to package/base/w3m/w3m.cache
diff --git a/package/esden/w3m/w3m.conf b/package/base/w3m/w3m.conf
similarity index 100%
rename from package/esden/w3m/w3m.conf
rename to package/base/w3m/w3m.conf
diff --git a/package/esden/w3m/w3m.desc b/package/base/w3m/w3m.desc
similarity index 100%
rename from package/esden/w3m/w3m.desc
rename to package/base/w3m/w3m.desc
diff --git a/package/public/wv2/wv2.cache b/package/base/wv2/wv2.cache
similarity index 100%
rename from package/public/wv2/wv2.cache
rename to package/base/wv2/wv2.cache
diff --git a/package/public/wv2/wv2.desc b/package/base/wv2/wv2.desc
similarity index 100%
rename from package/public/wv2/wv2.desc
rename to package/base/wv2/wv2.desc
diff --git a/package/tsa/wxwidgets/wxwidgets.cache b/package/base/wxwidgets/wxwidgets.cache
similarity index 100%
rename from package/tsa/wxwidgets/wxwidgets.cache
rename to package/base/wxwidgets/wxwidgets.cache
diff --git a/package/tsa/wxwidgets/wxwidgets.desc b/package/base/wxwidgets/wxwidgets.desc
similarity index 100%
rename from package/tsa/wxwidgets/wxwidgets.desc
rename to package/base/wxwidgets/wxwidgets.desc
diff --git a/package/stf/x264/gpac.patch b/package/base/x264/gpac.patch
similarity index 100%
rename from package/stf/x264/gpac.patch
rename to package/base/x264/gpac.patch
diff --git a/package/stf/x264/x264.cache b/package/base/x264/x264.cache
similarity index 100%
rename from package/stf/x264/x264.cache
rename to package/base/x264/x264.cache
diff --git a/package/stf/x264/x264.conf b/package/base/x264/x264.conf
similarity index 100%
rename from package/stf/x264/x264.conf
rename to package/base/x264/x264.conf
diff --git a/package/stf/x264/x264.desc b/package/base/x264/x264.desc
similarity index 100%
rename from package/stf/x264/x264.desc
rename to package/base/x264/x264.desc
diff --git a/package/public/xine-lib/xine-lib.cache b/package/base/xine-lib/xine-lib.cache
similarity index 100%
rename from package/public/xine-lib/xine-lib.cache
rename to package/base/xine-lib/xine-lib.cache
diff --git a/package/public/xine-lib/xine-lib.conf b/package/base/xine-lib/xine-lib.conf
similarity index 100%
rename from package/public/xine-lib/xine-lib.conf
rename to package/base/xine-lib/xine-lib.conf
diff --git a/package/public/xine-lib/xine-lib.desc b/package/base/xine-lib/xine-lib.desc
similarity index 100%
rename from package/public/xine-lib/xine-lib.desc
rename to package/base/xine-lib/xine-lib.desc
diff --git a/package/public/xine-ui/strange-test-bug.patch b/package/base/xine-ui/strange-test-bug.patch
similarity index 100%
rename from package/public/xine-ui/strange-test-bug.patch
rename to package/base/xine-ui/strange-test-bug.patch
diff --git a/package/public/xine-ui/xine-ui.cache b/package/base/xine-ui/xine-ui.cache
similarity index 100%
rename from package/public/xine-ui/xine-ui.cache
rename to package/base/xine-ui/xine-ui.cache
diff --git a/package/public/xine-ui/xine-ui.desc b/package/base/xine-ui/xine-ui.desc
similarity index 100%
rename from package/public/xine-ui/xine-ui.desc
rename to package/base/xine-ui/xine-ui.desc