diff --git a/Apps/bitwaden/docker-compose.yml b/Apps/bitwaden/docker-compose.yml
deleted file mode 100644
index 3fa3faa..0000000
--- a/Apps/bitwaden/docker-compose.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-version: '3'
-
-services:
-  vaultwarden:
-    image: vaultwarden/server:latest
-    container_name: vaultwarden
-    restart: always
-    environment:
-      - WEBSOCKET_ENABLED=true  # Enable WebSocket notifications.
-    volumes:
-      - ./vw-data:/data
\ No newline at end of file
diff --git a/Apps/inventree/inventree-docker-compose.yml b/Apps/inventree/inventree-docker-compose.yml
deleted file mode 100644
index cef136b..0000000
--- a/Apps/inventree/inventree-docker-compose.yml
+++ /dev/null
@@ -1,119 +0,0 @@
-version: "3.8"
-
-# Docker compose recipe for InvenTree
-# - Runs PostgreSQL as the database backend
-# - Runs Gunicorn as the InvenTree web server
-# - Runs the InvenTree background worker process
-# - Runs nginx as a reverse proxy
-
-# ---------------------------------
-# IMPORTANT - READ BEFORE STARTING!
-# ---------------------------------
-# Before running, ensure that you change the "/path/to/data" directory,
-# specified in the "volumes" section at the end of this file.
-# This path determines where the InvenTree data will be stored!
-# 
-#
-# InvenTree Image Versions
-# ------------------------
-# By default, this docker-compose script targets the STABLE version of InvenTree,
-# image: inventree/inventree:stable
-# 
-# To run the LATEST (development) version of InvenTree, change the target image to:
-# image: inventree/inventree:latest
-#
-# Alternatively, you could target a specific tagged release version with (for example):
-# image: inventree/inventree:0.5.3
-#
-# NOTE: If you change the target image, ensure it is the same for the following containers:
-# - inventree-server
-# - inventree-worker
-
-services:
-    # Database service
-    # Use PostgreSQL as the database backend
-    # Note: this can be changed to a different backend,
-    #       just make sure that you change the INVENTREE_DB_xxx vars below
-    inventree-db:
-        container_name: inventree-db
-        image: postgres:13
-        ports:
-            - 5432/tcp
-        environment:
-            - PGDATA=/var/lib/postgresql/data/pgdb
-            # The pguser and pgpassword values must be the same in the other containers
-            # Ensure that these are correctly configured in your prod-config.env file
-            - POSTGRES_USER=pguser
-            - POSTGRES_PASSWORD=pgpassword
-        volumes:
-            # Map 'data' volume such that postgres database is stored externally
-            - data:/var/lib/postgresql/data/
-        restart: unless-stopped
-
-    # InvenTree web server services
-    # Uses gunicorn as the web server
-    inventree-server:
-        container_name: inventree-server
-        # If you wish to specify a particular InvenTree version, do so here
-        image: inventree/inventree:stable
-        expose:
-            - 8000
-        depends_on:
-            - inventree-db
-        volumes:
-            # Data volume must map to /home/inventree/data
-            - data:/home/inventree/data
-        env_file:
-            # Environment variables required for the production server are configured in prod-config.env
-            - prod-config.env
-        restart: unless-stopped
-
-    # Background worker process handles long-running or periodic tasks
-    inventree-worker:
-        container_name: inventree-worker
-        # If you wish to specify a particular InvenTree version, do so here
-        image: inventree/inventree:stable
-        command: invoke worker
-        depends_on:
-            - inventree-db
-            - inventree-server
-        volumes:
-            # Data volume must map to /home/inventree/data
-            - data:/home/inventree/data
-        env_file:
-            # Environment variables required for the production server are configured in prod-config.env
-            - prod-config.env
-        restart: unless-stopped
-
-    # nginx acts as a reverse proxy
-    # static files are served directly by nginx
-    # media files are served by nginx, although authentication is redirected to inventree-server
-    # web requests are redirected to gunicorn
-    # NOTE: You will need to provide a working nginx.conf file!
-    inventree-proxy:
-        container_name: inventree-proxy
-        image: nginx:stable
-        depends_on:
-            - inventree-server
-        ports:
-            # Change "1337" to the port that you want InvenTree web server to be available on
-            - 1337:80
-        volumes:
-            # Provide ./nginx.conf file to the container
-            # Refer to the provided example file as a starting point
-            - ./nginx.conf:/etc/nginx/conf.d/default.conf:ro
-            # nginx proxy needs access to static and media files
-            - data:/var/www
-        restart: unless-stopped
-
-volumes:
-    # NOTE: Change /path/to/data to a directory on your local machine
-    # Persistent data, stored external to the container(s)
-    data:
-        driver: local
-        driver_opts:
-            type: none
-            o: bind
-            # This directory specified where InvenTree data are stored "outside" the docker containers
-            # Change this path to a local system path where you want InvenTree data stored
-            device: /path/to/data
\ No newline at end of file
diff --git a/Apps/paperless-ng/docker-compose.postgres-tika.yml b/Apps/paperless-ng/docker-compose.postgres-tika.yml
deleted file mode 100644
index 93fff4a..0000000
--- a/Apps/paperless-ng/docker-compose.postgres-tika.yml
+++ /dev/null
@@ -1,90 +0,0 @@
-# docker-compose file for running paperless from the Docker Hub.
-# This file contains everything paperless needs to run.
-# Paperless supports amd64, arm and arm64 hardware.
-#
-# All compose files of paperless configure paperless in the following way:
-#
-# - Paperless is (re)started on system boot, if it was running before shutdown.
-# - Docker volumes for storing data are managed by Docker.
-# - Folders for importing and exporting files are created in the same directory
-#   as this file and mounted to the correct folders inside the container.
-# - Paperless listens on port 8000.
-#
-# In addition to that, this docker-compose file adds the following optional
-# configurations:
-#
-# - Instead of SQLite (default), PostgreSQL is used as the database server.
-# - Apache Tika and Gotenberg servers are started with paperless and paperless
-#   is configured to use these services. These provide support for consuming
-#   Office documents (Word, Excel, Power Point and their LibreOffice counter-
-#   parts.
-#
-# To install and update paperless with this file, do the following:
-#
-# - Copy this file as 'docker-compose.yml' and the files 'docker-compose.env'
-#   and '.env' into a folder.
-# - Run 'docker-compose pull'.
-# - Run 'docker-compose run --rm webserver createsuperuser' to create a user.
-# - Run 'docker-compose up -d'.
-#
-# For more extensive installation and update instructions, refer to the
-# documentation.
-
-version: "3.4"
-services:
-  broker:
-    image: redis:6.0
-    restart: unless-stopped
-
-  db:
-    image: postgres:13
-    restart: unless-stopped
-    volumes:
-      - pgdata:/var/lib/postgresql/data
-    environment:
-      POSTGRES_DB: paperless
-      POSTGRES_USER: paperless
-      POSTGRES_PASSWORD: paperless
-
-  webserver:
-    image: jonaswinkler/paperless-ng:latest
-    restart: unless-stopped
-    depends_on:
-      - db
-      - broker
-      - gotenberg
-      - tika
-    ports:
-      - 8000:8000
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8000"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
-    volumes:
-      - data:/usr/src/paperless/data
-      - media:/usr/src/paperless/media
-      - ./export:/usr/src/paperless/export
-      - ./consume:/usr/src/paperless/consume
-    env_file: docker-compose.env
-    environment:
-      PAPERLESS_REDIS: redis://broker:6379
-      PAPERLESS_DBHOST: db
-      PAPERLESS_TIKA_ENABLED: 1
-      PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000
-      PAPERLESS_TIKA_ENDPOINT: http://tika:9998
-
-  gotenberg:
-    image: thecodingmachine/gotenberg
-    restart: unless-stopped
-    environment:
-      DISABLE_GOOGLE_CHROME: 1
-
-  tika:
-    image: apache/tika
-    restart: unless-stopped
-
-volumes:
-  data:
-  media:
-  pgdata:
diff --git a/Apps/pihole/docker-compose.yml b/Apps/pihole/docker-compose.yml
deleted file mode 100644
index de01cba..0000000
--- a/Apps/pihole/docker-compose.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-version: "3"
-
-services:
-  pihole:
-    container_name: pihole
-    image: pihole/pihole:latest
-    # For DHCP it is recommended to remove these ports and instead add: network_mode: "host"
-    ports:
-      - "53:53/tcp"
-      - "53:53/udp"
-    environment:
-      TZ: 'America/Chicago'
-      # WEBPASSWORD: 'set a secure password here or it will be random'
-    # Volumes store your data between container upgrades
-    volumes:
-      - './etc-pihole:/etc/pihole'
-      - './etc-dnsmasq.d:/etc/dnsmasq.d'
-    #   https://github.com/pi-hole/docker-pi-hole#note-on-capabilities
-    restart: unless-stopped # Recommended but not required (DHCP needs NET_ADMIN)
\ No newline at end of file
diff --git a/Apps/wg-manager/docker-compose.yml b/Apps/wg-manager/docker-compose.yml
deleted file mode 100644
index 20099a9..0000000
--- a/Apps/wg-manager/docker-compose.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-version: "2.1"
-services:
-  wireguard:
-    container_name: wg-manager
-    image: perara/wg-manager
-    restart: always
-    sysctls:
-      net.ipv6.conf.all.disable_ipv6: 0  # Required for IPV6
-    cap_add:
-      - NET_ADMIN
-    #network_mode: host # Alternatively
-    ports:
-       - 51800-51900:51800-51900/udp
-       - 8888:8888
-    volumes:
-      - ./wg-manager:/config
-    environment:
-      HOST: 0.0.0.0
-      PORT: 8888
-      ADMIN_USERNAME: admin
-      ADMIN_PASSWORD: admin
-      WEB_CONCURRENCY: 1
\ No newline at end of file
diff --git a/Overhead/PullContainers.sh b/Overhead/PullContainers.sh
deleted file mode 100644
index 7d3eb58..0000000
--- a/Overhead/PullContainers.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-export container_list="
-        jenkins/jenkins \
-        elabftw/elabimg \
-        huginn/huginn \
-        phpipam/phpipam-www \
-        photoprism/photoprism \
-        securecompliance/gvm:debian-master-data-full \
-        securecompliance/gvm:debian-master-data \
-        securecompliance/gvm:debian-master-full \
-        securecompliance/gvm:debian-master \
-        killbill/killbill \
-        killbill/kaui \
-        drone/drone \
-        archivebox/archivebox \
-        apache/tika \
-        thecodingmachine/gotenberg \
-        inventree/inventree \
-        jonaswinkler/paperless-ng \
-        seknox/guacd \
-        seknox/trasa \
-        authelia/authelia \
-        beanbag/reviewboard:latest \
-        pihole/pihole \
-        stedolan/jq \
-        containrrr/watchtower \
-        r7wx/easy-gate \
-        lazyteam/lazydocker \
-        portainer/portainer-ce:latest \
-        xetusoss/archiva
-
-for container in $container_list;
-do
-        docker pull $container &
-done
\ No newline at end of file
diff --git a/Overhead/bitwarden-cli/docker-compose.yml b/Overhead/bitwarden-cli/docker-compose.yml
deleted file mode 100644
index 073a79d..0000000
--- a/Overhead/bitwarden-cli/docker-compose.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-version: "3"
-services:
-    dev:
-          image: "node:16.14-buster-slim"
-          user: "node"
-          working_dir: /home/node/dev
-          volumes:
-                  - /var/run/docker.sock:/var/run/docker.sock
-                  - /docker/storage/overhead/bw-cli:/home/node/dev
\ No newline at end of file
diff --git a/Overhead/lazydocker/docker-compose.yml b/Overhead/lazydocker/docker-compose.yml
deleted file mode 100644
index fdcdf6c..0000000
--- a/Overhead/lazydocker/docker-compose.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-version: '3'
-services:
-  lazydocker:
-    build:
-      context: https://github.com/jesseduffield/lazydocker.git
-      args:
-        BASE_IMAGE_BUILDER: golang
-        GOARCH: amd64
-        GOARM:
-    image: lazyteam/lazydocker
-    container_name: lazydocker
-    stdin_open: true
-    tty: true
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - /docker/storage/overhead/lazydocker:/.config/jesseduffield/lazydocker
\ No newline at end of file
diff --git a/Overhead/nginx-proxy-manager/docker-compose.yml b/Overhead/nginx-proxy-manager/docker-compose.yml
deleted file mode 100644
index 2d35bf1..0000000
--- a/Overhead/nginx-proxy-manager/docker-compose.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-version: '3'
-services:
-  app:
-    image: "jc21/nginx-proxy-manager:latest"
-    restart: unless-stopped
-    ports:
-      - '80:80'
-      - '1000:81'
-      - '443:443'
-    volumes:
-      - /docker/storage/infra/nginx-proxy-manager/data:/data
-      - /docker/storage/infra/nginx-proxy-manager/letsencrypt:/letsencrypt
\ No newline at end of file
diff --git a/Overhead/portainer/docker-compose.yml b/Overhead/portainer/docker-compose.yml
deleted file mode 100644
index b23df5b..0000000
--- a/Overhead/portainer/docker-compose.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-version: '3'
-
-services:
-  portainer:
-    image: portainer/portainer-ce:latest
-    container_name: portainer
-    restart: unless-stopped
-    security_opt:
-      - no-new-privileges:true
-    volumes:
-      - /etc/localtime:/etc/localtime:ro
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-      - /docker/storage/overhead/portainer:/data
-    ports:
-      - 1001:9000
\ No newline at end of file
diff --git a/Overhead/watchtower/docker-compose.yml b/Overhead/watchtower/docker-compose.yml
deleted file mode 100644
index f9759ef..0000000
--- a/Overhead/watchtower/docker-compose.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-version: '3.8'
-services:
-  watchtower:
-    image: containrrr/watchtower:latest
-    container_name: watchtower
-    environment:
-      WATCHTOWER_MONITOR_ONLY: 'true'
-      WATCHTOWER_NOTIFICATIONS: email
-      WATCHTOWER_NOTIFICATION_EMAIL_FROM: techopsalerts@turnsys.com
-      WATCHTOWER_NOTIFICATION_EMAIL_TO: prodtechopsalerts@turnsys.com
-      # you have to use a network alias here, if you use your own certificate
-      WATCHTOWER_NOTIFICATION_EMAIL_SERVER: pfv-toolbox.turnsys.net
-      WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PORT: 25
-      WATCHTOWER_NOTIFICATION_EMAIL_DELAY: 2
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
\ No newline at end of file
diff --git a/PullContainers.sh b/PullContainers.sh
new file mode 100644
index 0000000..8bf0bbc
--- /dev/null
+++ b/PullContainers.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+export container_list="
+        elabftw/elabimg \
+        huginn/huginn \
+        phpipam/phpipam-www \
+        securecompliance/gvm:debian-master-data-full \
+        securecompliance/gvm:debian-master-data \
+        securecompliance/gvm:debian-master-full \
+        securecompliance/gvm:debian-master \
+        killbill/killbill \
+        killbill/kaui \
+        inventree/inventree \
+        seknox/trasa \
+        beanbag/reviewboard:latest \
+        pihole/pihole \
+        stedolan/jq \
+        containrrr/watchtower \
+        r7wx/easy-gate \
+        xetusoss/archiva"
+
+#git subtree add --prefix upstream/rundeck https://github.com/rundeck/docker-zoo.git master --squash
+#git subtree add --prefix upstream/ er-archiva.git
+#git subtree add --prefix upstream/bastillion https://github.com/e-COSI/docker-bastillion.git master --squash
+#git subtree add --prefix upstream/openvas https://github.com/mikesplain/openvas-docker.git  master --squash
+#git subtree add --prefix upstream/openfaas https://github.com/openfaas/faas.git master --squash
+#git subtree add --prefix upstream/wazuh https://github.com/wazuh/wazuh-docker.git master --squash
+#git subtree add --prefix upstream/librenms  https://github.com/librenms/docker.git master --squash
+#git subtree add --prefix upstream/  https://github.com/xetus-oss/dockgit 
+#git subtree add --prefix upstream/graylog2 https://github.com/Graylog2/graylog-docker.git  master --squash
+#sipwise
+#mailman
+#Mailpile
+#Portus
+#flyve (mdm)
+#easyforms
+#easy-gate
+
+#TSYS3 (usb passthrough)
+#git subtree add --prefix upstream/cloudflare-cfssl  https://github.com/rjrivero/docker-cfssl.git master --squash
+#git subtree add --prefix upstream/cloudflare-certmgr https://github.com/cloudflare/certmgr.git master --squash
+
+for container in $container_list;
+do
+        docker pull $container &
+done
diff --git a/all-in-one-wp-migration-unlimited-extension.zip b/all-in-one-wp-migration-unlimited-extension.zip
new file mode 100644
index 0000000..b12eca3
Binary files /dev/null and b/all-in-one-wp-migration-unlimited-extension.zip differ
diff --git a/Apps/easy-gate/docker-compose.yml b/tsys1/easy-gate/docker-compose.yml
similarity index 100%
rename from Apps/easy-gate/docker-compose.yml
rename to tsys1/easy-gate/docker-compose.yml
diff --git a/Apps/easy-gate/easy-gate.json b/tsys1/easy-gate/easy-gate.json
similarity index 100%
rename from Apps/easy-gate/easy-gate.json
rename to tsys1/easy-gate/easy-gate.json