diff --git a/Federated-Deployment/.gitignore b/Federated-Deployment/.gitignore
index df175abd35d751c885844264921329bb790b09ed..75572ba9759d1b5d3edd326d2cdcff20ef59735e 100644
--- a/Federated-Deployment/.gitignore
+++ b/Federated-Deployment/.gitignore
@@ -6,6 +6,6 @@ settings.local.*
 
 #Ansible
 *.retry
-/Docker-Ansible/vault.yaml
-/Docker-Ansible/hosts.ini
-/Docker-Ansible/group_vars/exareme.yaml
+**/Docker-Ansible/vault.yaml
+**/Docker-Ansible/hosts.ini
+**/Docker-Ansible/group_vars/exareme.yaml
diff --git a/Federated-Deployment/Compose-Files/docker-compose-master.yml b/Federated-Deployment/docker-swarm/Compose-Files/docker-compose-master.yml
similarity index 100%
rename from Federated-Deployment/Compose-Files/docker-compose-master.yml
rename to Federated-Deployment/docker-swarm/Compose-Files/docker-compose-master.yml
diff --git a/Federated-Deployment/Compose-Files/docker-compose-worker.yml b/Federated-Deployment/docker-swarm/Compose-Files/docker-compose-worker.yml
similarity index 100%
rename from Federated-Deployment/Compose-Files/docker-compose-worker.yml
rename to Federated-Deployment/docker-swarm/Compose-Files/docker-compose-worker.yml
diff --git a/Federated-Deployment/Docker-Ansible/CheckDomain.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/CheckDomain.yaml
similarity index 100%
rename from Federated-Deployment/Docker-Ansible/CheckDomain.yaml
rename to Federated-Deployment/docker-swarm/Docker-Ansible/CheckDomain.yaml
diff --git a/Federated-Deployment/Docker-Ansible/Init-Swarm.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/Init-Swarm.yaml
similarity index 100%
rename from Federated-Deployment/Docker-Ansible/Init-Swarm.yaml
rename to Federated-Deployment/docker-swarm/Docker-Ansible/Init-Swarm.yaml
diff --git a/Federated-Deployment/Docker-Ansible/Join-Workers.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/Join-Workers.yaml
similarity index 100%
rename from Federated-Deployment/Docker-Ansible/Join-Workers.yaml
rename to Federated-Deployment/docker-swarm/Docker-Ansible/Join-Workers.yaml
diff --git a/Federated-Deployment/Docker-Ansible/Leave-Master.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/Leave-Master.yaml
similarity index 100%
rename from Federated-Deployment/Docker-Ansible/Leave-Master.yaml
rename to Federated-Deployment/docker-swarm/Docker-Ansible/Leave-Master.yaml
diff --git a/Federated-Deployment/Docker-Ansible/Leave-Worker.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/Leave-Worker.yaml
similarity index 100%
rename from Federated-Deployment/Docker-Ansible/Leave-Worker.yaml
rename to Federated-Deployment/docker-swarm/Docker-Ansible/Leave-Worker.yaml
diff --git a/Federated-Deployment/Docker-Ansible/Metadata-Master.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/Metadata-Master.yaml
similarity index 100%
rename from Federated-Deployment/Docker-Ansible/Metadata-Master.yaml
rename to Federated-Deployment/docker-swarm/Docker-Ansible/Metadata-Master.yaml
diff --git a/Federated-Deployment/Docker-Ansible/Metadata-Worker.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/Metadata-Worker.yaml
similarity index 100%
rename from Federated-Deployment/Docker-Ansible/Metadata-Worker.yaml
rename to Federated-Deployment/docker-swarm/Docker-Ansible/Metadata-Worker.yaml
diff --git a/Federated-Deployment/Docker-Ansible/Start-Exareme-Worker.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/Start-Exareme-Worker.yaml
similarity index 100%
rename from Federated-Deployment/Docker-Ansible/Start-Exareme-Worker.yaml
rename to Federated-Deployment/docker-swarm/Docker-Ansible/Start-Exareme-Worker.yaml
diff --git a/Federated-Deployment/Docker-Ansible/Start-Exareme.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/Start-Exareme.yaml
similarity index 100%
rename from Federated-Deployment/Docker-Ansible/Start-Exareme.yaml
rename to Federated-Deployment/docker-swarm/Docker-Ansible/Start-Exareme.yaml
diff --git a/Federated-Deployment/Docker-Ansible/Stop-Exareme-Worker.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/Stop-Exareme-Worker.yaml
similarity index 100%
rename from Federated-Deployment/Docker-Ansible/Stop-Exareme-Worker.yaml
rename to Federated-Deployment/docker-swarm/Docker-Ansible/Stop-Exareme-Worker.yaml
diff --git a/Federated-Deployment/Docker-Ansible/Stop-Services.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/Stop-Services.yaml
similarity index 100%
rename from Federated-Deployment/Docker-Ansible/Stop-Services.yaml
rename to Federated-Deployment/docker-swarm/Docker-Ansible/Stop-Services.yaml
diff --git a/Federated-Deployment/Docker-Ansible/group_vars/all.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/group_vars/all.yaml
similarity index 100%
rename from Federated-Deployment/Docker-Ansible/group_vars/all.yaml
rename to Federated-Deployment/docker-swarm/Docker-Ansible/group_vars/all.yaml
diff --git a/Federated-Deployment/Docker-Ansible/roles/add-label/tasks/main.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/roles/add-label/tasks/main.yaml
similarity index 100%
rename from Federated-Deployment/Docker-Ansible/roles/add-label/tasks/main.yaml
rename to Federated-Deployment/docker-swarm/Docker-Ansible/roles/add-label/tasks/main.yaml
diff --git a/Federated-Deployment/Docker-Ansible/roles/add-worker-label/tasks/main.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/roles/add-worker-label/tasks/main.yaml
similarity index 100%
rename from Federated-Deployment/Docker-Ansible/roles/add-worker-label/tasks/main.yaml
rename to Federated-Deployment/docker-swarm/Docker-Ansible/roles/add-worker-label/tasks/main.yaml
diff --git a/Federated-Deployment/Docker-Ansible/roles/copy-directory/tasks/main.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/roles/copy-directory/tasks/main.yaml
similarity index 100%
rename from Federated-Deployment/Docker-Ansible/roles/copy-directory/tasks/main.yaml
rename to Federated-Deployment/docker-swarm/Docker-Ansible/roles/copy-directory/tasks/main.yaml
diff --git a/Federated-Deployment/Docker-Ansible/roles/copy-metadata/tasks/main.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/roles/copy-metadata/tasks/main.yaml
similarity index 100%
rename from Federated-Deployment/Docker-Ansible/roles/copy-metadata/tasks/main.yaml
rename to Federated-Deployment/docker-swarm/Docker-Ansible/roles/copy-metadata/tasks/main.yaml
diff --git a/Federated-Deployment/Docker-Ansible/roles/join-workers/tasks/main.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/roles/join-workers/tasks/main.yaml
similarity index 100%
rename from Federated-Deployment/Docker-Ansible/roles/join-workers/tasks/main.yaml
rename to Federated-Deployment/docker-swarm/Docker-Ansible/roles/join-workers/tasks/main.yaml
diff --git a/Federated-Deployment/Docker-Ansible/roles/start-services/tasks/main.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/roles/start-services/tasks/main.yaml
similarity index 100%
rename from Federated-Deployment/Docker-Ansible/roles/start-services/tasks/main.yaml
rename to Federated-Deployment/docker-swarm/Docker-Ansible/roles/start-services/tasks/main.yaml
diff --git a/Federated-Deployment/Docker-Ansible/roles/start-worker-service/tasks/main.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/roles/start-worker-service/tasks/main.yaml
similarity index 100%
rename from Federated-Deployment/Docker-Ansible/roles/start-worker-service/tasks/main.yaml
rename to Federated-Deployment/docker-swarm/Docker-Ansible/roles/start-worker-service/tasks/main.yaml
diff --git a/Federated-Deployment/Docker-Ansible/roles/stop-services/tasks/main.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/roles/stop-services/tasks/main.yaml
similarity index 100%
rename from Federated-Deployment/Docker-Ansible/roles/stop-services/tasks/main.yaml
rename to Federated-Deployment/docker-swarm/Docker-Ansible/roles/stop-services/tasks/main.yaml
diff --git a/Federated-Deployment/Docker-Ansible/roles/stop-worker-service/tasks/main.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/roles/stop-worker-service/tasks/main.yaml
similarity index 100%
rename from Federated-Deployment/Docker-Ansible/roles/stop-worker-service/tasks/main.yaml
rename to Federated-Deployment/docker-swarm/Docker-Ansible/roles/stop-worker-service/tasks/main.yaml
diff --git a/Federated-Deployment/Docker-Ansible/roles/swarm-init/tasks/main.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/roles/swarm-init/tasks/main.yaml
similarity index 100%
rename from Federated-Deployment/Docker-Ansible/roles/swarm-init/tasks/main.yaml
rename to Federated-Deployment/docker-swarm/Docker-Ansible/roles/swarm-init/tasks/main.yaml
diff --git a/Federated-Deployment/Docker-Ansible/roles/swarm-leave/tasks/main.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/roles/swarm-leave/tasks/main.yaml
similarity index 100%
rename from Federated-Deployment/Docker-Ansible/roles/swarm-leave/tasks/main.yaml
rename to Federated-Deployment/docker-swarm/Docker-Ansible/roles/swarm-leave/tasks/main.yaml
diff --git a/Federated-Deployment/Docker-Ansible/roles/worker-token/tasks/main.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/roles/worker-token/tasks/main.yaml
similarity index 100%
rename from Federated-Deployment/Docker-Ansible/roles/worker-token/tasks/main.yaml
rename to Federated-Deployment/docker-swarm/Docker-Ansible/roles/worker-token/tasks/main.yaml
diff --git a/Federated-Deployment/Docker-Ansible/scripts/add_worker.sh b/Federated-Deployment/docker-swarm/Docker-Ansible/scripts/add_worker.sh
similarity index 100%
rename from Federated-Deployment/Docker-Ansible/scripts/add_worker.sh
rename to Federated-Deployment/docker-swarm/Docker-Ansible/scripts/add_worker.sh
diff --git a/Federated-Deployment/Docker-Ansible/scripts/deploy.sh b/Federated-Deployment/docker-swarm/Docker-Ansible/scripts/deploy.sh
similarity index 100%
rename from Federated-Deployment/Docker-Ansible/scripts/deploy.sh
rename to Federated-Deployment/docker-swarm/Docker-Ansible/scripts/deploy.sh
diff --git a/Federated-Deployment/Docker-Ansible/scripts/deploy_all.sh b/Federated-Deployment/docker-swarm/Docker-Ansible/scripts/deploy_all.sh
similarity index 100%
rename from Federated-Deployment/Docker-Ansible/scripts/deploy_all.sh
rename to Federated-Deployment/docker-swarm/Docker-Ansible/scripts/deploy_all.sh
diff --git a/Federated-Deployment/Docker-Ansible/scripts/exareme.sh b/Federated-Deployment/docker-swarm/Docker-Ansible/scripts/exareme.sh
similarity index 100%
rename from Federated-Deployment/Docker-Ansible/scripts/exareme.sh
rename to Federated-Deployment/docker-swarm/Docker-Ansible/scripts/exareme.sh
diff --git a/Federated-Deployment/Docker-Ansible/scripts/remove_worker.sh b/Federated-Deployment/docker-swarm/Docker-Ansible/scripts/remove_worker.sh
similarity index 100%
rename from Federated-Deployment/Docker-Ansible/scripts/remove_worker.sh
rename to Federated-Deployment/docker-swarm/Docker-Ansible/scripts/remove_worker.sh
diff --git a/Federated-Deployment/Docker-Ansible/scripts/restart.sh b/Federated-Deployment/docker-swarm/Docker-Ansible/scripts/restart.sh
similarity index 100%
rename from Federated-Deployment/Docker-Ansible/scripts/restart.sh
rename to Federated-Deployment/docker-swarm/Docker-Ansible/scripts/restart.sh
diff --git a/Federated-Deployment/Docker-Ansible/scripts/restartWorker.sh b/Federated-Deployment/docker-swarm/Docker-Ansible/scripts/restartWorker.sh
similarity index 100%
rename from Federated-Deployment/Docker-Ansible/scripts/restartWorker.sh
rename to Federated-Deployment/docker-swarm/Docker-Ansible/scripts/restartWorker.sh
diff --git a/Federated-Deployment/Docker-Ansible/scripts/stop.sh b/Federated-Deployment/docker-swarm/Docker-Ansible/scripts/stop.sh
similarity index 100%
rename from Federated-Deployment/Docker-Ansible/scripts/stop.sh
rename to Federated-Deployment/docker-swarm/Docker-Ansible/scripts/stop.sh
diff --git a/Federated-Deployment/Docker-Ansible/scripts/stopWorker.sh b/Federated-Deployment/docker-swarm/Docker-Ansible/scripts/stopWorker.sh
similarity index 100%
rename from Federated-Deployment/Docker-Ansible/scripts/stopWorker.sh
rename to Federated-Deployment/docker-swarm/Docker-Ansible/scripts/stopWorker.sh
diff --git a/Federated-Deployment/Docker-Ansible/scripts/updateFiles.sh b/Federated-Deployment/docker-swarm/Docker-Ansible/scripts/updateFiles.sh
similarity index 100%
rename from Federated-Deployment/Docker-Ansible/scripts/updateFiles.sh
rename to Federated-Deployment/docker-swarm/Docker-Ansible/scripts/updateFiles.sh
diff --git a/Federated-Deployment/Docker-Ansible/scripts/updateHosts.sh b/Federated-Deployment/docker-swarm/Docker-Ansible/scripts/updateHosts.sh
similarity index 100%
rename from Federated-Deployment/Docker-Ansible/scripts/updateHosts.sh
rename to Federated-Deployment/docker-swarm/Docker-Ansible/scripts/updateHosts.sh
diff --git a/Federated-Deployment/Documentation/DeployByHospital.md b/Federated-Deployment/docker-swarm/Documentation/DeployByHospital.md
similarity index 100%
rename from Federated-Deployment/Documentation/DeployByHospital.md
rename to Federated-Deployment/docker-swarm/Documentation/DeployByHospital.md
diff --git a/Federated-Deployment/Documentation/Federation_Specifications.md b/Federated-Deployment/docker-swarm/Documentation/Federation_Specifications.md
similarity index 100%
rename from Federated-Deployment/Documentation/Federation_Specifications.md
rename to Federated-Deployment/docker-swarm/Documentation/Federation_Specifications.md
diff --git a/Federated-Deployment/Documentation/Firewall_Configuration.md b/Federated-Deployment/docker-swarm/Documentation/Firewall_Configuration.md
similarity index 100%
rename from Federated-Deployment/Documentation/Firewall_Configuration.md
rename to Federated-Deployment/docker-swarm/Documentation/Firewall_Configuration.md
diff --git a/Federated-Deployment/Documentation/ManualDeployment.md b/Federated-Deployment/docker-swarm/Documentation/ManualDeployment.md
similarity index 100%
rename from Federated-Deployment/Documentation/ManualDeployment.md
rename to Federated-Deployment/docker-swarm/Documentation/ManualDeployment.md
diff --git a/Federated-Deployment/Documentation/Optionals.md b/Federated-Deployment/docker-swarm/Documentation/Optionals.md
similarity index 100%
rename from Federated-Deployment/Documentation/Optionals.md
rename to Federated-Deployment/docker-swarm/Documentation/Optionals.md
diff --git a/Federated-Deployment/Documentation/Troubleshoot.md b/Federated-Deployment/docker-swarm/Documentation/Troubleshoot.md
similarity index 100%
rename from Federated-Deployment/Documentation/Troubleshoot.md
rename to Federated-Deployment/docker-swarm/Documentation/Troubleshoot.md
diff --git a/Federated-Deployment/Documentation/docker-swarm-master.xml b/Federated-Deployment/docker-swarm/Documentation/docker-swarm-master.xml
similarity index 100%
rename from Federated-Deployment/Documentation/docker-swarm-master.xml
rename to Federated-Deployment/docker-swarm/Documentation/docker-swarm-master.xml
diff --git a/Federated-Deployment/Documentation/docker-swarm-worker.xml b/Federated-Deployment/docker-swarm/Documentation/docker-swarm-worker.xml
similarity index 100%
rename from Federated-Deployment/Documentation/docker-swarm-worker.xml
rename to Federated-Deployment/docker-swarm/Documentation/docker-swarm-worker.xml
diff --git a/Federated-Deployment/README.md b/Federated-Deployment/docker-swarm/README.md
similarity index 100%
rename from Federated-Deployment/README.md
rename to Federated-Deployment/docker-swarm/README.md