diff --git a/packages/addons/addon-depends/moby/package.mk b/packages/addons/addon-depends/moby/package.mk
new file mode 100644
index 0000000000..982def278b
--- /dev/null
+++ b/packages/addons/addon-depends/moby/package.mk
@@ -0,0 +1,92 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2009-present Lukas Rusak (lrusak@libreelec.tv)
+#
+#  LibreELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  LibreELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="moby"
+PKG_VERSION="1.13.1"
+PKG_ARCH="any"
+PKG_LICENSE="ASL"
+PKG_SITE="http://www.docker.com/"
+PKG_URL="https://github.com/moby/moby/archive/v${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain sqlite go:host containerd runc libnetwork tini"
+PKG_SECTION="service/system"
+PKG_SHORTDESC="Moby is an open-source engine that automates the deployment of any application as a lightweight, portable, self-sufficient container that will run virtually anywhere."
+PKG_LONGDESC="Docker containers can encapsulate any payload, and will run consistently on and between virtually any server. The same container that a developer builds and tests on a laptop will run at scale, in production*, on VMs, bare-metal servers, OpenStack clusters, public instances, or combinations of the above. Moby as the central part of the Docker engine"
+PKG_AUTORECONF="no"
+
+configure_target() {
+  export DOCKER_BUILDTAGS="daemon \
+                           autogen \
+                           exclude_graphdriver_devicemapper \
+                           exclude_graphdriver_aufs \
+                           exclude_graphdriver_btrfs \
+                           journald"
+
+  case $TARGET_ARCH in
+    x86_64)
+      export GOARCH=amd64
+      ;;
+    arm)
+      export GOARCH=arm
+
+      case $TARGET_CPU in
+        arm1176jzf-s)
+          export GOARM=6
+          ;;
+        cortex-a7|cortex-a9)
+         export GOARM=7
+         ;;
+      esac
+      ;;
+    aarch64)
+      export GOARCH=arm64
+      ;;
+  esac
+
+  export GOOS=linux
+  export CGO_ENABLED=1
+  export CGO_NO_EMULATION=1
+  export CGO_CFLAGS=$CFLAGS
+  export LDFLAGS="-w -linkmode external -extldflags -Wl,--unresolved-symbols=ignore-in-shared-libs -extld $CC"
+  export GOLANG=$TOOLCHAIN/lib/golang/bin/go
+  export GOPATH=$PKG_BUILD/.gopath
+  export GOROOT=$TOOLCHAIN/lib/golang
+  export PATH=$PATH:$GOROOT/bin
+
+  mkdir -p $PKG_BUILD/.gopath
+  if [ -d $PKG_BUILD/vendor ]; then
+    mv $PKG_BUILD/vendor $PKG_BUILD/.gopath/src
+  fi
+  ln -fs $PKG_BUILD $PKG_BUILD/.gopath/src/github.com/docker/docker
+
+  # used for docker version
+  export GITCOMMIT=$PKG_VERSION
+  export VERSION=$PKG_VERSION
+  export BUILDTIME="$(date --utc)"
+  bash ./hack/make/.go-autogen
+}
+
+make_target() {
+  mkdir -p bin
+  $GOLANG build -v -o bin/docker -a -tags "$DOCKER_BUILDTAGS" -ldflags "$LDFLAGS" ./cmd/docker
+  $GOLANG build -v -o bin/dockerd -a -tags "$DOCKER_BUILDTAGS" -ldflags "$LDFLAGS" ./cmd/dockerd
+}
+
+makeinstall_target() {
+  :
+}
+
diff --git a/packages/addons/service/docker/patches/docker-001-use-addon-storage-location.patch b/packages/addons/addon-depends/moby/patches/moby-001-use-addon-storage-location.patch
similarity index 100%
rename from packages/addons/service/docker/patches/docker-001-use-addon-storage-location.patch
rename to packages/addons/addon-depends/moby/patches/moby-001-use-addon-storage-location.patch
diff --git a/packages/addons/service/docker/patches/docker-003-use-short-expected-commit-values.patch b/packages/addons/addon-depends/moby/patches/moby-003-use-short-expected-commit-values.patch
similarity index 100%
rename from packages/addons/service/docker/patches/docker-003-use-short-expected-commit-values.patch
rename to packages/addons/addon-depends/moby/patches/moby-003-use-short-expected-commit-values.patch
diff --git a/packages/addons/service/docker/changelog.txt b/packages/addons/service/docker/changelog.txt
index 100ebbd692..03dc1a7c8a 100644
--- a/packages/addons/service/docker/changelog.txt
+++ b/packages/addons/service/docker/changelog.txt
@@ -1,56 +1,59 @@
-9.0.114
+116
+- change to new project structure
+
+114
 - Enable journald buildtag
 
-9.0.113
+113
 - Update to docker 1.13.1
 - Update to golang 1.7.5
 
-8.1.112
+112
 - Update to docker 1.13.0
 - Use journald log driver
 - Add docker-init (tini)
 
-8.1.111
+111
 - Add temporary cleanup for old systemd service
 
-8.1.110
+110
 - Update to docker 1.12.5
 - Adjust the systemd service file
 
-8.1.109
+109
 - Update to docker 1.12.3
 - Include ctop utility
 
-8.0.108
+108
 - Update to docker 1.12.2
 
-8.0.107
+107
 - Update to docker 1.12.1
 
