diff --git a/packages/3rdparty/lib/cxxtools/package.mk b/packages/addons/addon-depends/cxxtools/package.mk
similarity index 100%
rename from packages/3rdparty/lib/cxxtools/package.mk
rename to packages/addons/addon-depends/cxxtools/package.mk
diff --git a/packages/3rdparty/lib/cxxtools/patches/cxxtools-2.2-Char_operator_eq_unsigned_int.patch b/packages/addons/addon-depends/cxxtools/patches/cxxtools-2.2-Char_operator_eq_unsigned_int.patch
similarity index 100%
rename from packages/3rdparty/lib/cxxtools/patches/cxxtools-2.2-Char_operator_eq_unsigned_int.patch
rename to packages/addons/addon-depends/cxxtools/patches/cxxtools-2.2-Char_operator_eq_unsigned_int.patch
diff --git a/packages/3rdparty/lib/cxxtools/patches/cxxtools-2.2-hdstream_stdio.patch b/packages/addons/addon-depends/cxxtools/patches/cxxtools-2.2-hdstream_stdio.patch
similarity index 100%
rename from packages/3rdparty/lib/cxxtools/patches/cxxtools-2.2-hdstream_stdio.patch
rename to packages/addons/addon-depends/cxxtools/patches/cxxtools-2.2-hdstream_stdio.patch
diff --git a/packages/3rdparty/lib/cxxtools/patches/cxxtools-2.2-no_shared_flag.patch b/packages/addons/addon-depends/cxxtools/patches/cxxtools-2.2-no_shared_flag.patch
similarity index 100%
rename from packages/3rdparty/lib/cxxtools/patches/cxxtools-2.2-no_shared_flag.patch
rename to packages/addons/addon-depends/cxxtools/patches/cxxtools-2.2-no_shared_flag.patch
diff --git a/packages/3rdparty/lib/cxxtools/patches/cxxtools-crosscompile.patch b/packages/addons/addon-depends/cxxtools/patches/cxxtools-crosscompile.patch
similarity index 100%
rename from packages/3rdparty/lib/cxxtools/patches/cxxtools-crosscompile.patch
rename to packages/addons/addon-depends/cxxtools/patches/cxxtools-crosscompile.patch
diff --git a/packages/devel/enca/package.mk b/packages/addons/addon-depends/enca/package.mk
similarity index 100%
rename from packages/devel/enca/package.mk
rename to packages/addons/addon-depends/enca/package.mk
diff --git a/packages/multimedia/libdvbcsa/package.mk b/packages/addons/addon-depends/libdvbcsa/package.mk
similarity index 100%
rename from packages/multimedia/libdvbcsa/package.mk
rename to packages/addons/addon-depends/libdvbcsa/package.mk
diff --git a/packages/3rdparty/lib/libzip/package.mk b/packages/addons/addon-depends/libzip/package.mk
similarity index 100%
rename from packages/3rdparty/lib/libzip/package.mk
rename to packages/addons/addon-depends/libzip/package.mk
diff --git a/packages/3rdparty/web/tntnet/package.mk b/packages/addons/addon-depends/tntnet/package.mk
similarity index 100%
rename from packages/3rdparty/web/tntnet/package.mk
rename to packages/addons/addon-depends/tntnet/package.mk
diff --git a/packages/3rdparty/web/tntnet/patches/tntnet-2.2-fix_gcc47.patch b/packages/addons/addon-depends/tntnet/patches/tntnet-2.2-fix_gcc47.patch
similarity index 100%
rename from packages/3rdparty/web/tntnet/patches/tntnet-2.2-fix_gcc47.patch
rename to packages/addons/addon-depends/tntnet/patches/tntnet-2.2-fix_gcc47.patch
diff --git a/packages/3rdparty/web/tntnet/patches/tntnet-pkgconfig-support.patch b/packages/addons/addon-depends/tntnet/patches/tntnet-pkgconfig-support.patch
similarity index 100%
rename from packages/3rdparty/web/tntnet/patches/tntnet-pkgconfig-support.patch
rename to packages/addons/addon-depends/tntnet/patches/tntnet-pkgconfig-support.patch
diff --git a/packages/multimedia/vdr-dummydevice/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-dummydevice/package.mk
similarity index 91%
rename from packages/multimedia/vdr-dummydevice/package.mk
rename to packages/addons/addon-depends/vdr-plugins/vdr-plugin-dummydevice/package.mk
index 236a02d8ad..1e8b6c414e 100644
--- a/packages/multimedia/vdr-dummydevice/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-dummydevice/package.mk
@@ -16,13 +16,13 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="vdr-dummydevice"
+PKG_NAME="vdr-plugin-dummydevice"
 PKG_VERSION="2.0.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.vdr-wiki.de/wiki/index.php/Dummydevice-plugin"
-PKG_URL="$DISTRO_MIRROR/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tgz"
+PKG_URL="http://phivdr.dyndns.org/vdr/vdr-dummydevice/${PKG_NAME/-plugin/}-$PKG_VERSION.tgz"
 PKG_SOURCE_DIR="dummydevice-${PKG_VERSION}"
 PKG_DEPENDS_TARGET="toolchain vdr"
 PKG_PRIORITY="optional"
