diff --git a/.github/workflows/auto-build.yml b/.github/workflows/auto-build.yml
index 236efcb5..3b22f959 100644
--- a/.github/workflows/auto-build.yml
+++ b/.github/workflows/auto-build.yml
@@ -1,12 +1,10 @@
 name: autobuildallthemods
 on:
   push:
-    branches: [ docker-mods ]
-    paths-ignore:
-    - '.github/**'
-    - '.vscode/**'
-    - '**/README.md'
-    - '**/LICENSE'
+    branches: 
+      - master
+    paths:
+    - 'docker-mods/**'
 jobs:
   push_to_ghcr_io:
     runs-on: ubuntu-latest
@@ -29,7 +27,7 @@ jobs:
         run: |
           for i in ${{ steps.getfile.outputs.files }}
             do
-              directory="$( echo $i | cut -d'/' -f1 -s )"
+              directory="$( echo $i | cut -d'/' -f2 -s )"
               if [ -z "$directory" ]; then
                 continue # Skip root dir
               elif [ "$i" == *.md ]; then
@@ -37,7 +35,7 @@ jobs:
               elif [ "$i" == *.yml ]; then
                 continue # Skip YAML files
               fi
-              docker build $directory --tag ghcr.io/gilbn/theme.park:$directory
+              docker build docker-mods/$directory --tag ghcr.io/gilbn/theme.park:$directory
               docker push ghcr.io/gilbn/theme.park:$directory
             done
   push_to_dockerhub:
@@ -60,7 +58,7 @@ jobs:
         run: |
           for i in ${{ steps.getfile.outputs.files }}
             do
-              directory="$( echo $i | cut -d'/' -f1 -s )"
+              directory="$( echo $i | cut -d'/' -f2 -s )"
               if [ -z "$directory" ]; then
                 continue # Skip root dir
               elif [ "$i" == *.md ]; then
@@ -68,6 +66,6 @@ jobs:
               elif [ "$i" == *.yml ]; then
                 continue # Skip YAML files
               fi
