diff --git a/tools/mkpkg/mkpkg_adsp.basic b/tools/mkpkg/mkpkg_adsp.basic
deleted file mode 100755
index af119ab254..0000000000
--- a/tools/mkpkg/mkpkg_adsp.basic
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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.
-#
-#  OpenELEC 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 OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d adsp.basic.git ]; then
-    git clone https://github.com/kodi-adsp/adsp.basic.git adsp.basic.git
-  fi
-
-  cd adsp.basic.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf adsp.basic-$GIT_REV
-  cp -R adsp.basic.git adsp.basic-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf adsp.basic-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf adsp.basic-$GIT_REV.tar.xz adsp.basic-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf adsp.basic-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_adsp.biquad.filters b/tools/mkpkg/mkpkg_adsp.biquad.filters
deleted file mode 100755
index 33dfbd3971..0000000000
--- a/tools/mkpkg/mkpkg_adsp.biquad.filters
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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.
-#
-#  OpenELEC 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 OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d adsp.biquad.filters.git ]; then
-    git clone https://github.com/kodi-adsp/adsp.biquad.filters.git adsp.biquad.filters.git
-  fi
-
-  cd adsp.biquad.filters.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf adsp.biquad.filters-$GIT_REV
-  cp -R adsp.biquad.filters.git adsp.biquad.filters-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf adsp.biquad.filters-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf adsp.biquad.filters-$GIT_REV.tar.xz adsp.biquad.filters-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf adsp.biquad.filters-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_adsp.freesurround b/tools/mkpkg/mkpkg_adsp.freesurround
deleted file mode 100755
index 497d799f12..0000000000
--- a/tools/mkpkg/mkpkg_adsp.freesurround
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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.
-#
-#  OpenELEC 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 OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d adsp.freesurround.git ]; then
-    git clone https://github.com/kodi-adsp/adsp.freesurround.git adsp.freesurround.git
-  fi
-
-  cd adsp.freesurround.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf adsp.freesurround-$GIT_REV
-  cp -R adsp.freesurround.git adsp.freesurround-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf adsp.freesurround-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf adsp.freesurround-$GIT_REV.tar.xz adsp.freesurround-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf adsp.freesurround-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_audiodecoder.2sf b/tools/mkpkg/mkpkg_audiodecoder.2sf
deleted file mode 100755
index b663b55853..0000000000
--- a/tools/mkpkg/mkpkg_audiodecoder.2sf
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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.
-#
-#  OpenELEC 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 OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d audiodecoder.2sf.git ]; then
-    git clone https://github.com/notspiff/audiodecoder.2sf.git audiodecoder.2sf.git
-  fi
-
-  cd audiodecoder.2sf.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf audiodecoder.2sf-$GIT_REV
-  cp -R audiodecoder.2sf.git audiodecoder.2sf-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf audiodecoder.2sf-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf audiodecoder.2sf-$GIT_REV.tar.xz audiodecoder.2sf-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf audiodecoder.2sf-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_audiodecoder.asap b/tools/mkpkg/mkpkg_audiodecoder.asap
deleted file mode 100755
index 914dedfd0f..0000000000
--- a/tools/mkpkg/mkpkg_audiodecoder.asap
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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.
-#
-#  OpenELEC 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 OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d audiodecoder.asap.git ]; then
-    git clone https://github.com/notspiff/audiodecoder.asap.git audiodecoder.asap.git
-  fi
-
-  cd audiodecoder.asap.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf audiodecoder.asap-$GIT_REV
-  cp -R audiodecoder.asap.git audiodecoder.asap-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf audiodecoder.asap-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf audiodecoder.asap-$GIT_REV.tar.xz audiodecoder.asap-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf audiodecoder.asap-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_audiodecoder.dumb b/tools/mkpkg/mkpkg_audiodecoder.dumb
deleted file mode 100755
index a452df7d25..0000000000
--- a/tools/mkpkg/mkpkg_audiodecoder.dumb
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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.
-#
-#  OpenELEC 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 OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d audiodecoder.dumb.git ]; then
-    git clone https://github.com/notspiff/audiodecoder.dumb.git audiodecoder.dumb.git
-  fi
-
-  cd audiodecoder.dumb.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf audiodecoder.dumb-$GIT_REV
-  cp -R audiodecoder.dumb.git audiodecoder.dumb-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf audiodecoder.dumb-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf audiodecoder.dumb-$GIT_REV.tar.xz audiodecoder.dumb-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf audiodecoder.dumb-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_audiodecoder.fluidsynth b/tools/mkpkg/mkpkg_audiodecoder.fluidsynth
deleted file mode 100755
index 65b39aae6d..0000000000
--- a/tools/mkpkg/mkpkg_audiodecoder.fluidsynth
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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.
-#
-#  OpenELEC 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 OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d audiodecoder.fluidsynth.git ]; then
-    git clone https://github.com/notspiff/audiodecoder.fluidsynth.git audiodecoder.fluidsynth.git
-  fi
-
-  cd audiodecoder.fluidsynth.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf audiodecoder.fluidsynth-$GIT_REV
-  cp -R audiodecoder.fluidsynth.git audiodecoder.fluidsynth-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf audiodecoder.fluidsynth-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf audiodecoder.fluidsynth-$GIT_REV.tar.xz audiodecoder.fluidsynth-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf audiodecoder.fluidsynth-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_audiodecoder.gme b/tools/mkpkg/mkpkg_audiodecoder.gme
deleted file mode 100755
index fc20a75d62..0000000000
--- a/tools/mkpkg/mkpkg_audiodecoder.gme
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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.
-#
-#  OpenELEC 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 OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d audiodecoder.gme.git ]; then
-    git clone https://github.com/notspiff/audiodecoder.gme.git audiodecoder.gme.git
-  fi
-
-  cd audiodecoder.gme.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf audiodecoder.gme-$GIT_REV
-  cp -R audiodecoder.gme.git audiodecoder.gme-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf audiodecoder.gme-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf audiodecoder.gme-$GIT_REV.tar.xz audiodecoder.gme-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf audiodecoder.gme-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_audiodecoder.gsf b/tools/mkpkg/mkpkg_audiodecoder.gsf
deleted file mode 100755
index be36c95c7a..0000000000
--- a/tools/mkpkg/mkpkg_audiodecoder.gsf
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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.
-#
-#  OpenELEC 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 OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d audiodecoder.gsf.git ]; then
-    git clone https://github.com/notspiff/audiodecoder.gsf.git audiodecoder.gsf.git
-  fi
-
-  cd audiodecoder.gsf.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf audiodecoder.gsf-$GIT_REV
-  cp -R audiodecoder.gsf.git audiodecoder.gsf-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf audiodecoder.gsf-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf audiodecoder.gsf-$GIT_REV.tar.xz audiodecoder.gsf-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf audiodecoder.gsf-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_audiodecoder.ncsf b/tools/mkpkg/mkpkg_audiodecoder.ncsf
deleted file mode 100755
index 4a9561f713..0000000000
--- a/tools/mkpkg/mkpkg_audiodecoder.ncsf
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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.
-#
-#  OpenELEC 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 OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d audiodecoder.ncsf.git ]; then
-    git clone https://github.com/notspiff/audiodecoder.ncsf.git audiodecoder.ncsf.git
-  fi
-
-  cd audiodecoder.ncsf.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf audiodecoder.ncsf-$GIT_REV
-  cp -R audiodecoder.ncsf.git audiodecoder.ncsf-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf audiodecoder.ncsf-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf audiodecoder.ncsf-$GIT_REV.tar.xz audiodecoder.ncsf-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf audiodecoder.ncsf-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_audiodecoder.openmpt b/tools/mkpkg/mkpkg_audiodecoder.openmpt
deleted file mode 100755
index a643071a22..0000000000
--- a/tools/mkpkg/mkpkg_audiodecoder.openmpt
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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.
-#
-#  OpenELEC 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 OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d audiodecoder.openmpt.git ]; then
-    git clone https://github.com/notspiff/audiodecoder.openmpt.git audiodecoder.openmpt.git
-  fi
-
-  cd audiodecoder.openmpt.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf audiodecoder.openmpt-$GIT_REV
-  cp -R audiodecoder.openmpt.git audiodecoder.openmpt-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf audiodecoder.openmpt-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf audiodecoder.openmpt-$GIT_REV.tar.xz audiodecoder.openmpt-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf audiodecoder.openmpt-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_audiodecoder.organya b/tools/mkpkg/mkpkg_audiodecoder.organya
deleted file mode 100755
index 401dcf4847..0000000000
--- a/tools/mkpkg/mkpkg_audiodecoder.organya
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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.
-#
-#  OpenELEC 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 OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d audiodecoder.organya.git ]; then
-    git clone https://github.com/notspiff/audiodecoder.organya.git audiodecoder.organya.git
-  fi
-
-  cd audiodecoder.organya.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf audiodecoder.organya-$GIT_REV
-  cp -R audiodecoder.organya.git audiodecoder.organya-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf audiodecoder.organya-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf audiodecoder.organya-$GIT_REV.tar.xz audiodecoder.organya-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf audiodecoder.organya-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_audiodecoder.qsf b/tools/mkpkg/mkpkg_audiodecoder.qsf
deleted file mode 100755
index 4acd53a6e3..0000000000
--- a/tools/mkpkg/mkpkg_audiodecoder.qsf
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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.
-#
-#  OpenELEC 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 OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d audiodecoder.qsf.git ]; then
-    git clone https://github.com/notspiff/audiodecoder.qsf.git audiodecoder.qsf.git
-  fi
-
-  cd audiodecoder.qsf.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf audiodecoder.qsf-$GIT_REV
-  cp -R audiodecoder.qsf.git audiodecoder.qsf-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf audiodecoder.qsf-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf audiodecoder.qsf-$GIT_REV.tar.xz audiodecoder.qsf-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf audiodecoder.qsf-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_audiodecoder.ssf b/tools/mkpkg/mkpkg_audiodecoder.ssf
deleted file mode 100755
index ab26e73cae..0000000000
--- a/tools/mkpkg/mkpkg_audiodecoder.ssf
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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.
-#
-#  OpenELEC 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 OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d audiodecoder.ssf.git ]; then
-    git clone https://github.com/notspiff/audiodecoder.ssf.git audiodecoder.ssf.git
-  fi
-
-  cd audiodecoder.ssf.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf audiodecoder.ssf-$GIT_REV
-  cp -R audiodecoder.ssf.git audiodecoder.ssf-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf audiodecoder.ssf-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf audiodecoder.ssf-$GIT_REV.tar.xz audiodecoder.ssf-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf audiodecoder.ssf-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_audiodecoder.upse b/tools/mkpkg/mkpkg_audiodecoder.upse
deleted file mode 100755
index 984556f049..0000000000
--- a/tools/mkpkg/mkpkg_audiodecoder.upse
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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.
-#
-#  OpenELEC 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 OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d audiodecoder.upse.git ]; then
-    git clone https://github.com/notspiff/audiodecoder.upse.git audiodecoder.upse.git
-  fi
-
-  cd audiodecoder.upse.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf audiodecoder.upse-$GIT_REV
-  cp -R audiodecoder.upse.git audiodecoder.upse-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf audiodecoder.upse-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf audiodecoder.upse-$GIT_REV.tar.xz audiodecoder.upse-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf audiodecoder.upse-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_audiodecoder.usf b/tools/mkpkg/mkpkg_audiodecoder.usf
deleted file mode 100755
index eece0f4344..0000000000
--- a/tools/mkpkg/mkpkg_audiodecoder.usf
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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.
-#
-#  OpenELEC 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 OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d audiodecoder.usf.git ]; then
-    git clone https://github.com/notspiff/audiodecoder.usf.git audiodecoder.usf.git
-  fi
-
-  cd audiodecoder.usf.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf audiodecoder.usf-$GIT_REV
-  cp -R audiodecoder.usf.git audiodecoder.usf-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf audiodecoder.usf-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf audiodecoder.usf-$GIT_REV.tar.xz audiodecoder.usf-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf audiodecoder.usf-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_audiodecoder.wsr b/tools/mkpkg/mkpkg_audiodecoder.wsr
deleted file mode 100755
index ac38646779..0000000000
--- a/tools/mkpkg/mkpkg_audiodecoder.wsr
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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.
-#
-#  OpenELEC 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 OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d audiodecoder.wsr.git ]; then
-    git clone https://github.com/notspiff/audiodecoder.wsr.git audiodecoder.wsr.git
-  fi
-
-  cd audiodecoder.wsr.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf audiodecoder.wsr-$GIT_REV
-  cp -R audiodecoder.wsr.git audiodecoder.wsr-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf audiodecoder.wsr-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf audiodecoder.wsr-$GIT_REV.tar.xz audiodecoder.wsr-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf audiodecoder.wsr-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_screensaver.asteroids b/tools/mkpkg/mkpkg_screensaver.asteroids
deleted file mode 100755
index 45fa4f254f..0000000000
--- a/tools/mkpkg/mkpkg_screensaver.asteroids
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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.
-#
-#  OpenELEC 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 OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d screensaver.asteroids.git ]; then
-    git clone https://github.com/notspiff/screensaver.asteroids.git screensaver.asteroids.git
-  fi
-
-  cd screensaver.asteroids.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf screensaver.asteroids-$GIT_REV
-  cp -R screensaver.asteroids.git screensaver.asteroids-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf screensaver.asteroids-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf screensaver.asteroids-$GIT_REV.tar.xz screensaver.asteroids-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf screensaver.asteroids-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_screensaver.biogenesis b/tools/mkpkg/mkpkg_screensaver.biogenesis
deleted file mode 100755
index b22230560b..0000000000
--- a/tools/mkpkg/mkpkg_screensaver.biogenesis
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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.
-#
-#  OpenELEC 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 OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d screensaver.biogenesis.git ]; then
-    git clone https://github.com/notspiff/screensaver.biogenesis.git screensaver.biogenesis.git
-  fi
-
-  cd screensaver.biogenesis.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf screensaver.biogenesis-$GIT_REV
-  cp -R screensaver.biogenesis.git screensaver.biogenesis-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf screensaver.biogenesis-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf screensaver.biogenesis-$GIT_REV.tar.xz screensaver.biogenesis-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf screensaver.biogenesis-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_screensaver.greynetic b/tools/mkpkg/mkpkg_screensaver.greynetic
deleted file mode 100755
index 15052aac38..0000000000
--- a/tools/mkpkg/mkpkg_screensaver.greynetic
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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.
-#
-#  OpenELEC 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 OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d screensaver.greynetic.git ]; then
-    git clone https://github.com/notspiff/screensaver.greynetic.git screensaver.greynetic.git
-  fi
-
-  cd screensaver.greynetic.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf screensaver.greynetic-$GIT_REV
-  cp -R screensaver.greynetic.git screensaver.greynetic-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf screensaver.greynetic-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf screensaver.greynetic-$GIT_REV.tar.xz screensaver.greynetic-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf screensaver.greynetic-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_screensaver.matrixtrails b/tools/mkpkg/mkpkg_screensaver.matrixtrails
deleted file mode 100755
index b48a1e4ee6..0000000000
--- a/tools/mkpkg/mkpkg_screensaver.matrixtrails
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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.
-#
-#  OpenELEC 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 OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d screensaver.matrixtrails.git ]; then
-    git clone https://github.com/notspiff/screensaver.matrixtrails.git screensaver.matrixtrails.git
-  fi
-
-  cd screensaver.matrixtrails.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf screensaver.matrixtrails-$GIT_REV
-  cp -R screensaver.matrixtrails.git screensaver.matrixtrails-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf screensaver.matrixtrails-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf screensaver.matrixtrails-$GIT_REV.tar.xz screensaver.matrixtrails-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf screensaver.matrixtrails-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_screensaver.pingpong b/tools/mkpkg/mkpkg_screensaver.pingpong
deleted file mode 100755
index c3846d336f..0000000000
--- a/tools/mkpkg/mkpkg_screensaver.pingpong
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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.
-#
-#  OpenELEC 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 OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d screensaver.pingpong.git ]; then
-    git clone https://github.com/notspiff/screensaver.pingpong.git screensaver.pingpong.git
-  fi
-
-  cd screensaver.pingpong.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf screensaver.pingpong-$GIT_REV
-  cp -R screensaver.pingpong.git screensaver.pingpong-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf screensaver.pingpong-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf screensaver.pingpong-$GIT_REV.tar.xz screensaver.pingpong-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf screensaver.pingpong-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_screensaver.pyro b/tools/mkpkg/mkpkg_screensaver.pyro
deleted file mode 100755
index 8f83212075..0000000000
--- a/tools/mkpkg/mkpkg_screensaver.pyro
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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.
-#
-#  OpenELEC 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 OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d screensaver.pyro.git ]; then
-    git clone https://github.com/notspiff/screensaver.pyro.git screensaver.pyro.git
-  fi
-
-  cd screensaver.pyro.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf screensaver.pyro-$GIT_REV
-  cp -R screensaver.pyro.git screensaver.pyro-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf screensaver.pyro-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf screensaver.pyro-$GIT_REV.tar.xz screensaver.pyro-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf screensaver.pyro-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_screensaver.stars b/tools/mkpkg/mkpkg_screensaver.stars
deleted file mode 100755
index d517341278..0000000000
--- a/tools/mkpkg/mkpkg_screensaver.stars
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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.
-#
-#  OpenELEC 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 OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d screensaver.stars.git ]; then
-    git clone https://github.com/notspiff/screensaver.stars.git screensaver.stars.git
-  fi
-
-  cd screensaver.stars.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf screensaver.stars-$GIT_REV
-  cp -R screensaver.stars.git screensaver.stars-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf screensaver.stars-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf screensaver.stars-$GIT_REV.tar.xz screensaver.stars-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf screensaver.stars-$GIT_REV