diff --git a/docker/vm-tools-100-55/audiobookshelf/.env b/services/audiobookshelf/.env
similarity index 100%
rename from docker/vm-tools-100-55/audiobookshelf/.env
rename to services/audiobookshelf/.env
diff --git a/docker/vm-tools-100-55/audiobookshelf/docker-compose.yml b/services/audiobookshelf/docker-compose.yml
similarity index 100%
rename from docker/vm-tools-100-55/audiobookshelf/docker-compose.yml
rename to services/audiobookshelf/docker-compose.yml
diff --git a/docker/vm-tools-100-55/audiobookshelf/init.sh b/services/audiobookshelf/init.sh
similarity index 100%
rename from docker/vm-tools-100-55/audiobookshelf/init.sh
rename to services/audiobookshelf/init.sh
diff --git a/docker/vm-tools-100-55/export_ip.py b/services/export_ip.py
similarity index 100%
rename from docker/vm-tools-100-55/export_ip.py
rename to services/export_ip.py
diff --git a/docker/vm-tools-100-55/gitea/.env b/services/gitea/.env
similarity index 100%
rename from docker/vm-tools-100-55/gitea/.env
rename to services/gitea/.env
diff --git a/docker/vm-tools-100-55/gitea/docker-compose.yml b/services/gitea/docker-compose.yml
similarity index 100%
rename from docker/vm-tools-100-55/gitea/docker-compose.yml
rename to services/gitea/docker-compose.yml
diff --git a/docker/vm-tools-100-55/gitea/init.sh b/services/gitea/init.sh
similarity index 100%
rename from docker/vm-tools-100-55/gitea/init.sh
rename to services/gitea/init.sh
diff --git a/docker/vm-tools-100-55/ippoolmanager-sql-server /.env b/services/ippoolmanager-sql-server /.env
similarity index 100%
rename from docker/vm-tools-100-55/ippoolmanager-sql-server /.env
rename to services/ippoolmanager-sql-server /.env
diff --git a/docker/vm-tools-100-55/ippoolmanager-sql-server /docker-compose.yml b/services/ippoolmanager-sql-server /docker-compose.yml
similarity index 100%
rename from docker/vm-tools-100-55/ippoolmanager-sql-server /docker-compose.yml
rename to services/ippoolmanager-sql-server /docker-compose.yml
diff --git a/docker/vm-jenkins-100-30/jenkins/.env b/services/jenkins/.env
similarity index 100%
rename from docker/vm-jenkins-100-30/jenkins/.env
rename to services/jenkins/.env
diff --git a/docker/vm-jenkins-100-30/jenkins/Dockerfile b/services/jenkins/Dockerfile
similarity index 100%
rename from docker/vm-jenkins-100-30/jenkins/Dockerfile
rename to services/jenkins/Dockerfile
diff --git a/docker/vm-jenkins-100-30/jenkins/docker-compose.yml b/services/jenkins/docker-compose.yml
similarity index 100%
rename from docker/vm-jenkins-100-30/jenkins/docker-compose.yml
rename to services/jenkins/docker-compose.yml
diff --git a/docker/vm-jenkins-100-30/jenkins/init.sh b/services/jenkins/init.sh
similarity index 100%
rename from docker/vm-jenkins-100-30/jenkins/init.sh
rename to services/jenkins/init.sh
diff --git a/docker/vm-jenkins-100-30/jenkins/plugins.txt b/services/jenkins/plugins.txt
similarity index 100%
rename from docker/vm-jenkins-100-30/jenkins/plugins.txt
rename to services/jenkins/plugins.txt
diff --git a/docker/vm-tools-100-55/openvpn/docker-compose.yml b/services/openvpn/docker-compose.yml
similarity index 100%
rename from docker/vm-tools-100-55/openvpn/docker-compose.yml
rename to services/openvpn/docker-compose.yml
diff --git a/docker/vm-tools-100-55/services.env b/services/services.env
similarity index 100%
rename from docker/vm-tools-100-55/services.env
rename to services/services.env