-8.0.106
+106
 - Include missing docker-proxy
 
-8.0.105
+105
 - Update to docker 1.12.0
 - Update to golang 1.6.3
 - Use overlay2 driver (new installs only)
 - Remove docker-containerd-ctr
 
-8.0.104
+104
 - Update to docker 1.11.2
 
-8.0.103
+103
 - Allow using kodi notifications based on Docker events API
 
-8.0.102
+102
 - Update to docker 1.11.1
 
-8.0.101
+101
 - Update to golang 1.6.2
 - Update to docker 1.11.0
 
-8.0.100
+100
 - Update for LibreELEC 8.0
 
-7.0.100
+100
 - Initial release
diff --git a/packages/addons/service/docker/package.mk b/packages/addons/service/docker/package.mk
index 037987cf5c..6e45f9137d 100644
--- a/packages/addons/service/docker/package.mk
+++ b/packages/addons/service/docker/package.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of LibreELEC - https://libreelec.tv
-#      Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
+#      Copyright (C) 2009-present Lukas Rusak (lrusak@libreelec.tv)
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -17,16 +17,13 @@
 ################################################################################
 
 PKG_NAME="docker"
-PKG_VERSION="1.13.1"
-PKG_SHA256="0d24e814f7adf19dc281b29fef69d0dfec7994966de9aaed7d4207d3034b9ee0"
-PKG_REV="115"
+PKG_VERSION=""
+PKG_REV="116"
 PKG_ARCH="any"
 PKG_ADDON_PROJECTS="Generic RPi RPi2 imx6 WeTek_Hub WeTek_Play_2 Odroid_C2"
-PKG_LICENSE="ASL"
+PKG_LICENSE=""
 PKG_SITE="http://www.docker.com/"
-PKG_URL="https://github.com/docker/docker/archive/v${PKG_VERSION}.tar.gz"
-PKG_SOURCE_DIR="moby-$PKG_VERSION"
-PKG_DEPENDS_TARGET="toolchain sqlite go:host containerd runc libnetwork tini"
+PKG_DEPENDS_TARGET="toolchain moby"
 PKG_SECTION="service/system"
 PKG_SHORTDESC="Docker is an open-source engine that automates the deployment of any application as a lightweight, portable, self-sufficient container that will run virtually anywhere."
 PKG_LONGDESC="Docker containers can encapsulate any payload, and will run consistently on and between virtually any server. The same container that a developer builds and tests on a laptop will run at scale, in production*, on VMs, bare-metal servers, OpenStack clusters, public instances, or combinations of the above."
@@ -36,72 +33,18 @@ PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Docker"
 PKG_ADDON_TYPE="xbmc.service"
 
-configure_target() {
-  export DOCKER_BUILDTAGS="daemon \
-                           autogen \
-                           exclude_graphdriver_devicemapper \
-                           exclude_graphdriver_aufs \
-                           exclude_graphdriver_btrfs \
-                           journald"
-
-  case $TARGET_ARCH in
-    x86_64)
-      export GOARCH=amd64
-      ;;
-    arm)
-      export GOARCH=arm
-
-      case $TARGET_CPU in
-        arm1176jzf-s)
-          export GOARM=6
-          ;;
-        cortex-a7|cortex-a9)
-         export GOARM=7
-         ;;
-      esac
-      ;;
-    aarch64)
-      export GOARCH=arm64
-      ;;
-  esac
-
-  export GOOS=linux
-  export CGO_ENABLED=1
-  export CGO_NO_EMULATION=1
-  export CGO_CFLAGS=$CFLAGS
-  export LDFLAGS="-w -linkmode external -extldflags -Wl,--unresolved-symbols=ignore-in-shared-libs -extld $CC"
-  export GOLANG=$TOOLCHAIN/lib/golang/bin/go
-  export GOPATH=$PKG_BUILD/.gopath
-  export GOROOT=$TOOLCHAIN/lib/golang
-  export PATH=$PATH:$GOROOT/bin
-
-  mkdir -p $PKG_BUILD/.gopath
-  if [ -d $PKG_BUILD/vendor ]; then
-    mv $PKG_BUILD/vendor $PKG_BUILD/.gopath/src
-  fi
-  ln -fs $PKG_BUILD $PKG_BUILD/.gopath/src/github.com/docker/docker
-
-  # used for docker version
-  export GITCOMMIT=$PKG_VERSION
-  export VERSION=$PKG_VERSION
-  export BUILDTIME="$(date --utc)"
-  bash ./hack/make/.go-autogen
-}
-
 make_target() {
-  mkdir -p bin
-  $GOLANG build -v -o bin/docker -a -tags "$DOCKER_BUILDTAGS" -ldflags "$LDFLAGS" ./cmd/docker
-  $GOLANG build -v -o bin/dockerd -a -tags "$DOCKER_BUILDTAGS" -ldflags "$LDFLAGS" ./cmd/dockerd
+  : # nop
 }
 
 makeinstall_target() {
-  :
+  : # nop
 }
 
 addon() {
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $PKG_BUILD/bin/docker $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $PKG_BUILD/bin/dockerd $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_build_dir moby)/bin/docker $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_build_dir moby)/bin/dockerd $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # containerd
     cp -P $(get_build_dir containerd)/bin/containerd $ADDON_BUILD/$PKG_ADDON_ID/bin/docker-containerd