diff --git a/ansible.cfg b/ansible.cfg
new file mode 100644
index 0000000..31f9730
--- /dev/null
+++ b/ansible.cfg
@@ -0,0 +1,20 @@
+[defaults]
+collections_path=./collections
+roles_path=./roles
+
+[galaxy]
+server_list = certified,validated,galaxy
+
+[galaxy_server.certified]
+# Grab a token at https://console.redhat.com/ansible/automation-hub/token
+# Then define it in the ANSIBLE_GALAXY_SERVER_CERTIFIED_TOKEN environment variable
+url=https://console.redhat.com/api/automation-hub/content/published/
+auth_url=https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token
+
+[galaxy_server.validated]
+# Define the token in the ANSIBLE_GALAXY_SERVER_VALIDATED_TOKEN environment variable
+url=https://console.redhat.com/api/automation-hub/content/validated/
+auth_url=https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token
+
+[galaxy_server.galaxy]
+url=https://galaxy.ansible.com/
diff --git a/ee/ansible-navigator.log b/execution_environments/ansible-navigator.log
similarity index 100%
rename from ee/ansible-navigator.log
rename to execution_environments/ansible-navigator.log
diff --git a/ee/ansible-navigator.yml b/execution_environments/ansible-navigator.yml
similarity index 100%
rename from ee/ansible-navigator.yml
rename to execution_environments/ansible-navigator.yml
diff --git a/ee/ansible.cfg b/execution_environments/ansible.cfg
similarity index 100%
rename from ee/ansible.cfg
rename to execution_environments/ansible.cfg
diff --git a/ee/context/Containerfile b/execution_environments/context/Containerfile
similarity index 100%
rename from ee/context/Containerfile
rename to execution_environments/context/Containerfile
diff --git a/ee/context/_build/ansible.cfg b/execution_environments/context/_build/ansible.cfg
similarity index 100%
rename from ee/context/_build/ansible.cfg
rename to execution_environments/context/_build/ansible.cfg
diff --git a/ee/context/_build/requirements.yml b/execution_environments/context/_build/requirements.yml
similarity index 100%
rename from ee/context/_build/requirements.yml
rename to execution_environments/context/_build/requirements.yml
diff --git a/ee/execution-environment.yml b/execution_environments/execution-environment.yml
similarity index 100%
rename from ee/execution-environment.yml
rename to execution_environments/execution-environment.yml
diff --git a/ee/requirements.yml b/execution_environments/requirements.yml
similarity index 100%
rename from ee/requirements.yml
rename to execution_environments/requirements.yml
diff --git a/build_vm/main.yml b/playbooks/build_vm/main.yml
similarity index 100%
rename from build_vm/main.yml
rename to playbooks/build_vm/main.yml
diff --git a/build_vm/tasks/main.yml b/playbooks/build_vm/tasks/main.yml
similarity index 100%
rename from build_vm/tasks/main.yml
rename to playbooks/build_vm/tasks/main.yml
diff --git a/build_vm/templates/vm_template.xml.j2 b/playbooks/build_vm/templates/vm_template.xml.j2
similarity index 100%
rename from build_vm/templates/vm_template.xml.j2
rename to playbooks/build_vm/templates/vm_template.xml.j2
diff --git "a/configure_machine/\\" "b/playbooks/configure_machine/\\"
similarity index 100%
rename from "configure_machine/\\"
rename to "playbooks/configure_machine/\\"
diff --git a/configure_machine/site.yml b/playbooks/configure_machine/site.yml
similarity index 100%
rename from configure_machine/site.yml
rename to playbooks/configure_machine/site.yml
diff --git a/configure_nfs/ansible.cfg b/playbooks/configure_nfs/ansible.cfg
similarity index 100%
rename from configure_nfs/ansible.cfg
rename to playbooks/configure_nfs/ansible.cfg
diff --git a/configure_nfs/site.yml b/playbooks/configure_nfs/site.yml
similarity index 100%
rename from configure_nfs/site.yml
rename to playbooks/configure_nfs/site.yml
diff --git a/configure_symlink/.gitignore b/playbooks/configure_symlink/.gitignore
similarity index 100%
rename from configure_symlink/.gitignore
rename to playbooks/configure_symlink/.gitignore
diff --git a/configure_symlink/index.html.j2 b/playbooks/configure_symlink/index.html.j2
similarity index 100%
rename from configure_symlink/index.html.j2
rename to playbooks/configure_symlink/index.html.j2
diff --git a/configure_symlink/webdir.yml b/playbooks/configure_symlink/webdir.yml
similarity index 100%
rename from configure_symlink/webdir.yml
rename to playbooks/configure_symlink/webdir.yml
diff --git a/install_gitea/ansible.cfg b/playbooks/install_gitea/ansible.cfg
similarity index 100%
rename from install_gitea/ansible.cfg
rename to playbooks/install_gitea/ansible.cfg
diff --git a/install_gitea/site.yml b/playbooks/install_gitea/site.yml
similarity index 100%
rename from install_gitea/site.yml
rename to playbooks/install_gitea/site.yml
diff --git a/push_update/main.yml b/playbooks/push_update/main.yml
similarity index 100%
rename from push_update/main.yml
rename to playbooks/push_update/main.yml
diff --git a/replicate_dns/replicate_dns.yml b/playbooks/replicate_dns/replicate_dns.yml
similarity index 100%
rename from replicate_dns/replicate_dns.yml
rename to playbooks/replicate_dns/replicate_dns.yml
diff --git a/restart_vms/main.yml b/playbooks/restart_vms/main.yml
similarity index 100%
rename from restart_vms/main.yml
rename to playbooks/restart_vms/main.yml
diff --git a/restart_vms/tasks/check-connection.yml b/playbooks/restart_vms/tasks/check-connection.yml
similarity index 100%
rename from restart_vms/tasks/check-connection.yml
rename to playbooks/restart_vms/tasks/check-connection.yml
diff --git a/set_motd/main.yml b/playbooks/set_motd/main.yml
similarity index 100%
rename from set_motd/main.yml
rename to playbooks/set_motd/main.yml
diff --git a/set_motd/template/motd b/playbooks/set_motd/template/motd
similarity index 100%
rename from set_motd/template/motd
rename to playbooks/set_motd/template/motd
diff --git a/configure_machine/roles/common/files/.bashrc b/roles/common/files/.bashrc
similarity index 100%
rename from configure_machine/roles/common/files/.bashrc
rename to roles/common/files/.bashrc
diff --git a/configure_machine/roles/common/files/.vim/.netrwhist b/roles/common/files/.vim/.netrwhist
similarity index 100%
rename from configure_machine/roles/common/files/.vim/.netrwhist
rename to roles/common/files/.vim/.netrwhist
diff --git a/configure_machine/roles/common/files/.vim/colors/badwolf.vim b/roles/common/files/.vim/colors/badwolf.vim
similarity index 100%
rename from configure_machine/roles/common/files/.vim/colors/badwolf.vim
rename to roles/common/files/.vim/colors/badwolf.vim
diff --git a/configure_machine/roles/common/files/vimrc b/roles/common/files/vimrc
similarity index 100%
rename from configure_machine/roles/common/files/vimrc
rename to roles/common/files/vimrc
diff --git a/configure_machine/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
similarity index 100%
rename from configure_machine/roles/common/tasks/main.yml
rename to roles/common/tasks/main.yml
diff --git a/configure_machine/roles/common/vars/main.yml b/roles/common/vars/main.yml
similarity index 100%
rename from configure_machine/roles/common/vars/main.yml
rename to roles/common/vars/main.yml
diff --git a/install_gitea/roles/configure_network/tasks/main.yml b/roles/configure_network/tasks/main.yml
similarity index 100%
rename from install_gitea/roles/configure_network/tasks/main.yml
rename to roles/configure_network/tasks/main.yml
diff --git a/install_gitea/roles/configure_nfs/tasks/main.yml b/roles/configure_nfs/tasks/main.yml
similarity index 100%
rename from install_gitea/roles/configure_nfs/tasks/main.yml
rename to roles/configure_nfs/tasks/main.yml
diff --git a/install_gitea/roles/configure_nfs/vars/main.yml b/roles/configure_nfs/vars/main.yml
similarity index 100%
rename from install_gitea/roles/configure_nfs/vars/main.yml
rename to roles/configure_nfs/vars/main.yml
diff --git a/configure_nfs/roles/configure_ttrpg/tasks/main.yml b/roles/configure_ttrpg/tasks/main.yml
similarity index 100%
rename from configure_nfs/roles/configure_ttrpg/tasks/main.yml
rename to roles/configure_ttrpg/tasks/main.yml
diff --git a/configure_nfs/roles/configure_ttrpg/vars/main.yml b/roles/configure_ttrpg/vars/main.yml
similarity index 100%
rename from configure_nfs/roles/configure_ttrpg/vars/main.yml
rename to roles/configure_ttrpg/vars/main.yml
diff --git a/install_gitea/roles/install_gitea/tasks/.main.yml.swp b/roles/install_gitea/tasks/.main.yml.swp
similarity index 100%
rename from install_gitea/roles/install_gitea/tasks/.main.yml.swp
rename to roles/install_gitea/tasks/.main.yml.swp
diff --git a/install_gitea/roles/install_gitea/tasks/main.yml b/roles/install_gitea/tasks/main.yml
similarity index 100%
rename from install_gitea/roles/install_gitea/tasks/main.yml
rename to roles/install_gitea/tasks/main.yml
diff --git a/configure_machine/roles/install_packages/tasks/main.yml b/roles/install_packages/tasks/main.yml
similarity index 100%
rename from configure_machine/roles/install_packages/tasks/main.yml
rename to roles/install_packages/tasks/main.yml
diff --git a/configure_machine/roles/install_packages/vars/main.yml b/roles/install_packages/vars/main.yml
similarity index 100%
rename from configure_machine/roles/install_packages/vars/main.yml
rename to roles/install_packages/vars/main.yml
diff --git a/install_gitea/roles/install_pgdb/tasks/.main.yml.swp b/roles/install_pgdb/tasks/.main.yml.swp
similarity index 100%
rename from install_gitea/roles/install_pgdb/tasks/.main.yml.swp
rename to roles/install_pgdb/tasks/.main.yml.swp
diff --git a/install_gitea/roles/install_pgdb/tasks/main.yml b/roles/install_pgdb/tasks/main.yml
similarity index 100%
rename from install_gitea/roles/install_pgdb/tasks/main.yml
rename to roles/install_pgdb/tasks/main.yml
diff --git a/install_gitea/roles/common/tasks/main.yml b/roles/install_podman/tasks/main.yml
similarity index 100%
rename from install_gitea/roles/common/tasks/main.yml
rename to roles/install_podman/tasks/main.yml