@@ -47,7 +47,7 @@ make_target() {
 post_make_target() {
   VDR_DIR=$(get_build_dir vdr)
   VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
-  LIB_NAME=lib${PKG_NAME}
+  LIB_NAME=lib${PKG_NAME/-plugin/}
 
   cp --remove-destination ${LIB_NAME}.so ${LIB_NAME}.so.${VDR_APIVERSION}
   $STRIP libvdr-*.so*
diff --git a/packages/multimedia/vdr-plugin-dvbapi/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-dvbapi/package.mk
similarity index 100%
rename from packages/multimedia/vdr-plugin-dvbapi/package.mk
rename to packages/addons/addon-depends/vdr-plugins/vdr-plugin-dvbapi/package.mk
diff --git a/packages/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-01_crosscompiling.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-01_crosscompiling.patch
similarity index 100%
rename from packages/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-01_crosscompiling.patch
rename to packages/addons/addon-depends/vdr-plugins/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-01_crosscompiling.patch
diff --git a/packages/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-02_disable-network-mode-on-new-installs.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-02_disable-network-mode-on-new-installs.patch
similarity index 100%
rename from packages/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-02_disable-network-mode-on-new-installs.patch
rename to packages/addons/addon-depends/vdr-plugins/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-02_disable-network-mode-on-new-installs.patch
diff --git a/packages/multimedia/vdr-plugin-eepg/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-eepg/package.mk
similarity index 94%
rename from packages/multimedia/vdr-plugin-eepg/package.mk
rename to packages/addons/addon-depends/vdr-plugins/vdr-plugin-eepg/package.mk
index e639728381..ad1c3723bf 100644
--- a/packages/multimedia/vdr-plugin-eepg/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-eepg/package.mk
@@ -22,7 +22,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://projects.vdr-developer.org/projects/plg-eepg"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="http://projects.vdr-developer.org/git/vdr-plugin-eepg.git/snapshot/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain vdr"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
diff --git a/packages/multimedia/vdr-plugin-epgfixer/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgfixer/package.mk
similarity index 94%
rename from packages/multimedia/vdr-plugin-epgfixer/package.mk
rename to packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgfixer/package.mk
index e64e5beb18..7cf8b030d5 100644
--- a/packages/multimedia/vdr-plugin-epgfixer/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgfixer/package.mk
@@ -22,7 +22,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://projects.vdr-developer.org/projects/plg-epgfixer"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="http://projects.vdr-developer.org/git/vdr-plugin-epgfixer.git/snapshot/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain vdr pcre"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
diff --git a/packages/multimedia/vdr-plugin-epgfixer/patches/vdr-plugin-epgfixer-pkgconfig.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgfixer/patches/vdr-plugin-epgfixer-pkgconfig.patch
similarity index 100%
rename from packages/multimedia/vdr-plugin-epgfixer/patches/vdr-plugin-epgfixer-pkgconfig.patch
rename to packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgfixer/patches/vdr-plugin-epgfixer-pkgconfig.patch
diff --git a/packages/multimedia/vdr-epgsearch/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgsearch/package.mk
similarity index 92%
rename from packages/multimedia/vdr-epgsearch/package.mk
rename to packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgsearch/package.mk
index f5d870fca2..0ab255346c 100644
--- a/packages/multimedia/vdr-epgsearch/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgsearch/package.mk
@@ -16,13 +16,13 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="vdr-epgsearch"
+PKG_NAME="vdr-plugin-epgsearch"
 PKG_VERSION="0b09f90"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://winni.vdr-developer.org/epgsearch/"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain vdr"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
diff --git a/packages/multimedia/vdr-epgsearch/patches/vdr-epgsearch-01-pkgconfig.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgsearch/patches/vdr-plugin-epgsearch-01-pkgconfig.patch
similarity index 100%
rename from packages/multimedia/vdr-epgsearch/patches/vdr-epgsearch-01-pkgconfig.patch
rename to packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgsearch/patches/vdr-plugin-epgsearch-01-pkgconfig.patch
diff --git a/packages/multimedia/vdr-epgsearch/patches/vdr-epgsearch-02_don-t-build-unused-plugins.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgsearch/patches/vdr-plugin-epgsearch-02_don-t-build-unused-plugins.patch
similarity index 100%
rename from packages/multimedia/vdr-epgsearch/patches/vdr-epgsearch-02_don-t-build-unused-plugins.patch
rename to packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgsearch/patches/vdr-plugin-epgsearch-02_don-t-build-unused-plugins.patch
diff --git a/packages/multimedia/vdr-iptv/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-iptv/package.mk
similarity index 94%
rename from packages/multimedia/vdr-iptv/package.mk
rename to packages/addons/addon-depends/vdr-plugins/vdr-plugin-iptv/package.mk
index 38a0ec0fb0..57da7cf768 100644
--- a/packages/multimedia/vdr-iptv/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-iptv/package.mk
@@ -16,13 +16,13 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="vdr-iptv"
+PKG_NAME="vdr-plugin-iptv"
 PKG_VERSION="2.2.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.saunalahti.fi/~rahrenbe/vdr/iptv/"
-PKG_URL="http://www.saunalahti.fi/~rahrenbe/vdr/iptv/files/$PKG_NAME-$PKG_VERSION.tgz"
+PKG_URL="http://www.saunalahti.fi/~rahrenbe/vdr/iptv/files/${PKG_NAME/-plugin/}-$PKG_VERSION.tgz"
 PKG_SOURCE_DIR="iptv-${PKG_VERSION}"
 PKG_DEPENDS_TARGET="toolchain vdr curl"
 PKG_PRIORITY="optional"
diff --git a/packages/multimedia/vdr-iptv/patches/vdr-iptv-pkgconfig.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-iptv/patches/vdr-plugin-iptv-pkgconfig.patch
similarity index 100%
rename from packages/multimedia/vdr-iptv/patches/vdr-iptv-pkgconfig.patch
rename to packages/addons/addon-depends/vdr-plugins/vdr-plugin-iptv/patches/vdr-plugin-iptv-pkgconfig.patch
diff --git a/packages/multimedia/vdr-live/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/package.mk
similarity index 93%
rename from packages/multimedia/vdr-live/package.mk
rename to packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/package.mk
index 269bbc35ad..8cf7c8d9f3 100644
--- a/packages/multimedia/vdr-live/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/package.mk
@@ -16,13 +16,13 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="vdr-live"
+PKG_NAME="vdr-plugin-live"
 PKG_VERSION="0.3.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://live.vdr-developer.org/en/index.php"
-PKG_URL="http://live.vdr-developer.org/downloads/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_URL="http://live.vdr-developer.org/downloads/${PKG_NAME/-plugin/}-${PKG_VERSION}.tar.gz"
 PKG_SOURCE_DIR="live-${PKG_VERSION}"
 PKG_DEPENDS_TARGET="toolchain vdr tntnet pcre:host pcre"
 PKG_PRIORITY="optional"
diff --git a/packages/multimedia/vdr-live/patches/vdr-live-0.3.0-04_tntnet-2.2-1.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/patches/vdr-plugin-live-0.3.0-04_tntnet-2.2-1.patch
similarity index 100%
rename from packages/multimedia/vdr-live/patches/vdr-live-0.3.0-04_tntnet-2.2-1.patch
rename to packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/patches/vdr-plugin-live-0.3.0-04_tntnet-2.2-1.patch
diff --git a/packages/multimedia/vdr-live/patches/vdr-live-0.3.0-04_tntnet-2.2-2.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/patches/vdr-plugin-live-0.3.0-04_tntnet-2.2-2.patch
similarity index 100%
rename from packages/multimedia/vdr-live/patches/vdr-live-0.3.0-04_tntnet-2.2-2.patch
rename to packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/patches/vdr-plugin-live-0.3.0-04_tntnet-2.2-2.patch
diff --git a/packages/multimedia/vdr-live/patches/vdr-live-0.3.0-05_vdr-2.1.2-buildfix.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/patches/vdr-plugin-live-0.3.0-05_vdr-2.1.2-buildfix.patch
similarity index 100%
rename from packages/multimedia/vdr-live/patches/vdr-live-0.3.0-05_vdr-2.1.2-buildfix.patch
rename to packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/patches/vdr-plugin-live-0.3.0-05_vdr-2.1.2-buildfix.patch
diff --git a/packages/multimedia/vdr-live/patches/vdr-live-0.3.0-06_dont-build-i18n.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/patches/vdr-plugin-live-0.3.0-06_dont-build-i18n.patch
similarity index 100%
rename from packages/multimedia/vdr-live/patches/vdr-live-0.3.0-06_dont-build-i18n.patch
rename to packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/patches/vdr-plugin-live-0.3.0-06_dont-build-i18n.patch
diff --git a/packages/multimedia/vdr-live/patches/vdr-live-pkgconfig.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/patches/vdr-plugin-live-pkgconfig.patch
similarity index 100%
rename from packages/multimedia/vdr-live/patches/vdr-live-pkgconfig.patch
rename to packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/patches/vdr-plugin-live-pkgconfig.patch
diff --git a/packages/multimedia/vdr-plugin-restfulapi/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-restfulapi/package.mk
similarity index 97%
rename from packages/multimedia/vdr-plugin-restfulapi/package.mk
rename to packages/addons/addon-depends/vdr-plugins/vdr-plugin-restfulapi/package.mk
index c1fc0a24a2..47dedc2ed1 100644
--- a/packages/multimedia/vdr-plugin-restfulapi/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-restfulapi/package.mk
@@ -23,7 +23,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/yavdr/vdr-plugin-restfulapi"
 PKG_URL="https://github.com/yavdr/${PKG_NAME}/releases/download/2.6.0/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain vdr cxxtools vdr-wirbelscan"
+PKG_DEPENDS_TARGET="toolchain vdr cxxtools vdr-plugin-wirbelscan"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="vdr-plugin-restfulapi: the restful API for the VDR/"
diff --git a/packages/multimedia/vdr-plugin-restfulapi/patches/vdr-plugin-restfulapi-pkgconfig.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-restfulapi/patches/vdr-plugin-restfulapi-pkgconfig.patch
similarity index 100%
rename from packages/multimedia/vdr-plugin-restfulapi/patches/vdr-plugin-restfulapi-pkgconfig.patch
rename to packages/addons/addon-depends/vdr-plugins/vdr-plugin-restfulapi/patches/vdr-plugin-restfulapi-pkgconfig.patch
diff --git a/packages/multimedia/vdr-satip/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/package.mk
similarity index 93%
rename from packages/multimedia/vdr-satip/package.mk
rename to packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/package.mk
index abf54608bd..be16c1656b 100644
--- a/packages/multimedia/vdr-satip/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/package.mk
@@ -16,13 +16,13 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="vdr-satip"
+PKG_NAME="vdr-plugin-satip"
 PKG_VERSION="2.2.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.saunalahti.fi/~rahrenbe/vdr/satip/"
-PKG_URL="http://www.saunalahti.fi/~rahrenbe/vdr/satip/files/$PKG_NAME-$PKG_VERSION.tgz"
+PKG_URL="http://www.saunalahti.fi/~rahrenbe/vdr/satip/files/${PKG_NAME/-plugin/}-$PKG_VERSION.tgz"
 PKG_SOURCE_DIR="satip-${PKG_VERSION}"
 PKG_DEPENDS_TARGET="toolchain vdr curl tinyxml"
 PKG_PRIORITY="optional"
diff --git a/packages/multimedia/vdr-satip/patches/vdr-satip-01-pkgconfig.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/patches/vdr-plugin-satip-01-pkgconfig.patch
similarity index 100%
rename from packages/multimedia/vdr-satip/patches/vdr-satip-01-pkgconfig.patch
rename to packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/patches/vdr-plugin-satip-01-pkgconfig.patch
diff --git a/packages/multimedia/vdr-satip/patches/vdr-satip-02-upstream.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/patches/vdr-plugin-satip-02-upstream.patch
similarity index 100%
rename from packages/multimedia/vdr-satip/patches/vdr-satip-02-upstream.patch
rename to packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/patches/vdr-plugin-satip-02-upstream.patch
diff --git a/packages/multimedia/vdr-plugin-streamdev/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/package.mk
similarity index 100%
rename from packages/multimedia/vdr-plugin-streamdev/package.mk
rename to packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/package.mk
diff --git a/packages/multimedia/vdr-plugin-vnsiserver/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-vnsiserver/package.mk
similarity index 100%
rename from packages/multimedia/vdr-plugin-vnsiserver/package.mk
rename to packages/addons/addon-depends/vdr-plugins/vdr-plugin-vnsiserver/package.mk
diff --git a/packages/multimedia/vdr-wirbelscan/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/package.mk
similarity index 92%
rename from packages/multimedia/vdr-wirbelscan/package.mk
rename to packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/package.mk
index f158d8ba04..dd4b1f92e2 100644
--- a/packages/multimedia/vdr-wirbelscan/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/package.mk
@@ -16,13 +16,13 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="vdr-wirbelscan"
+PKG_NAME="vdr-plugin-wirbelscan"
 PKG_VERSION="0.0.9"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://wirbel.htpc-forum.de/wirbelscan/index2.html"
-PKG_URL="http://wirbel.htpc-forum.de/wirbelscan/$PKG_NAME-$PKG_VERSION.tgz"
+PKG_URL="http://wirbel.htpc-forum.de/wirbelscan/${PKG_NAME/-plugin/}-$PKG_VERSION.tgz"
 PKG_SOURCE_DIR="wirbelscan-${PKG_VERSION}"
 PKG_DEPENDS_TARGET="toolchain vdr"
 PKG_PRIORITY="optional"
diff --git a/packages/multimedia/vdr-wirbelscan/patches/vdr-wirbelscan-01_fix-dvbs-scan.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/patches/vdr-plugin-wirbelscan-01_fix-dvbs-scan.patch
similarity index 100%
rename from packages/multimedia/vdr-wirbelscan/patches/vdr-wirbelscan-01_fix-dvbs-scan.patch
rename to packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/patches/vdr-plugin-wirbelscan-01_fix-dvbs-scan.patch
diff --git a/packages/multimedia/vdr-wirbelscan/patches/vdr-wirbelscan-02_fix-wirbelscancontrol.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/patches/vdr-plugin-wirbelscan-02_fix-wirbelscancontrol.patch
similarity index 100%
rename from packages/multimedia/vdr-wirbelscan/patches/vdr-wirbelscan-02_fix-wirbelscancontrol.patch
rename to packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/patches/vdr-plugin-wirbelscan-02_fix-wirbelscancontrol.patch
diff --git a/packages/multimedia/vdr-wirbelscancontrol/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscancontrol/package.mk
similarity index 86%
rename from packages/multimedia/vdr-wirbelscancontrol/package.mk
rename to packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscancontrol/package.mk
index 009ffeb568..5d6458f27d 100644
--- a/packages/multimedia/vdr-wirbelscancontrol/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscancontrol/package.mk
@@ -16,15 +16,15 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="vdr-wirbelscancontrol"
+PKG_NAME="vdr-plugin-wirbelscancontrol"
 PKG_VERSION="0.0.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://wirbel.htpc-forum.de/wirbelscancontrol/index2.html"
-PKG_URL="http://wirbel.htpc-forum.de/wirbelscancontrol/$PKG_NAME-$PKG_VERSION.tgz"
+PKG_URL="http://wirbel.htpc-forum.de/wirbelscancontrol/${PKG_NAME/-plugin/}-$PKG_VERSION.tgz"
 PKG_SOURCE_DIR="wirbelscancontrol-${PKG_VERSION}"
-PKG_DEPENDS_TARGET="toolchain vdr vdr-wirbelscan"
+PKG_DEPENDS_TARGET="toolchain vdr vdr-plugin-wirbelscan"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="TV"
@@ -41,7 +41,7 @@ pre_configure_target() {
 }
 
 pre_build_target() {
-  WIRBELSCAN_DIR=$(get_build_dir vdr-wirbelscan)
+  WIRBELSCAN_DIR=$(get_build_dir vdr-plugin-wirbelscan)
   ln -sf $WIRBELSCAN_DIR/wirbelscan_services.h $PKG_BUILD
 }
 
diff --git a/packages/multimedia/vdr-wirbelscancontrol/patches/vdr-wirbelscancontrol-01-dont-build-i18n.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscancontrol/patches/vdr-plugin-wirbelscancontrol-01-dont-build-i18n.patch
similarity index 100%
rename from packages/multimedia/vdr-wirbelscancontrol/patches/vdr-wirbelscancontrol-01-dont-build-i18n.patch
rename to packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscancontrol/patches/vdr-plugin-wirbelscancontrol-01-dont-build-i18n.patch
diff --git a/packages/multimedia/vdr-plugin-xmltv2vdr/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/package.mk
similarity index 100%
rename from packages/multimedia/vdr-plugin-xmltv2vdr/package.mk
rename to packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/package.mk
diff --git a/packages/multimedia/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-01_dont-build-i18n.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-01_dont-build-i18n.patch
similarity index 100%
rename from packages/multimedia/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-01_dont-build-i18n.patch
rename to packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-01_dont-build-i18n.patch
diff --git a/packages/multimedia/vdr/package.mk b/packages/addons/addon-depends/vdr/package.mk
similarity index 100%
rename from packages/multimedia/vdr/package.mk
rename to packages/addons/addon-depends/vdr/package.mk
diff --git a/packages/multimedia/vdr/patches/vdr-01_disable_ca_updates.patch b/packages/addons/addon-depends/vdr/patches/vdr-01_disable_ca_updates.patch
similarity index 100%
rename from packages/multimedia/vdr/patches/vdr-01_disable_ca_updates.patch
rename to packages/addons/addon-depends/vdr/patches/vdr-01_disable_ca_updates.patch
diff --git a/packages/multimedia/vdr/patches/vdr-10_decrease-channels.conf-autosave-delay.patch b/packages/addons/addon-depends/vdr/patches/vdr-10_decrease-channels.conf-autosave-delay.patch
similarity index 100%
rename from packages/multimedia/vdr/patches/vdr-10_decrease-channels.conf-autosave-delay.patch
rename to packages/addons/addon-depends/vdr/patches/vdr-10_decrease-channels.conf-autosave-delay.patch
diff --git a/packages/addons/service/boblightd/changelog.txt b/packages/addons/service/boblightd/changelog.txt
new file mode 100644
index 0000000000..2907dab344
--- /dev/null
+++ b/packages/addons/service/boblightd/changelog.txt
@@ -0,0 +1,2 @@
+7.0.100
+- initial LibreELEC version
\ No newline at end of file
diff --git a/packages/addons/service/multimedia/boblightd/config/boblight.X11.sample b/packages/addons/service/boblightd/config/boblight.X11.sample
similarity index 100%
rename from packages/addons/service/multimedia/boblightd/config/boblight.X11.sample
rename to packages/addons/service/boblightd/config/boblight.X11.sample
diff --git a/packages/addons/service/multimedia/boblightd/config/boblight.conf b/packages/addons/service/boblightd/config/boblight.conf
similarity index 100%
rename from packages/addons/service/multimedia/boblightd/config/boblight.conf
rename to packages/addons/service/boblightd/config/boblight.conf
diff --git a/packages/addons/service/multimedia/boblightd/icon/icon.png b/packages/addons/service/boblightd/icon/icon.png
similarity index 100%
rename from packages/addons/service/multimedia/boblightd/icon/icon.png
rename to packages/addons/service/boblightd/icon/icon.png
diff --git a/packages/addons/service/multimedia/boblightd/package.mk b/packages/addons/service/boblightd/package.mk
similarity index 99%
rename from packages/addons/service/multimedia/boblightd/package.mk
rename to packages/addons/service/boblightd/package.mk
index 6f19742aa6..af127a8589 100644
--- a/packages/addons/service/multimedia/boblightd/package.mk
+++ b/packages/addons/service/boblightd/package.mk
@@ -18,7 +18,7 @@
 
 PKG_NAME="boblightd"
 PKG_VERSION="478"
-PKG_REV="0"
+PKG_REV="100"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://code.google.com/p/boblight"
diff --git a/packages/addons/service/multimedia/boblightd/patches/boblightd-2.0.5-add_aml_client.patch b/packages/addons/service/boblightd/patches/boblightd-2.0.5-add_aml_client.patch
similarity index 100%
rename from packages/addons/service/multimedia/boblightd/patches/boblightd-2.0.5-add_aml_client.patch
rename to packages/addons/service/boblightd/patches/boblightd-2.0.5-add_aml_client.patch
diff --git a/packages/addons/service/multimedia/boblightd/patches/boblightd-2.0.5-getopt-includes.patch b/packages/addons/service/boblightd/patches/boblightd-2.0.5-getopt-includes.patch
similarity index 100%
rename from packages/addons/service/multimedia/boblightd/patches/boblightd-2.0.5-getopt-includes.patch
rename to packages/addons/service/boblightd/patches/boblightd-2.0.5-getopt-includes.patch
diff --git a/packages/addons/service/multimedia/boblightd/source/bin/boblightd.start b/packages/addons/service/boblightd/source/bin/boblightd.start
similarity index 100%
rename from packages/addons/service/multimedia/boblightd/source/bin/boblightd.start
rename to packages/addons/service/boblightd/source/bin/boblightd.start
diff --git a/packages/addons/service/multimedia/boblightd/source/default.py b/packages/addons/service/boblightd/source/default.py
similarity index 100%
rename from packages/addons/service/multimedia/boblightd/source/default.py
rename to packages/addons/service/boblightd/source/default.py
diff --git a/packages/addons/service/multimedia/boblightd/source/sleep.d/boblightd.power b/packages/addons/service/boblightd/source/sleep.d/boblightd.power
similarity index 100%
rename from packages/addons/service/multimedia/boblightd/source/sleep.d/boblightd.power
rename to packages/addons/service/boblightd/source/sleep.d/boblightd.power
diff --git a/packages/addons/service/multimedia/boblightd/source/system.d/service.multimedia.boblightd.service b/packages/addons/service/boblightd/source/system.d/service.multimedia.boblightd.service
similarity index 100%
rename from packages/addons/service/multimedia/boblightd/source/system.d/service.multimedia.boblightd.service
rename to packages/addons/service/boblightd/source/system.d/service.multimedia.boblightd.service
diff --git a/packages/addons/service/multimedia/boblightd/changelog.txt b/packages/addons/service/multimedia/boblightd/changelog.txt
deleted file mode 100644
index b3388907e8..0000000000
--- a/packages/addons/service/multimedia/boblightd/changelog.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-7.0.0
-- rebuild for OpenELEC-7.0
-
-6.0.0
-- rebuild for OpenELEC-6.0
-
-4.3.5
-- added boblight-aml
-
-4.3.4
-- update to kodi
-
-4.3.0
-- rebuild for addon api bump
-
-4.1.2
-- rebuild for xlib changes
-
-4.1.1
-- update to boblightd-478
-
-4.1.0
-- convert to systemd service
-- rebuild for addon api bump
-
-4.0.1
-- rebuild
-
-4.0.0
-- rebuild for OpenELEC-4.0
-
-3.1.3
-- update to boblightd-474
-
-3.1.2
-- rebuild
-
-3.1.1
-- rebuild for OpenELEC-3.2
-
-3.0.4
-- update to boblightd-467
-
-3.0.3
-- update to boblightd-465
-
-3.0.2
-- depends on libGLU
-
-3.0.1
-- bump addon version
-- make OpenGL and X11 support optional
-
-2.1.3
-- update to boblightd-449
-
-2.1.2
-- rebuild
-
-2.1.1
-- update to addon version 2.1
-
-2.0.5
-- add possibilty to start / stop addon from addon manager with enable / disable
-- restart boblightd on sleep / resume
-
-2.0.4
-- Fixed so that boblightd will not start if it's already running
-
-2.0.3
-- Removed LD_LIBRARY_PATH dependencies
-
-2.0.2
-- Renamed to boblightd to avoid conflicts
-
-2.0.1
-- initial version boblight
diff --git a/packages/addons/service/multimedia/vdr-addon/changelog.txt b/packages/addons/service/multimedia/vdr-addon/changelog.txt
deleted file mode 100644
index 72c20fd957..0000000000
--- a/packages/addons/service/multimedia/vdr-addon/changelog.txt
+++ /dev/null
@@ -1,303 +0,0 @@
-7.0.2
-- update to vdr-plugin-restfulapi-0.2.6.0
-- update to vdr-plugin-vnsiserver-00b5779
-- update to vdr-satip-b755dbf
-
-7.0.1
-- update to vdr-plugin-xmltv2vdr-b48e0bec
-- update to vdr-plugin-streamdev-fc52e92
-- update to vdr-plugin-restfulapi-0.2.5.6
-- update to vdr-epgsearch-0b09f90
-- update to vdr-plugin-dvbapi-31f409d
-- update to vdr-plugin-vnsiserver-d96f211
-- update to vdr-satip-9d5f7cc
-
-7.0.0
-- rebuild for OpenELEC-7.0
-
-6.0.1
-- update to vdr-plugin-dvbapi-0489e01
-- update to vdr-plugin-vnsiserver-a7b0670
-- update to vdr-satip-2.2.2
-- update to vdr-iptv-2.2.1
-
-6.0.0
-- rebuild for OpenELEC-6.0
-- remove plugin 'control'
-- remove plugin 'xvdr'
-- update to vdr-plugin-vnsiserver-36e2b61
-
-4.3.11
-- update to vdr-plugin-restfulapi-0.2.1.4
-
-4.3.10
-- disable dvbapi network mode
-
-4.3.9
-- update to vdr-2.2.0
-- update to vdr-iptv-2.2.0
-- update to vdr-satip-2.2.0
-- update to vdr-plugin-dvbapi-c0c7fa2
-- update to vdr-plugin-eepg-9cd9a75
-- update to vdr-plugin-vnsiserver-9529e6d
-- update to vdr-plugin-streamdev-84c6f6b
-
-4.3.8
-- update to vdr-2.1.10
-- update to vdr-plugin-restfulapi-0.2.1.1
-- update to vdr-plugin-vnsiserver-f2175ba
-
-4.3.7
-- update to vdr-2.1.8
-- update to vdr-plugin-vnsiserver-b887bc8
-- update to vdr-wirbelscan-0.0.9
-
-4.3.6
-- update to vdr-satip-1.0.2
-- update to vdr-2.1.7
-
-4.3.5
-- add plugin 'vdr-plugin-restfulapi'
-- update to vdr-plugin-xvdr-b300fc3
-
-4.3.4
-- update to vdr-plugin-vnsiserver-a48edf1
-- update to vdr-plugin-dvbapi-36a6b1d
-
-4.3.3
-- add plugin 'vdr-plugin-epgfixer'
-- update to vdr-satip-1.0.1
-
-4.3.2
-- update to kodi
-
-4.3.1
-- update to vdr-plugin-vnsiserver-a7cb405
-- update to vdr-plugin-dvbapi-2617a7f
-
-4.3.0
-- rebuild for addon api bump
-
-4.1.7
-- add option to override epg charset
-- update to vdr-plugin-vnsiserver-7d4aa81
-- update to vdr-satip-0.3.3
-- update to vdr-plugin-eepg-d7dc614
-- update to vdr-plugin-dvbapi-bdcad3f
-- update to vdr-iptv-2.1.3
-
-4.1.6
-- update to vdr-2.1.6
-- add plugin 'vdr-dummydevice'
-- add plugin 'vdr-satip'
-- remove plugin: 'sc'
-- update to vdr-iptv-2.1.2
-- update to vdr-plugin-xvdr-7f49bfa
-- update to vdr-plugin-vnsiserver-a3f7ac5
-- update to vdr-plugin-dvbapi-bf11f9e
-
-4.1.5
-- fix issues with "wait for frontend init". thanks @sraue
-
-4.1.4
-- add plugin 'vdr-plugin-eepg'
-- update to vdr-plugin-xvdr-4a9d95e
-- update to vdr-plugin-dvbapi-a9b738e
-
-4.1.3
-- update to vdr-2.1.5
-- update to vdr-iptv-2.1.0
-- update to vdr-plugin-vnsiserver-e5f02b6
-- update to vdr-plugin-dvbapi-a3b4a5a
-- update to vdr-plugin-xvdr-7d6ebb7
-
-4.1.2
-- update to vdr-2.1.3
-- update to vdr-iptv-2.0.1
-- update to vdr-plugin-dvbapi-4d9de95
-- update to vdr-plugin-streamdev-40704cd
-- update to vdr-plugin-vnsiserver-9021115
-- update to vdr-epgsearch-29c174a
-
-4.1.1
-- rebuild to fix curl/gnutls/ssl
-
-4.1.0
-- convert to systemd service
-- rebuild for addon api bump
-
-4.0.3
-- update to vdr-plugin-vnsiserver-e2e6804 (vnsi5)
-
-4.0.2
-- update to vdr-2.1.2
-- update to vdr-plugin-streamdev-a9c2adb
-- add option to run external reccmd (noad)
-
-4.0.1
-- update to vdr-2.1.1
-- remove rotorng. dish positioner is now implemented in vdr
-
-4.0.0
-- update to vdr-2.0.3
-- update to vdr-plugin-vnsiserver-cd5023b
-- update to vdr-plugin-xvdr-6249892
-- remove dvbsddevice / dvbhddevice
-
-3.1.4
-- vdr-plugin-dvbapi: switch to libdvbcsa
-
-3.1.3
-- rebuild
-
-3.1.2
-- fix unloading multiple modules on suspend
-
-3.1.1
-- rebuild for OpenELEC-3.2
-
-3.0.11
-- fix epg/live charset issue
-
-3.0.10
-- improve suspend/resume
-
-3.0.9
-- rebuild
-
-3.0.8
-- vdr-plugin-xmltv2vdr: use VDR_CACHE_DIR for epg.db
-- use own /var/run/vdr tmpfs mount
-
-3.0.7
-- update to vdr-plugin-xmltv2vdr-30903cc0
-- cleanup epgsources handling
-- * support for multiple epgsources
-- * support user defined epgsources
-- fixed epgsearch plugin not working without streamdev-server
-- vdr-addon: update to vdr-plugin-xvdr-33afe59
-
-3.0.6
-- fix startup error in vnsiserver / 32bit
-
-3.0.5
-- updated to vdr-2.0.1
-- remove dynamite plugin
-- update to vdr-epgsearch-e2de927
-- update to vdr-iptv-2.0.0
-- update to vdr-plugin-streamdev-329129d
-- update to vdr-live-0.3.0
-- update to vdr-plugin-dvbapi-555272d
-- update to vdr-plugin-xmltv2vdr-90c023f6
-- update to vdr-plugin-xvdr-935a294
-- update to rotorng-0.3.1
-- added dvbsddevice plugin
-- added dvbhddevice plugin
-
-3.0.4
-- update to vdr-1.1.33
-- update to vdr-plugin-dvbapi-cd93752
-- update to vdr-plugin-streamdev-f58086a
-- update to vdr-epgsearch-0fc4817
-- remove text2skin plugin
-- remove xinelib plugin
-
-3.0.3
-- update to vdr-sc-620
-- update to vdr-plugin-xvdr-c43033c
-- update to vdr-plugin-vnsiserver-e3cd383
-- update to vdr-plugin-streamdev-9135cde
-- update to vdr-plugin-dvbapi-e87e15f
-- update to vdr-dynamite-914af24
-
-3.0.2
-- update to vdr-plugin-xmltv2vdr-8be374e
-- update to vdr-plugin-xvdr-c2fa08a
-- added vdr-plugin-vnsiserver
-
-3.0.1
-- bump addon version
-
-2.1.8
-- rebuild due to some static libs in latest git
-
-2.1.7
-- update to vdr-plugin-streamdev-6a47e20
-- update to vdr-sc-613
-
-2.1.6
-- update to vdr-plugin-dvbapi-e3200c8
-- added vdr-xmltv2vdr plugin
-- added xineliboutput plugin
-- added text2skin plugin
-- preparation for xine based VDR frontend as separate addon
-
-2.1.5
-- fixed rotorng
-- added wirbelscancontrol plugin
-
-2.1.4
-- added live plugin
-- added rotorng plugin
-- added control plugin
-- added epgsearch plugin
-- update to vdr-iptv-0.5.2
-- update to vdr-plugin-streamdev-8719007
-- update to vdr-plugin-xvdr-b62ccbd
-
-2.1.3
-- adjust for fontconfig 2.9.0
-- update patchset 
-- suspend/resume fixes
-
-2.1.2
-- update to vdr-1.7.27
-- update to vdr-dynamite-10d78a8
-- update to vdr-sc-605
-
-2.1.1
-- rebuild for addon version 2.1
-- update to vdr-plugin-dvbapi-9bef03f
-
-2.0.9
-- modules to remove on sleep now configurable via settings ui
-- enabled plugins now configurable via settings ui
-
-2.0.8
-- update to vdr-1.7.25
-- update to vdr-plugin-xvdr-c98852f
-- add streamdev-client / server plugin
-- update to vdr-iptv-0.5.0
-- move w_scan in a own addon
-
-2.0.7
-- add possibilty to start / stop addon from addon manager with enable / disable
-
-2.0.6
-- enable unloading/loading dvb modules on suspend/resume
-
-2.0.5
-- update to vdr-1.7.24
-- sc now works without the need to disable dynamite plugin
-
-2.0.4
-- start userspace DVB drivers before VDR
-
-2.0.3
-- update to vdr-plugin-xvdr-0ac808a
-- rebuild for libiconv changes
-- update to vdr-plugin-dvbapi-b0194c8
-- update to w_scan-20120112
-
-2.0.2
-- update to vdr-plugin-xvdr-ec9b759
-- update to vdr-plugin-dvbapi-dad660a
-- update to vdr-dynamite-27d7bed
-- add plugin 'vdr-iptv'
-
-2.0.1
-- rename vdr-dvbapi-plugin to vdr-plugin-dvbapi
-- update to vdr-plugin-dvbapi-68e043a
-
-2.0.0
-- initial version vdr-1.7.22
diff --git a/packages/addons/service/vdr-addon/changelog.txt b/packages/addons/service/vdr-addon/changelog.txt
new file mode 100644
index 0000000000..2907dab344
--- /dev/null
+++ b/packages/addons/service/vdr-addon/changelog.txt
@@ -0,0 +1,2 @@
+7.0.100
+- initial LibreELEC version
\ No newline at end of file
diff --git a/packages/addons/service/multimedia/vdr-addon/icon/icon.png b/packages/addons/service/vdr-addon/icon/icon.png
similarity index 100%
rename from packages/addons/service/multimedia/vdr-addon/icon/icon.png
rename to packages/addons/service/vdr-addon/icon/icon.png
diff --git a/packages/addons/service/multimedia/vdr-addon/package.mk b/packages/addons/service/vdr-addon/package.mk
similarity index 83%
rename from packages/addons/service/multimedia/vdr-addon/package.mk
rename to packages/addons/service/vdr-addon/package.mk
index 5fd8dc5e25..42e810619c 100644
--- a/packages/addons/service/multimedia/vdr-addon/package.mk
+++ b/packages/addons/service/vdr-addon/package.mk
@@ -19,12 +19,12 @@
 
 PKG_NAME="vdr-addon"
 PKG_VERSION="7.0"
-PKG_REV="2"
+PKG_REV="100"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain attr libcap vdr vdr-plugin-vnsiserver vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-plugin-dvbapi vdr-plugin-streamdev vdr-live vdr-epgsearch vdr-plugin-xmltv2vdr vdr-plugin-eepg vdr-dummydevice vdr-satip vdr-plugin-epgfixer vdr-plugin-restfulapi"
+PKG_DEPENDS_TARGET="toolchain attr libcap vdr vdr-plugin-vnsiserver vdr-plugin-iptv vdr-plugin-wirbelscan vdr-plugin-wirbelscancontrol vdr-plugin-dvbapi vdr-plugin-streamdev vdr-plugin-live vdr-plugin-epgsearch vdr-plugin-xmltv2vdr vdr-plugin-eepg vdr-plugin-dummydevice vdr-plugin-satip vdr-plugin-epgfixer vdr-plugin-restfulapi"
 PKG_PRIORITY="optional"
 PKG_SECTION="service.multimedia"
 PKG_SHORTDESC="vdr: A powerful DVB TV application"
@@ -47,7 +47,7 @@ makeinstall_target() {
 
 addon() {
   VDR_DIR="$(get_build_dir vdr)"
-  VDR_LIVE_DIR="$(get_build_dir vdr-live)"
+  VDR_PLUGIN_LIVE_DIR="$(get_build_dir vdr-plugin-live)"
   VDR_PLUGIN_VNSISERVER_DIR="$(get_build_dir vdr-plugin-vnsiserver)"
   VDR_PLUGIN_STREAMVEV_DIR="$(get_build_dir vdr-plugin-streamdev)"
   VDR_PLUGIN_XMLTV2VDR="$(get_build_dir vdr-plugin-xmltv2vdr)"
@@ -66,7 +66,7 @@ addon() {
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/epgsearch
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/live
-  cp -PR $VDR_LIVE_DIR/live/* $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/live
+  cp -PR $VDR_PLUGIN_LIVE_DIR/live/* $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/live
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins
 
@@ -75,18 +75,18 @@ addon() {
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $VDR_PLUGIN_VNSISERVER_DIR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
-  cp -PR $(get_build_dir vdr-iptv)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
-  cp -PR $(get_build_dir vdr-wirbelscan)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
-  cp -PR $(get_build_dir vdr-wirbelscancontrol)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
+  cp -PR $(get_build_dir vdr-plugin-iptv)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
+  cp -PR $(get_build_dir vdr-plugin-wirbelscan)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
+  cp -PR $(get_build_dir vdr-plugin-wirbelscancontrol)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $(get_build_dir vdr-plugin-dvbapi)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $(get_build_dir vdr-plugin-eepg)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $VDR_PLUGIN_STREAMVEV_DIR/server/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $VDR_PLUGIN_STREAMVEV_DIR/client/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
-  cp -PR $VDR_LIVE_DIR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
-  cp -PR $(get_build_dir vdr-epgsearch)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
+  cp -PR $VDR_PLUGIN_LIVE_DIR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
+  cp -PR $(get_build_dir vdr-plugin-epgsearch)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $VDR_PLUGIN_XMLTV2VDR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
-  cp -PR $(get_build_dir vdr-dummydevice)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
-  cp -PR $(get_build_dir vdr-satip)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
+  cp -PR $(get_build_dir vdr-plugin-dummydevice)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
+  cp -PR $(get_build_dir vdr-plugin-satip)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $VDR_PLUGIN_EPGFIXER_DIR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $VDR_PLUGIN_RESTFULAPI_DIR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
 
diff --git a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start b/packages/addons/service/vdr-addon/source/bin/vdr.start
similarity index 100%
rename from packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
rename to packages/addons/service/vdr-addon/source/bin/vdr.start
diff --git a/packages/addons/service/multimedia/vdr-addon/source/default.py b/packages/addons/service/vdr-addon/source/default.py
similarity index 100%
rename from packages/addons/service/multimedia/vdr-addon/source/default.py
rename to packages/addons/service/vdr-addon/source/default.py
diff --git a/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml b/packages/addons/service/vdr-addon/source/resources/language/English/strings.xml
similarity index 100%
rename from packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml
rename to packages/addons/service/vdr-addon/source/resources/language/English/strings.xml
diff --git a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml b/packages/addons/service/vdr-addon/source/resources/settings.xml
similarity index 100%
rename from packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml
rename to packages/addons/service/vdr-addon/source/resources/settings.xml
diff --git a/packages/addons/service/multimedia/vdr-addon/source/settings-default.xml b/packages/addons/service/vdr-addon/source/settings-default.xml
similarity index 100%
rename from packages/addons/service/multimedia/vdr-addon/source/settings-default.xml
rename to packages/addons/service/vdr-addon/source/settings-default.xml
diff --git a/packages/addons/service/multimedia/vdr-addon/source/sleep.d/vdr.power b/packages/addons/service/vdr-addon/source/sleep.d/vdr.power
similarity index 100%
rename from packages/addons/service/multimedia/vdr-addon/source/sleep.d/vdr.power
rename to packages/addons/service/vdr-addon/source/sleep.d/vdr.power
diff --git a/packages/addons/service/multimedia/vdr-addon/source/system.d/service.multimedia.vdr-addon.service b/packages/addons/service/vdr-addon/source/system.d/service.multimedia.vdr-addon.service
similarity index 100%
rename from packages/addons/service/multimedia/vdr-addon/source/system.d/service.multimedia.vdr-addon.service
rename to packages/addons/service/vdr-addon/source/system.d/service.multimedia.vdr-addon.service