-              docker build $directory --tag gilbn/theme.park:$directory
+              docker build docker-mods/$directory --tag gilbn/theme.park:$directory
               docker push gilbn/theme.park:$directory
             done
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 88d5d5f9..00000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "python.pythonPath": "C:\\Users\\Marius\\AppData\\Local\\Programs\\Python\\Python37\\python.exe"
-}
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index ca9c873a..00000000
--- a/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2019 GilbN
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/README.md b/README.md
deleted file mode 100644
index 3bedb0ea..00000000
--- a/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Docker Mods
-
-[![Docs](https://img.shields.io/static/v1.svg?color=009688&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=theme-park.dev&message=Docs)](https://docs.theme-park.dev "Documentation for all the themes in this repository.")
-[![Discord](https://img.shields.io/discord/591352397830553601.svg?color=009688&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Discord&logo=discord)](https://discord.gg/HM5uUKU "Discord for theme installation support")
-[![GitHub Stars](https://img.shields.io/github/stars/gilbn/theme.park.svg?color=009688&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/GilbN/theme.park)
-[![Support](https://img.shields.io/static/v1.svg?color=009688&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=&message=sponsor&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABN0lEQVQ4T2NkoBAwIuv/HxDggMT/wLhhwwUQ/39AgAEDA4MATI5xw4YDcDaaAf+R+AcZN2wAG/g/IACkwR7JALjFYAbU5v0k+sYR5BLG/wEBCQwMDAUMDAz6DM3NDAxz5zIwPHhAjFkXGRgYJoAMaGBgYKgH6wgPZ2DYt4+B4fVrYgwAqWlENYBYbQwMDO8+sjH8+cvUSbYB6w9Kv/vwlW0aWYE4Z5MCAwfrf7fYnxN3wwwAxTEorvHGBMjZBy+Ivvv6jSXi20+OU+kMnR/RExIoQEGxIo8eHM/fcDA8fc114/J9/jVJv/prsSYkaJqYwMDAEIBsCMjme894bl6+w7s76e/EXGTDUVwAk0CJWgYGBliAIduM0wVIhoCS8X7kAMMWy1hdAPUKOGCXbJdnhQUYSQYQm6YAtdh8zhSGm1AAAAAASUVORK5CYII=)](https://github.com/sponsors/GilbN "Donate!")
-[![GitHub](https://img.shields.io/github/license/gilbn/theme.park.svg?color=009688&labelColor=555555&logoColor=ffffff&style=for-the-badge)](https://github.com/gilbN/theme.park/blob/master/LICENSE)
-[![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=009688&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=theme-park.dev&message=Packages&logo=github)](https://github.com/users/GilbN/packages/container/package/theme.park)
-[![Docker Pulls](https://img.shields.io/docker/pulls/gilbn/theme.park.svg?color=009688&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/gilbn/theme.park)
-[![Blog](https://img.shields.io/static/v1.svg?color=009688&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=technicalramblings&message=Blog)](https://technicalramblings.com/ "A blog with different guides :)")
-
-## See [https://docs.theme-park.dev/setup/#docker-mods](https://docs.theme-park.dev/setup/#docker-mods) for more information
diff --git a/bazarr/Dockerfile b/docker-mods/bazarr/Dockerfile
similarity index 100%
rename from bazarr/Dockerfile
rename to docker-mods/bazarr/Dockerfile
diff --git a/bazarr/root/etc/cont-init.d/98-themepark b/docker-mods/bazarr/root/etc/cont-init.d/98-themepark
similarity index 100%
rename from bazarr/root/etc/cont-init.d/98-themepark
rename to docker-mods/bazarr/root/etc/cont-init.d/98-themepark
diff --git a/calibre-web/Dockerfile b/docker-mods/calibre-web/Dockerfile
similarity index 100%
rename from calibre-web/Dockerfile
rename to docker-mods/calibre-web/Dockerfile
diff --git a/calibre-web/root/etc/cont-init.d/98-themepark b/docker-mods/calibre-web/root/etc/cont-init.d/98-themepark
similarity index 100%
rename from calibre-web/root/etc/cont-init.d/98-themepark
rename to docker-mods/calibre-web/root/etc/cont-init.d/98-themepark
diff --git a/deluge/Dockerfile b/docker-mods/deluge/Dockerfile
similarity index 100%
rename from deluge/Dockerfile
rename to docker-mods/deluge/Dockerfile
diff --git a/deluge/root/etc/cont-init.d/98-themepark b/docker-mods/deluge/root/etc/cont-init.d/98-themepark
similarity index 100%
rename from deluge/root/etc/cont-init.d/98-themepark
rename to docker-mods/deluge/root/etc/cont-init.d/98-themepark
diff --git a/emby/Dockerfile b/docker-mods/emby/Dockerfile
similarity index 100%
rename from emby/Dockerfile
rename to docker-mods/emby/Dockerfile
diff --git a/emby/root/etc/cont-init.d/98-themepark b/docker-mods/emby/root/etc/cont-init.d/98-themepark
similarity index 100%
rename from emby/root/etc/cont-init.d/98-themepark
rename to docker-mods/emby/root/etc/cont-init.d/98-themepark
diff --git a/jackett/Dockerfile b/docker-mods/jackett/Dockerfile
similarity index 100%
rename from jackett/Dockerfile
rename to docker-mods/jackett/Dockerfile
diff --git a/jackett/root/etc/cont-init.d/98-themepark b/docker-mods/jackett/root/etc/cont-init.d/98-themepark
similarity index 100%
rename from jackett/root/etc/cont-init.d/98-themepark
rename to docker-mods/jackett/root/etc/cont-init.d/98-themepark
diff --git a/jellyfin/Dockerfile b/docker-mods/jellyfin/Dockerfile
similarity index 100%
rename from jellyfin/Dockerfile
rename to docker-mods/jellyfin/Dockerfile
diff --git a/jellyfin/root/etc/cont-init.d/98-themepark b/docker-mods/jellyfin/root/etc/cont-init.d/98-themepark
similarity index 100%
rename from jellyfin/root/etc/cont-init.d/98-themepark
rename to docker-mods/jellyfin/root/etc/cont-init.d/98-themepark
diff --git a/lazylibrarian/Dockerfile b/docker-mods/lazylibrarian/Dockerfile
similarity index 100%
rename from lazylibrarian/Dockerfile
rename to docker-mods/lazylibrarian/Dockerfile
diff --git a/lazylibrarian/root/etc/cont-init.d/98-themepark b/docker-mods/lazylibrarian/root/etc/cont-init.d/98-themepark
similarity index 100%
rename from lazylibrarian/root/etc/cont-init.d/98-themepark
rename to docker-mods/lazylibrarian/root/etc/cont-init.d/98-themepark
diff --git a/librespeed/Dockerfile b/docker-mods/librespeed/Dockerfile
similarity index 100%
rename from librespeed/Dockerfile
rename to docker-mods/librespeed/Dockerfile
diff --git a/librespeed/root/etc/cont-init.d/98-themepark b/docker-mods/librespeed/root/etc/cont-init.d/98-themepark
similarity index 100%
rename from librespeed/root/etc/cont-init.d/98-themepark
rename to docker-mods/librespeed/root/etc/cont-init.d/98-themepark
diff --git a/lidarr/Dockerfile b/docker-mods/lidarr/Dockerfile
similarity index 100%
rename from lidarr/Dockerfile
rename to docker-mods/lidarr/Dockerfile
diff --git a/lidarr/root/etc/cont-init.d/98-themepark b/docker-mods/lidarr/root/etc/cont-init.d/98-themepark
similarity index 100%
rename from lidarr/root/etc/cont-init.d/98-themepark
rename to docker-mods/lidarr/root/etc/cont-init.d/98-themepark
diff --git a/nzbget/Dockerfile b/docker-mods/nzbget/Dockerfile
similarity index 100%
rename from nzbget/Dockerfile
rename to docker-mods/nzbget/Dockerfile
diff --git a/nzbget/root/etc/cont-init.d/98-themepark b/docker-mods/nzbget/root/etc/cont-init.d/98-themepark
similarity index 100%
rename from nzbget/root/etc/cont-init.d/98-themepark
rename to docker-mods/nzbget/root/etc/cont-init.d/98-themepark
diff --git a/plex/Dockerfile b/docker-mods/plex/Dockerfile
similarity index 100%
rename from plex/Dockerfile
rename to docker-mods/plex/Dockerfile
diff --git a/plex/root/etc/cont-init.d/98-themepark b/docker-mods/plex/root/etc/cont-init.d/98-themepark
similarity index 100%
rename from plex/root/etc/cont-init.d/98-themepark
rename to docker-mods/plex/root/etc/cont-init.d/98-themepark
diff --git a/prowlarr/Dockerfile b/docker-mods/prowlarr/Dockerfile
similarity index 100%
rename from prowlarr/Dockerfile
rename to docker-mods/prowlarr/Dockerfile
diff --git a/prowlarr/root/etc/cont-init.d/98-themepark b/docker-mods/prowlarr/root/etc/cont-init.d/98-themepark
similarity index 100%
rename from prowlarr/root/etc/cont-init.d/98-themepark
rename to docker-mods/prowlarr/root/etc/cont-init.d/98-themepark
diff --git a/qbittorrent/Dockerfile b/docker-mods/qbittorrent/Dockerfile
similarity index 100%
rename from qbittorrent/Dockerfile
rename to docker-mods/qbittorrent/Dockerfile
diff --git a/qbittorrent/root/etc/cont-init.d/98-themepark b/docker-mods/qbittorrent/root/etc/cont-init.d/98-themepark
similarity index 100%
rename from qbittorrent/root/etc/cont-init.d/98-themepark
rename to docker-mods/qbittorrent/root/etc/cont-init.d/98-themepark
diff --git a/radarr/Dockerfile b/docker-mods/radarr/Dockerfile
similarity index 100%
rename from radarr/Dockerfile
rename to docker-mods/radarr/Dockerfile
diff --git a/radarr/root/etc/cont-init.d/98-themepark b/docker-mods/radarr/root/etc/cont-init.d/98-themepark
similarity index 100%
rename from radarr/root/etc/cont-init.d/98-themepark
rename to docker-mods/radarr/root/etc/cont-init.d/98-themepark
diff --git a/readarr/Dockerfile b/docker-mods/readarr/Dockerfile
similarity index 100%
rename from readarr/Dockerfile
rename to docker-mods/readarr/Dockerfile
diff --git a/readarr/root/etc/cont-init.d/98-themepark b/docker-mods/readarr/root/etc/cont-init.d/98-themepark
similarity index 100%
rename from readarr/root/etc/cont-init.d/98-themepark
rename to docker-mods/readarr/root/etc/cont-init.d/98-themepark
diff --git a/rutorrent/Dockerfile b/docker-mods/rutorrent/Dockerfile
similarity index 100%
rename from rutorrent/Dockerfile
rename to docker-mods/rutorrent/Dockerfile
diff --git a/rutorrent/root/etc/cont-init.d/98-themepark b/docker-mods/rutorrent/root/etc/cont-init.d/98-themepark
similarity index 100%
rename from rutorrent/root/etc/cont-init.d/98-themepark
rename to docker-mods/rutorrent/root/etc/cont-init.d/98-themepark
diff --git a/sabnzbd/Dockerfile b/docker-mods/sabnzbd/Dockerfile
similarity index 100%
rename from sabnzbd/Dockerfile
rename to docker-mods/sabnzbd/Dockerfile
diff --git a/sabnzbd/root/etc/cont-init.d/98-themepark b/docker-mods/sabnzbd/root/etc/cont-init.d/98-themepark
similarity index 100%
rename from sabnzbd/root/etc/cont-init.d/98-themepark
rename to docker-mods/sabnzbd/root/etc/cont-init.d/98-themepark
diff --git a/sonarr/Dockerfile b/docker-mods/sonarr/Dockerfile
similarity index 100%
rename from sonarr/Dockerfile
rename to docker-mods/sonarr/Dockerfile
diff --git a/sonarr/root/etc/cont-init.d/98-themepark b/docker-mods/sonarr/root/etc/cont-init.d/98-themepark
similarity index 100%
rename from sonarr/root/etc/cont-init.d/98-themepark
rename to docker-mods/sonarr/root/etc/cont-init.d/98-themepark
diff --git a/synclounge/Dockerfile b/docker-mods/synclounge/Dockerfile
similarity index 100%
rename from synclounge/Dockerfile
rename to docker-mods/synclounge/Dockerfile
diff --git a/synclounge/root/etc/cont-init.d/98-themepark b/docker-mods/synclounge/root/etc/cont-init.d/98-themepark
similarity index 100%
rename from synclounge/root/etc/cont-init.d/98-themepark
rename to docker-mods/synclounge/root/etc/cont-init.d/98-themepark
diff --git a/tautulli/Dockerfile b/docker-mods/tautulli/Dockerfile
similarity index 100%
rename from tautulli/Dockerfile
rename to docker-mods/tautulli/Dockerfile
diff --git a/tautulli/root/etc/cont-init.d/98-themepark b/docker-mods/tautulli/root/etc/cont-init.d/98-themepark
similarity index 100%
rename from tautulli/root/etc/cont-init.d/98-themepark
rename to docker-mods/tautulli/root/etc/cont-init.d/98-themepark
diff --git a/thelounge/Dockerfile b/docker-mods/thelounge/Dockerfile
similarity index 100%
rename from thelounge/Dockerfile
rename to docker-mods/thelounge/Dockerfile
diff --git a/thelounge/root/etc/cont-init.d/98-themepark b/docker-mods/thelounge/root/etc/cont-init.d/98-themepark
similarity index 100%
rename from thelounge/root/etc/cont-init.d/98-themepark
rename to docker-mods/thelounge/root/etc/cont-init.d/98-themepark
diff --git a/transmission/Dockerfile b/docker-mods/transmission/Dockerfile
similarity index 100%
rename from transmission/Dockerfile
rename to docker-mods/transmission/Dockerfile
diff --git a/transmission/root/etc/cont-init.d/98-themepark b/docker-mods/transmission/root/etc/cont-init.d/98-themepark
similarity index 100%
rename from transmission/root/etc/cont-init.d/98-themepark
rename to docker-mods/transmission/root/etc/cont-init.d/98-themepark
diff --git a/vuetorrent/Dockerfile b/docker-mods/vuetorrent/Dockerfile
similarity index 100%
rename from vuetorrent/Dockerfile
rename to docker-mods/vuetorrent/Dockerfile
diff --git a/vuetorrent/root/etc/cont-init.d/98-themepark b/docker-mods/vuetorrent/root/etc/cont-init.d/98-themepark
similarity index 100%
rename from vuetorrent/root/etc/cont-init.d/98-themepark
rename to docker-mods/vuetorrent/root/etc/cont-init.d/98-themepark