diff --git a/roles/robertdebock.ansible/.ansible-lint b/roles/ansible/.ansible-lint
similarity index 100%
rename from roles/robertdebock.ansible/.ansible-lint
rename to roles/ansible/.ansible-lint
diff --git a/roles/robertdebock.ansible/.github/FUNDING.yml b/roles/ansible/.github/FUNDING.yml
similarity index 100%
rename from roles/robertdebock.ansible/.github/FUNDING.yml
rename to roles/ansible/.github/FUNDING.yml
diff --git a/roles/robertdebock.ansible/.github/ISSUE_TEMPLATE/bug_report.md b/roles/ansible/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 100%
rename from roles/robertdebock.ansible/.github/ISSUE_TEMPLATE/bug_report.md
rename to roles/ansible/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/roles/robertdebock.ansible/.github/ISSUE_TEMPLATE/feature_request.md b/roles/ansible/.github/ISSUE_TEMPLATE/feature_request.md
similarity index 100%
rename from roles/robertdebock.ansible/.github/ISSUE_TEMPLATE/feature_request.md
rename to roles/ansible/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/roles/robertdebock.ansible/.github/pull_request_template.md b/roles/ansible/.github/pull_request_template.md
similarity index 100%
rename from roles/robertdebock.ansible/.github/pull_request_template.md
rename to roles/ansible/.github/pull_request_template.md
diff --git a/roles/robertdebock.ansible/.github/settings.yml b/roles/ansible/.github/settings.yml
similarity index 100%
rename from roles/robertdebock.ansible/.github/settings.yml
rename to roles/ansible/.github/settings.yml
diff --git a/roles/robertdebock.ansible/.github/workflows/galaxy.yml b/roles/ansible/.github/workflows/galaxy.yml
similarity index 100%
rename from roles/robertdebock.ansible/.github/workflows/galaxy.yml
rename to roles/ansible/.github/workflows/galaxy.yml
diff --git a/roles/robertdebock.ansible/.github/workflows/molecule.yml b/roles/ansible/.github/workflows/molecule.yml
similarity index 100%
rename from roles/robertdebock.ansible/.github/workflows/molecule.yml
rename to roles/ansible/.github/workflows/molecule.yml
diff --git a/roles/robertdebock.ansible/.gitignore b/roles/ansible/.gitignore
similarity index 100%
rename from roles/robertdebock.ansible/.gitignore
rename to roles/ansible/.gitignore
diff --git a/roles/robertdebock.ansible/.travis.yml b/roles/ansible/.travis.yml
similarity index 100%
rename from roles/robertdebock.ansible/.travis.yml
rename to roles/ansible/.travis.yml
diff --git a/roles/robertdebock.ansible/.yamllint b/roles/ansible/.yamllint
similarity index 100%
rename from roles/robertdebock.ansible/.yamllint
rename to roles/ansible/.yamllint
diff --git a/roles/robertdebock.ansible/CODE_OF_CONDUCT.md b/roles/ansible/CODE_OF_CONDUCT.md
similarity index 100%
rename from roles/robertdebock.ansible/CODE_OF_CONDUCT.md
rename to roles/ansible/CODE_OF_CONDUCT.md
diff --git a/roles/robertdebock.ansible/CONTRIBUTING.md b/roles/ansible/CONTRIBUTING.md
similarity index 100%
rename from roles/robertdebock.ansible/CONTRIBUTING.md
rename to roles/ansible/CONTRIBUTING.md
diff --git a/roles/robertdebock.ansible/LICENSE b/roles/ansible/LICENSE
similarity index 100%
rename from roles/robertdebock.ansible/LICENSE
rename to roles/ansible/LICENSE
diff --git a/roles/robertdebock.ansible/README.md b/roles/ansible/README.md
similarity index 100%
rename from roles/robertdebock.ansible/README.md
rename to roles/ansible/README.md
diff --git a/roles/robertdebock.ansible/SECURITY.md b/roles/ansible/SECURITY.md
similarity index 100%
rename from roles/robertdebock.ansible/SECURITY.md
rename to roles/ansible/SECURITY.md
diff --git a/roles/robertdebock.ansible/defaults/main.yml b/roles/ansible/defaults/main.yml
similarity index 100%
rename from roles/robertdebock.ansible/defaults/main.yml
rename to roles/ansible/defaults/main.yml
diff --git a/roles/ansible/meta/.galaxy_install_info b/roles/ansible/meta/.galaxy_install_info
new file mode 100644
index 0000000..f7195d6
--- /dev/null
+++ b/roles/ansible/meta/.galaxy_install_info
@@ -0,0 +1,2 @@
+install_date: Mon Sep 28 13:21:49 2020
+version: 2.3.3
diff --git a/roles/robertdebock.ansible/meta/exception.yml b/roles/ansible/meta/exception.yml
similarity index 100%
rename from roles/robertdebock.ansible/meta/exception.yml
rename to roles/ansible/meta/exception.yml
diff --git a/roles/robertdebock.ansible/meta/main.yml b/roles/ansible/meta/main.yml
similarity index 100%
rename from roles/robertdebock.ansible/meta/main.yml
rename to roles/ansible/meta/main.yml
diff --git a/roles/robertdebock.ansible/meta/preferences.yml b/roles/ansible/meta/preferences.yml
similarity index 100%
rename from roles/robertdebock.ansible/meta/preferences.yml
rename to roles/ansible/meta/preferences.yml
diff --git a/roles/robertdebock.ansible/molecule/default/converge.yml b/roles/ansible/molecule/default/converge.yml
similarity index 100%
rename from roles/robertdebock.ansible/molecule/default/converge.yml
rename to roles/ansible/molecule/default/converge.yml
diff --git a/roles/robertdebock.ansible/molecule/default/molecule.yml b/roles/ansible/molecule/default/molecule.yml
similarity index 100%
rename from roles/robertdebock.ansible/molecule/default/molecule.yml
rename to roles/ansible/molecule/default/molecule.yml
diff --git a/roles/robertdebock.ansible/molecule/default/prepare.yml b/roles/ansible/molecule/default/prepare.yml
similarity index 100%
rename from roles/robertdebock.ansible/molecule/default/prepare.yml
rename to roles/ansible/molecule/default/prepare.yml
diff --git a/roles/robertdebock.ansible/molecule/default/verify.yml b/roles/ansible/molecule/default/verify.yml
similarity index 100%
rename from roles/robertdebock.ansible/molecule/default/verify.yml
rename to roles/ansible/molecule/default/verify.yml
diff --git a/roles/robertdebock.ansible/requirements.yml b/roles/ansible/requirements.yml
similarity index 100%
rename from roles/robertdebock.ansible/requirements.yml
rename to roles/ansible/requirements.yml
diff --git a/roles/robertdebock.ansible/tasks/assert.yml b/roles/ansible/tasks/assert.yml
similarity index 100%
rename from roles/robertdebock.ansible/tasks/assert.yml
rename to roles/ansible/tasks/assert.yml
diff --git a/roles/robertdebock.ansible/tasks/main.yml b/roles/ansible/tasks/main.yml
similarity index 100%
rename from roles/robertdebock.ansible/tasks/main.yml
rename to roles/ansible/tasks/main.yml
diff --git a/roles/robertdebock.ansible/tox.ini b/roles/ansible/tox.ini
similarity index 100%
rename from roles/robertdebock.ansible/tox.ini
rename to roles/ansible/tox.ini
diff --git a/roles/robertdebock.ansible/vars/main.yml b/roles/ansible/vars/main.yml
similarity index 100%
rename from roles/robertdebock.ansible/vars/main.yml
rename to roles/ansible/vars/main.yml
diff --git a/roles/robertdebock.ansible_lint/.ansible-lint b/roles/ansible_lint/.ansible-lint
similarity index 100%
rename from roles/robertdebock.ansible_lint/.ansible-lint
rename to roles/ansible_lint/.ansible-lint
diff --git a/roles/robertdebock.ansible_lint/.github/FUNDING.yml b/roles/ansible_lint/.github/FUNDING.yml
similarity index 100%
rename from roles/robertdebock.ansible_lint/.github/FUNDING.yml
rename to roles/ansible_lint/.github/FUNDING.yml
diff --git a/roles/robertdebock.ansible_lint/.github/ISSUE_TEMPLATE/bug_report.md b/roles/ansible_lint/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 100%
rename from roles/robertdebock.ansible_lint/.github/ISSUE_TEMPLATE/bug_report.md
rename to roles/ansible_lint/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/roles/robertdebock.ansible_lint/.github/ISSUE_TEMPLATE/feature_request.md b/roles/ansible_lint/.github/ISSUE_TEMPLATE/feature_request.md
similarity index 100%
rename from roles/robertdebock.ansible_lint/.github/ISSUE_TEMPLATE/feature_request.md
rename to roles/ansible_lint/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/roles/robertdebock.ansible_lint/.github/pull_request_template.md b/roles/ansible_lint/.github/pull_request_template.md
similarity index 100%
rename from roles/robertdebock.ansible_lint/.github/pull_request_template.md
rename to roles/ansible_lint/.github/pull_request_template.md
diff --git a/roles/robertdebock.ansible_lint/.github/settings.yml b/roles/ansible_lint/.github/settings.yml
similarity index 100%
rename from roles/robertdebock.ansible_lint/.github/settings.yml
rename to roles/ansible_lint/.github/settings.yml
diff --git a/roles/robertdebock.ansible_lint/.github/workflows/galaxy.yml b/roles/ansible_lint/.github/workflows/galaxy.yml
similarity index 100%
rename from roles/robertdebock.ansible_lint/.github/workflows/galaxy.yml
rename to roles/ansible_lint/.github/workflows/galaxy.yml
diff --git a/roles/robertdebock.ansible_lint/.github/workflows/molecule.yml b/roles/ansible_lint/.github/workflows/molecule.yml
similarity index 100%
rename from roles/robertdebock.ansible_lint/.github/workflows/molecule.yml
rename to roles/ansible_lint/.github/workflows/molecule.yml
diff --git a/roles/robertdebock.ansible_lint/.gitignore b/roles/ansible_lint/.gitignore
similarity index 100%
rename from roles/robertdebock.ansible_lint/.gitignore
rename to roles/ansible_lint/.gitignore
diff --git a/roles/robertdebock.ansible_lint/.travis.yml b/roles/ansible_lint/.travis.yml
similarity index 100%
rename from roles/robertdebock.ansible_lint/.travis.yml
rename to roles/ansible_lint/.travis.yml
diff --git a/roles/robertdebock.ansible_lint/.yamllint b/roles/ansible_lint/.yamllint
similarity index 100%
rename from roles/robertdebock.ansible_lint/.yamllint
rename to roles/ansible_lint/.yamllint
diff --git a/roles/robertdebock.ansible_lint/CODE_OF_CONDUCT.md b/roles/ansible_lint/CODE_OF_CONDUCT.md
similarity index 100%
rename from roles/robertdebock.ansible_lint/CODE_OF_CONDUCT.md
rename to roles/ansible_lint/CODE_OF_CONDUCT.md
diff --git a/roles/robertdebock.ansible_lint/CONTRIBUTING.md b/roles/ansible_lint/CONTRIBUTING.md
similarity index 100%
rename from roles/robertdebock.ansible_lint/CONTRIBUTING.md
rename to roles/ansible_lint/CONTRIBUTING.md
diff --git a/roles/robertdebock.ansible_lint/LICENSE b/roles/ansible_lint/LICENSE
similarity index 100%
rename from roles/robertdebock.ansible_lint/LICENSE
rename to roles/ansible_lint/LICENSE
diff --git a/roles/robertdebock.ansible_lint/README.md b/roles/ansible_lint/README.md
similarity index 100%
rename from roles/robertdebock.ansible_lint/README.md
rename to roles/ansible_lint/README.md
diff --git a/roles/robertdebock.ansible_lint/SECURITY.md b/roles/ansible_lint/SECURITY.md
similarity index 100%
rename from roles/robertdebock.ansible_lint/SECURITY.md
rename to roles/ansible_lint/SECURITY.md
diff --git a/roles/ansible_lint/meta/.galaxy_install_info b/roles/ansible_lint/meta/.galaxy_install_info
new file mode 100644
index 0000000..f2ff1d7
--- /dev/null
+++ b/roles/ansible_lint/meta/.galaxy_install_info
@@ -0,0 +1,2 @@
+install_date: Mon Sep 28 13:21:51 2020
+version: 2.3.12
diff --git a/roles/robertdebock.ansible_lint/meta/exception.yml b/roles/ansible_lint/meta/exception.yml
similarity index 100%
rename from roles/robertdebock.ansible_lint/meta/exception.yml
rename to roles/ansible_lint/meta/exception.yml
diff --git a/roles/robertdebock.ansible_lint/meta/main.yml b/roles/ansible_lint/meta/main.yml
similarity index 100%
rename from roles/robertdebock.ansible_lint/meta/main.yml
rename to roles/ansible_lint/meta/main.yml
diff --git a/roles/robertdebock.ansible_lint/meta/preferences.yml b/roles/ansible_lint/meta/preferences.yml
similarity index 100%
rename from roles/robertdebock.ansible_lint/meta/preferences.yml
rename to roles/ansible_lint/meta/preferences.yml
diff --git a/roles/robertdebock.ansible_lint/molecule/default/converge.yml b/roles/ansible_lint/molecule/default/converge.yml
similarity index 100%
rename from roles/robertdebock.ansible_lint/molecule/default/converge.yml
rename to roles/ansible_lint/molecule/default/converge.yml
diff --git a/roles/robertdebock.ansible_lint/molecule/default/molecule.yml b/roles/ansible_lint/molecule/default/molecule.yml
similarity index 100%
rename from roles/robertdebock.ansible_lint/molecule/default/molecule.yml
rename to roles/ansible_lint/molecule/default/molecule.yml
diff --git a/roles/robertdebock.ansible_lint/molecule/default/prepare.yml b/roles/ansible_lint/molecule/default/prepare.yml
similarity index 100%
rename from roles/robertdebock.ansible_lint/molecule/default/prepare.yml
rename to roles/ansible_lint/molecule/default/prepare.yml
diff --git a/roles/robertdebock.ansible_lint/molecule/default/verify.yml b/roles/ansible_lint/molecule/default/verify.yml
similarity index 100%
rename from roles/robertdebock.ansible_lint/molecule/default/verify.yml
rename to roles/ansible_lint/molecule/default/verify.yml
diff --git a/roles/robertdebock.ansible_lint/requirements.yml b/roles/ansible_lint/requirements.yml
similarity index 100%
rename from roles/robertdebock.ansible_lint/requirements.yml
rename to roles/ansible_lint/requirements.yml
diff --git a/roles/robertdebock.ansible_lint/tasks/main.yml b/roles/ansible_lint/tasks/main.yml
similarity index 100%
rename from roles/robertdebock.ansible_lint/tasks/main.yml
rename to roles/ansible_lint/tasks/main.yml
diff --git a/roles/robertdebock.ansible_lint/tox.ini b/roles/ansible_lint/tox.ini
similarity index 100%
rename from roles/robertdebock.ansible_lint/tox.ini
rename to roles/ansible_lint/tox.ini
diff --git a/roles/robertdebock.ansible_lint/vars/main.yml b/roles/ansible_lint/vars/main.yml
similarity index 100%
rename from roles/robertdebock.ansible_lint/vars/main.yml
rename to roles/ansible_lint/vars/main.yml
diff --git a/roles/robertdebock.ara/.ansible-lint b/roles/ara/.ansible-lint
similarity index 100%
rename from roles/robertdebock.ara/.ansible-lint
rename to roles/ara/.ansible-lint
diff --git a/roles/robertdebock.ara/.github/FUNDING.yml b/roles/ara/.github/FUNDING.yml
similarity index 100%
rename from roles/robertdebock.ara/.github/FUNDING.yml
rename to roles/ara/.github/FUNDING.yml
diff --git a/roles/robertdebock.ara/.github/ISSUE_TEMPLATE/bug_report.md b/roles/ara/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 100%
rename from roles/robertdebock.ara/.github/ISSUE_TEMPLATE/bug_report.md
rename to roles/ara/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/roles/robertdebock.ara/.github/ISSUE_TEMPLATE/feature_request.md b/roles/ara/.github/ISSUE_TEMPLATE/feature_request.md
similarity index 100%
rename from roles/robertdebock.ara/.github/ISSUE_TEMPLATE/feature_request.md
rename to roles/ara/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/roles/robertdebock.ara/.github/pull_request_template.md b/roles/ara/.github/pull_request_template.md
similarity index 100%
rename from roles/robertdebock.ara/.github/pull_request_template.md
rename to roles/ara/.github/pull_request_template.md
diff --git a/roles/robertdebock.ara/.github/settings.yml b/roles/ara/.github/settings.yml
similarity index 100%
rename from roles/robertdebock.ara/.github/settings.yml
rename to roles/ara/.github/settings.yml
diff --git a/roles/robertdebock.ara/.github/workflows/galaxy.yml b/roles/ara/.github/workflows/galaxy.yml
similarity index 100%
rename from roles/robertdebock.ara/.github/workflows/galaxy.yml
rename to roles/ara/.github/workflows/galaxy.yml
diff --git a/roles/robertdebock.ara/.github/workflows/molecule.yml b/roles/ara/.github/workflows/molecule.yml
similarity index 100%
rename from roles/robertdebock.ara/.github/workflows/molecule.yml
rename to roles/ara/.github/workflows/molecule.yml
diff --git a/roles/robertdebock.ara/.gitignore b/roles/ara/.gitignore
similarity index 100%
rename from roles/robertdebock.ara/.gitignore
rename to roles/ara/.gitignore
diff --git a/roles/robertdebock.ara/.travis.yml b/roles/ara/.travis.yml
similarity index 100%
rename from roles/robertdebock.ara/.travis.yml
rename to roles/ara/.travis.yml
diff --git a/roles/robertdebock.ara/.yamllint b/roles/ara/.yamllint
similarity index 100%
rename from roles/robertdebock.ara/.yamllint
rename to roles/ara/.yamllint
diff --git a/roles/robertdebock.ara/CODE_OF_CONDUCT.md b/roles/ara/CODE_OF_CONDUCT.md
similarity index 100%
rename from roles/robertdebock.ara/CODE_OF_CONDUCT.md
rename to roles/ara/CODE_OF_CONDUCT.md
diff --git a/roles/robertdebock.ara/CONTRIBUTING.md b/roles/ara/CONTRIBUTING.md
similarity index 100%
rename from roles/robertdebock.ara/CONTRIBUTING.md
rename to roles/ara/CONTRIBUTING.md
diff --git a/roles/robertdebock.ara/LICENSE b/roles/ara/LICENSE
similarity index 100%
rename from roles/robertdebock.ara/LICENSE
rename to roles/ara/LICENSE
diff --git a/roles/robertdebock.ara/README.md b/roles/ara/README.md
similarity index 100%
rename from roles/robertdebock.ara/README.md
rename to roles/ara/README.md
diff --git a/roles/robertdebock.ara/SECURITY.md b/roles/ara/SECURITY.md
similarity index 100%
rename from roles/robertdebock.ara/SECURITY.md
rename to roles/ara/SECURITY.md
diff --git a/roles/robertdebock.ara/defaults/main.yml b/roles/ara/defaults/main.yml
similarity index 100%
rename from roles/robertdebock.ara/defaults/main.yml
rename to roles/ara/defaults/main.yml
diff --git a/roles/robertdebock.ara/handlers/main.yml b/roles/ara/handlers/main.yml
similarity index 100%
rename from roles/robertdebock.ara/handlers/main.yml
rename to roles/ara/handlers/main.yml
diff --git a/roles/ara/meta/.galaxy_install_info b/roles/ara/meta/.galaxy_install_info
new file mode 100644
index 0000000..ebc4342
--- /dev/null
+++ b/roles/ara/meta/.galaxy_install_info
@@ -0,0 +1,2 @@
+install_date: Mon Sep 28 13:21:56 2020
+version: 2.5.2
diff --git a/roles/robertdebock.ara/meta/exception.yml b/roles/ara/meta/exception.yml
similarity index 100%
rename from roles/robertdebock.ara/meta/exception.yml
rename to roles/ara/meta/exception.yml
diff --git a/roles/robertdebock.ara/meta/main.yml b/roles/ara/meta/main.yml
similarity index 100%
rename from roles/robertdebock.ara/meta/main.yml
rename to roles/ara/meta/main.yml
diff --git a/roles/robertdebock.ara/meta/preferences.yml b/roles/ara/meta/preferences.yml
similarity index 100%
rename from roles/robertdebock.ara/meta/preferences.yml
rename to roles/ara/meta/preferences.yml
diff --git a/roles/robertdebock.ara/molecule/default/converge.yml b/roles/ara/molecule/default/converge.yml
similarity index 100%
rename from roles/robertdebock.ara/molecule/default/converge.yml
rename to roles/ara/molecule/default/converge.yml
diff --git a/roles/robertdebock.ara/molecule/default/molecule.yml b/roles/ara/molecule/default/molecule.yml
similarity index 100%
rename from roles/robertdebock.ara/molecule/default/molecule.yml
rename to roles/ara/molecule/default/molecule.yml
diff --git a/roles/robertdebock.ara/molecule/default/prepare.yml b/roles/ara/molecule/default/prepare.yml
similarity index 100%
rename from roles/robertdebock.ara/molecule/default/prepare.yml
rename to roles/ara/molecule/default/prepare.yml
diff --git a/roles/robertdebock.ara/molecule/default/verify.yml b/roles/ara/molecule/default/verify.yml
similarity index 100%
rename from roles/robertdebock.ara/molecule/default/verify.yml
rename to roles/ara/molecule/default/verify.yml
diff --git a/roles/robertdebock.ara/requirements.yml b/roles/ara/requirements.yml
similarity index 100%
rename from roles/robertdebock.ara/requirements.yml
rename to roles/ara/requirements.yml
diff --git a/roles/robertdebock.ara/tasks/assert.yml b/roles/ara/tasks/assert.yml
similarity index 100%
rename from roles/robertdebock.ara/tasks/assert.yml
rename to roles/ara/tasks/assert.yml
diff --git a/roles/robertdebock.ara/tasks/main.yml b/roles/ara/tasks/main.yml
similarity index 97%
rename from roles/robertdebock.ara/tasks/main.yml
rename to roles/ara/tasks/main.yml
index bd2d045..ee5107c 100644
--- a/roles/robertdebock.ara/tasks/main.yml
+++ b/roles/ara/tasks/main.yml
@@ -10,7 +10,7 @@
 
 - name: create ara service
   import_role:
-    name: robertdebock.service
+    name: service
 
 - name: find callback_plugins path
   block:
diff --git a/roles/robertdebock.ara/tox.ini b/roles/ara/tox.ini
similarity index 100%
rename from roles/robertdebock.ara/tox.ini
rename to roles/ara/tox.ini
diff --git a/roles/robertdebock.ara/vars/main.yml b/roles/ara/vars/main.yml
similarity index 100%
rename from roles/robertdebock.ara/vars/main.yml
rename to roles/ara/vars/main.yml
diff --git a/roles/robertdebock.atom/.ansible-lint b/roles/atom/.ansible-lint
similarity index 100%
rename from roles/robertdebock.atom/.ansible-lint
rename to roles/atom/.ansible-lint
diff --git a/roles/robertdebock.atom/.github/FUNDING.yml b/roles/atom/.github/FUNDING.yml
similarity index 100%
rename from roles/robertdebock.atom/.github/FUNDING.yml
rename to roles/atom/.github/FUNDING.yml
diff --git a/roles/robertdebock.atom/.github/ISSUE_TEMPLATE/bug_report.md b/roles/atom/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 100%
rename from roles/robertdebock.atom/.github/ISSUE_TEMPLATE/bug_report.md
rename to roles/atom/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/roles/robertdebock.atom/.github/ISSUE_TEMPLATE/feature_request.md b/roles/atom/.github/ISSUE_TEMPLATE/feature_request.md
similarity index 100%
rename from roles/robertdebock.atom/.github/ISSUE_TEMPLATE/feature_request.md
rename to roles/atom/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/roles/robertdebock.atom/.github/pull_request_template.md b/roles/atom/.github/pull_request_template.md
similarity index 100%
rename from roles/robertdebock.atom/.github/pull_request_template.md
rename to roles/atom/.github/pull_request_template.md
diff --git a/roles/robertdebock.atom/.github/settings.yml b/roles/atom/.github/settings.yml
similarity index 100%
rename from roles/robertdebock.atom/.github/settings.yml
rename to roles/atom/.github/settings.yml
diff --git a/roles/robertdebock.atom/.github/workflows/galaxy.yml b/roles/atom/.github/workflows/galaxy.yml
similarity index 100%
rename from roles/robertdebock.atom/.github/workflows/galaxy.yml
rename to roles/atom/.github/workflows/galaxy.yml
diff --git a/roles/robertdebock.atom/.github/workflows/molecule.yml b/roles/atom/.github/workflows/molecule.yml
similarity index 100%
rename from roles/robertdebock.atom/.github/workflows/molecule.yml
rename to roles/atom/.github/workflows/molecule.yml
diff --git a/roles/robertdebock.atom/.gitignore b/roles/atom/.gitignore
similarity index 100%
rename from roles/robertdebock.atom/.gitignore
rename to roles/atom/.gitignore
diff --git a/roles/robertdebock.atom/.travis.yml b/roles/atom/.travis.yml
similarity index 100%
rename from roles/robertdebock.atom/.travis.yml
rename to roles/atom/.travis.yml
diff --git a/roles/robertdebock.atom/.yamllint b/roles/atom/.yamllint
similarity index 100%
rename from roles/robertdebock.atom/.yamllint
rename to roles/atom/.yamllint
diff --git a/roles/robertdebock.atom/CODE_OF_CONDUCT.md b/roles/atom/CODE_OF_CONDUCT.md
similarity index 100%
rename from roles/robertdebock.atom/CODE_OF_CONDUCT.md
rename to roles/atom/CODE_OF_CONDUCT.md
diff --git a/roles/robertdebock.atom/CONTRIBUTING.md b/roles/atom/CONTRIBUTING.md
similarity index 100%
rename from roles/robertdebock.atom/CONTRIBUTING.md
rename to roles/atom/CONTRIBUTING.md
diff --git a/roles/robertdebock.atom/LICENSE b/roles/atom/LICENSE
similarity index 100%
rename from roles/robertdebock.atom/LICENSE
rename to roles/atom/LICENSE
diff --git a/roles/robertdebock.atom/README.md b/roles/atom/README.md
similarity index 100%
rename from roles/robertdebock.atom/README.md
rename to roles/atom/README.md
diff --git a/roles/robertdebock.atom/SECURITY.md b/roles/atom/SECURITY.md
similarity index 100%
rename from roles/robertdebock.atom/SECURITY.md
rename to roles/atom/SECURITY.md
diff --git a/roles/robertdebock.atom/defaults/main.yml b/roles/atom/defaults/main.yml
similarity index 100%
rename from roles/robertdebock.atom/defaults/main.yml
rename to roles/atom/defaults/main.yml
diff --git a/roles/atom/meta/.galaxy_install_info b/roles/atom/meta/.galaxy_install_info
new file mode 100644
index 0000000..6564449
--- /dev/null
+++ b/roles/atom/meta/.galaxy_install_info
@@ -0,0 +1,2 @@
+install_date: Mon Sep 28 13:21:59 2020
+version: 2.5.1
diff --git a/roles/robertdebock.atom/meta/exception.yml b/roles/atom/meta/exception.yml
similarity index 100%
rename from roles/robertdebock.atom/meta/exception.yml
rename to roles/atom/meta/exception.yml
diff --git a/roles/robertdebock.atom/meta/main.yml b/roles/atom/meta/main.yml
similarity index 100%
rename from roles/robertdebock.atom/meta/main.yml
rename to roles/atom/meta/main.yml
diff --git a/roles/robertdebock.atom/meta/preferences.yml b/roles/atom/meta/preferences.yml
similarity index 100%
rename from roles/robertdebock.atom/meta/preferences.yml
rename to roles/atom/meta/preferences.yml
diff --git a/roles/robertdebock.atom/molecule/default/converge.yml b/roles/atom/molecule/default/converge.yml
similarity index 100%
rename from roles/robertdebock.atom/molecule/default/converge.yml
rename to roles/atom/molecule/default/converge.yml
diff --git a/roles/robertdebock.atom/molecule/default/molecule.yml b/roles/atom/molecule/default/molecule.yml
similarity index 100%
rename from roles/robertdebock.atom/molecule/default/molecule.yml
rename to roles/atom/molecule/default/molecule.yml
diff --git a/roles/robertdebock.atom/molecule/default/prepare.yml b/roles/atom/molecule/default/prepare.yml
similarity index 100%
rename from roles/robertdebock.atom/molecule/default/prepare.yml
rename to roles/atom/molecule/default/prepare.yml
diff --git a/roles/robertdebock.atom/molecule/default/verify.yml b/roles/atom/molecule/default/verify.yml
similarity index 100%
rename from roles/robertdebock.atom/molecule/default/verify.yml
rename to roles/atom/molecule/default/verify.yml
diff --git a/roles/robertdebock.atom/requirements.yml b/roles/atom/requirements.yml
similarity index 100%
rename from roles/robertdebock.atom/requirements.yml
rename to roles/atom/requirements.yml
diff --git a/roles/robertdebock.atom/tasks/assert.yml b/roles/atom/tasks/assert.yml
similarity index 100%
rename from roles/robertdebock.atom/tasks/assert.yml
rename to roles/atom/tasks/assert.yml
diff --git a/roles/robertdebock.atom/tasks/main.yml b/roles/atom/tasks/main.yml
similarity index 100%
rename from roles/robertdebock.atom/tasks/main.yml
rename to roles/atom/tasks/main.yml
diff --git a/roles/robertdebock.atom/tox.ini b/roles/atom/tox.ini
similarity index 100%
rename from roles/robertdebock.atom/tox.ini
rename to roles/atom/tox.ini
diff --git a/roles/robertdebock.atom/vars/main.yml b/roles/atom/vars/main.yml
similarity index 100%
rename from roles/robertdebock.atom/vars/main.yml
rename to roles/atom/vars/main.yml
diff --git a/roles/robertdebock.bootstrap/.ansible-lint b/roles/bootstrap/.ansible-lint
similarity index 100%
rename from roles/robertdebock.bootstrap/.ansible-lint
rename to roles/bootstrap/.ansible-lint
diff --git a/roles/robertdebock.bootstrap/.github/FUNDING.yml b/roles/bootstrap/.github/FUNDING.yml
similarity index 100%
rename from roles/robertdebock.bootstrap/.github/FUNDING.yml
rename to roles/bootstrap/.github/FUNDING.yml
diff --git a/roles/robertdebock.bootstrap/.github/ISSUE_TEMPLATE/bug_report.md b/roles/bootstrap/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 100%
rename from roles/robertdebock.bootstrap/.github/ISSUE_TEMPLATE/bug_report.md
rename to roles/bootstrap/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/roles/robertdebock.bootstrap/.github/ISSUE_TEMPLATE/feature_request.md b/roles/bootstrap/.github/ISSUE_TEMPLATE/feature_request.md
similarity index 100%
rename from roles/robertdebock.bootstrap/.github/ISSUE_TEMPLATE/feature_request.md
rename to roles/bootstrap/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/roles/robertdebock.bootstrap/.github/pull_request_template.md b/roles/bootstrap/.github/pull_request_template.md
similarity index 100%
rename from roles/robertdebock.bootstrap/.github/pull_request_template.md
rename to roles/bootstrap/.github/pull_request_template.md
diff --git a/roles/robertdebock.bootstrap/.github/settings.yml b/roles/bootstrap/.github/settings.yml
similarity index 100%
rename from roles/robertdebock.bootstrap/.github/settings.yml
rename to roles/bootstrap/.github/settings.yml
diff --git a/roles/robertdebock.bootstrap/.github/workflows/galaxy.yml b/roles/bootstrap/.github/workflows/galaxy.yml
similarity index 100%
rename from roles/robertdebock.bootstrap/.github/workflows/galaxy.yml
rename to roles/bootstrap/.github/workflows/galaxy.yml
diff --git a/roles/robertdebock.bootstrap/.github/workflows/molecule.yml b/roles/bootstrap/.github/workflows/molecule.yml
similarity index 100%
rename from roles/robertdebock.bootstrap/.github/workflows/molecule.yml
rename to roles/bootstrap/.github/workflows/molecule.yml
diff --git a/roles/robertdebock.bootstrap/.gitignore b/roles/bootstrap/.gitignore
similarity index 100%
rename from roles/robertdebock.bootstrap/.gitignore
rename to roles/bootstrap/.gitignore
diff --git a/roles/robertdebock.bootstrap/.travis.yml b/roles/bootstrap/.travis.yml
similarity index 100%
rename from roles/robertdebock.bootstrap/.travis.yml
rename to roles/bootstrap/.travis.yml
diff --git a/roles/robertdebock.bootstrap/.yamllint b/roles/bootstrap/.yamllint
similarity index 100%
rename from roles/robertdebock.bootstrap/.yamllint
rename to roles/bootstrap/.yamllint
diff --git a/roles/robertdebock.bootstrap/CODE_OF_CONDUCT.md b/roles/bootstrap/CODE_OF_CONDUCT.md
similarity index 100%
rename from roles/robertdebock.bootstrap/CODE_OF_CONDUCT.md
rename to roles/bootstrap/CODE_OF_CONDUCT.md
diff --git a/roles/robertdebock.bootstrap/CONTRIBUTING.md b/roles/bootstrap/CONTRIBUTING.md
similarity index 100%
rename from roles/robertdebock.bootstrap/CONTRIBUTING.md
rename to roles/bootstrap/CONTRIBUTING.md
diff --git a/roles/robertdebock.bootstrap/LICENSE b/roles/bootstrap/LICENSE
similarity index 100%
rename from roles/robertdebock.bootstrap/LICENSE
rename to roles/bootstrap/LICENSE
diff --git a/roles/robertdebock.bootstrap/README.md b/roles/bootstrap/README.md
similarity index 100%
rename from roles/robertdebock.bootstrap/README.md
rename to roles/bootstrap/README.md
diff --git a/roles/robertdebock.bootstrap/SECURITY.md b/roles/bootstrap/SECURITY.md
similarity index 100%
rename from roles/robertdebock.bootstrap/SECURITY.md
rename to roles/bootstrap/SECURITY.md
diff --git a/roles/robertdebock.bootstrap/defaults/main.yml b/roles/bootstrap/defaults/main.yml
similarity index 100%
rename from roles/robertdebock.bootstrap/defaults/main.yml
rename to roles/bootstrap/defaults/main.yml
diff --git a/roles/bootstrap/meta/.galaxy_install_info b/roles/bootstrap/meta/.galaxy_install_info
new file mode 100644
index 0000000..7ed929e
--- /dev/null
+++ b/roles/bootstrap/meta/.galaxy_install_info
@@ -0,0 +1,2 @@
+install_date: Mon Sep 28 13:22:02 2020
+version: 4.2.7
diff --git a/roles/robertdebock.bootstrap/meta/main.yml b/roles/bootstrap/meta/main.yml
similarity index 100%
rename from roles/robertdebock.bootstrap/meta/main.yml
rename to roles/bootstrap/meta/main.yml
diff --git a/roles/robertdebock.bootstrap/meta/preferences.yml b/roles/bootstrap/meta/preferences.yml
similarity index 100%
rename from roles/robertdebock.bootstrap/meta/preferences.yml
rename to roles/bootstrap/meta/preferences.yml
diff --git a/roles/robertdebock.bootstrap/molecule/default/converge.yml b/roles/bootstrap/molecule/default/converge.yml
similarity index 100%
rename from roles/robertdebock.bootstrap/molecule/default/converge.yml
rename to roles/bootstrap/molecule/default/converge.yml
diff --git a/roles/robertdebock.bootstrap/molecule/default/molecule.yml b/roles/bootstrap/molecule/default/molecule.yml
similarity index 100%
rename from roles/robertdebock.bootstrap/molecule/default/molecule.yml
rename to roles/bootstrap/molecule/default/molecule.yml
diff --git a/roles/robertdebock.bootstrap/molecule/default/verify.yml b/roles/bootstrap/molecule/default/verify.yml
similarity index 100%
rename from roles/robertdebock.bootstrap/molecule/default/verify.yml
rename to roles/bootstrap/molecule/default/verify.yml
diff --git a/roles/robertdebock.bootstrap/tasks/assert.yml b/roles/bootstrap/tasks/assert.yml
similarity index 100%
rename from roles/robertdebock.bootstrap/tasks/assert.yml
rename to roles/bootstrap/tasks/assert.yml
diff --git a/roles/robertdebock.bootstrap/tasks/gather_facts.yml b/roles/bootstrap/tasks/gather_facts.yml
similarity index 100%
rename from roles/robertdebock.bootstrap/tasks/gather_facts.yml
rename to roles/bootstrap/tasks/gather_facts.yml
diff --git a/roles/robertdebock.bootstrap/tasks/main.yml b/roles/bootstrap/tasks/main.yml
similarity index 100%
rename from roles/robertdebock.bootstrap/tasks/main.yml
rename to roles/bootstrap/tasks/main.yml
diff --git a/roles/robertdebock.bootstrap/tox.ini b/roles/bootstrap/tox.ini
similarity index 100%
rename from roles/robertdebock.bootstrap/tox.ini
rename to roles/bootstrap/tox.ini
diff --git a/roles/robertdebock.bootstrap/vars/main.yml b/roles/bootstrap/vars/main.yml
similarity index 100%
rename from roles/robertdebock.bootstrap/vars/main.yml
rename to roles/bootstrap/vars/main.yml
diff --git a/roles/robertdebock.buildtools/.ansible-lint b/roles/buildtools/.ansible-lint
similarity index 100%
rename from roles/robertdebock.buildtools/.ansible-lint
rename to roles/buildtools/.ansible-lint
diff --git a/roles/robertdebock.buildtools/.github/FUNDING.yml b/roles/buildtools/.github/FUNDING.yml
similarity index 100%
rename from roles/robertdebock.buildtools/.github/FUNDING.yml
rename to roles/buildtools/.github/FUNDING.yml
diff --git a/roles/robertdebock.buildtools/.github/ISSUE_TEMPLATE/bug_report.md b/roles/buildtools/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 100%
rename from roles/robertdebock.buildtools/.github/ISSUE_TEMPLATE/bug_report.md
rename to roles/buildtools/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/roles/robertdebock.buildtools/.github/ISSUE_TEMPLATE/feature_request.md b/roles/buildtools/.github/ISSUE_TEMPLATE/feature_request.md
similarity index 100%
rename from roles/robertdebock.buildtools/.github/ISSUE_TEMPLATE/feature_request.md
rename to roles/buildtools/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/roles/robertdebock.buildtools/.github/pull_request_template.md b/roles/buildtools/.github/pull_request_template.md
similarity index 100%
rename from roles/robertdebock.buildtools/.github/pull_request_template.md
rename to roles/buildtools/.github/pull_request_template.md
diff --git a/roles/robertdebock.buildtools/.github/settings.yml b/roles/buildtools/.github/settings.yml
similarity index 100%
rename from roles/robertdebock.buildtools/.github/settings.yml
rename to roles/buildtools/.github/settings.yml
diff --git a/roles/robertdebock.buildtools/.github/workflows/galaxy.yml b/roles/buildtools/.github/workflows/galaxy.yml
similarity index 100%
rename from roles/robertdebock.buildtools/.github/workflows/galaxy.yml
rename to roles/buildtools/.github/workflows/galaxy.yml
diff --git a/roles/robertdebock.buildtools/.github/workflows/molecule.yml b/roles/buildtools/.github/workflows/molecule.yml
similarity index 100%
rename from roles/robertdebock.buildtools/.github/workflows/molecule.yml
rename to roles/buildtools/.github/workflows/molecule.yml
diff --git a/roles/robertdebock.buildtools/.gitignore b/roles/buildtools/.gitignore
similarity index 100%
rename from roles/robertdebock.buildtools/.gitignore
rename to roles/buildtools/.gitignore
diff --git a/roles/robertdebock.buildtools/.travis.yml b/roles/buildtools/.travis.yml
similarity index 100%
rename from roles/robertdebock.buildtools/.travis.yml
rename to roles/buildtools/.travis.yml
diff --git a/roles/robertdebock.buildtools/.yamllint b/roles/buildtools/.yamllint
similarity index 100%
rename from roles/robertdebock.buildtools/.yamllint
rename to roles/buildtools/.yamllint
diff --git a/roles/robertdebock.buildtools/CODE_OF_CONDUCT.md b/roles/buildtools/CODE_OF_CONDUCT.md
similarity index 100%
rename from roles/robertdebock.buildtools/CODE_OF_CONDUCT.md
rename to roles/buildtools/CODE_OF_CONDUCT.md
diff --git a/roles/robertdebock.buildtools/CONTRIBUTING.md b/roles/buildtools/CONTRIBUTING.md
similarity index 100%
rename from roles/robertdebock.buildtools/CONTRIBUTING.md
rename to roles/buildtools/CONTRIBUTING.md
diff --git a/roles/robertdebock.buildtools/LICENSE b/roles/buildtools/LICENSE
similarity index 100%
rename from roles/robertdebock.buildtools/LICENSE
rename to roles/buildtools/LICENSE
diff --git a/roles/robertdebock.buildtools/README.md b/roles/buildtools/README.md
similarity index 100%
rename from roles/robertdebock.buildtools/README.md
rename to roles/buildtools/README.md
diff --git a/roles/robertdebock.buildtools/SECURITY.md b/roles/buildtools/SECURITY.md
similarity index 100%
rename from roles/robertdebock.buildtools/SECURITY.md
rename to roles/buildtools/SECURITY.md
diff --git a/roles/buildtools/meta/.galaxy_install_info b/roles/buildtools/meta/.galaxy_install_info
new file mode 100644
index 0000000..1e3aaeb
--- /dev/null
+++ b/roles/buildtools/meta/.galaxy_install_info
@@ -0,0 +1,2 @@
+install_date: Mon Sep 28 13:22:05 2020
+version: 2.4.15
diff --git a/roles/robertdebock.buildtools/meta/exception.yml b/roles/buildtools/meta/exception.yml
similarity index 100%
rename from roles/robertdebock.buildtools/meta/exception.yml
rename to roles/buildtools/meta/exception.yml
diff --git a/roles/robertdebock.buildtools/meta/main.yml b/roles/buildtools/meta/main.yml
similarity index 100%
rename from roles/robertdebock.buildtools/meta/main.yml
rename to roles/buildtools/meta/main.yml
diff --git a/roles/robertdebock.buildtools/meta/preferences.yml b/roles/buildtools/meta/preferences.yml
similarity index 100%
rename from roles/robertdebock.buildtools/meta/preferences.yml
rename to roles/buildtools/meta/preferences.yml
diff --git a/roles/robertdebock.buildtools/molecule/default/converge.yml b/roles/buildtools/molecule/default/converge.yml
similarity index 100%
rename from roles/robertdebock.buildtools/molecule/default/converge.yml
rename to roles/buildtools/molecule/default/converge.yml
diff --git a/roles/robertdebock.buildtools/molecule/default/molecule.yml b/roles/buildtools/molecule/default/molecule.yml
similarity index 100%
rename from roles/robertdebock.buildtools/molecule/default/molecule.yml
rename to roles/buildtools/molecule/default/molecule.yml
diff --git a/roles/robertdebock.buildtools/molecule/default/prepare.yml b/roles/buildtools/molecule/default/prepare.yml
similarity index 100%
rename from roles/robertdebock.buildtools/molecule/default/prepare.yml
rename to roles/buildtools/molecule/default/prepare.yml
diff --git a/roles/robertdebock.buildtools/molecule/default/verify.yml b/roles/buildtools/molecule/default/verify.yml
similarity index 100%
rename from roles/robertdebock.buildtools/molecule/default/verify.yml
rename to roles/buildtools/molecule/default/verify.yml
diff --git a/roles/robertdebock.buildtools/requirements.yml b/roles/buildtools/requirements.yml
similarity index 100%
rename from roles/robertdebock.buildtools/requirements.yml
rename to roles/buildtools/requirements.yml
diff --git a/roles/robertdebock.buildtools/tasks/main.yml b/roles/buildtools/tasks/main.yml
similarity index 100%
rename from roles/robertdebock.buildtools/tasks/main.yml
rename to roles/buildtools/tasks/main.yml
diff --git a/roles/robertdebock.buildtools/tox.ini b/roles/buildtools/tox.ini
similarity index 100%
rename from roles/robertdebock.buildtools/tox.ini
rename to roles/buildtools/tox.ini
diff --git a/roles/robertdebock.buildtools/vars/main.yml b/roles/buildtools/vars/main.yml
similarity index 100%
rename from roles/robertdebock.buildtools/vars/main.yml
rename to roles/buildtools/vars/main.yml
diff --git a/roles/robertdebock.common/.ansible-lint b/roles/common/.ansible-lint
similarity index 100%
rename from roles/robertdebock.common/.ansible-lint
rename to roles/common/.ansible-lint
diff --git a/roles/robertdebock.common/.github/FUNDING.yml b/roles/common/.github/FUNDING.yml
similarity index 100%
rename from roles/robertdebock.common/.github/FUNDING.yml
rename to roles/common/.github/FUNDING.yml
diff --git a/roles/robertdebock.common/.github/ISSUE_TEMPLATE/bug_report.md b/roles/common/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 100%
rename from roles/robertdebock.common/.github/ISSUE_TEMPLATE/bug_report.md
rename to roles/common/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/roles/robertdebock.common/.github/ISSUE_TEMPLATE/feature_request.md b/roles/common/.github/ISSUE_TEMPLATE/feature_request.md
similarity index 100%
rename from roles/robertdebock.common/.github/ISSUE_TEMPLATE/feature_request.md
rename to roles/common/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/roles/robertdebock.common/.github/pull_request_template.md b/roles/common/.github/pull_request_template.md
similarity index 100%
rename from roles/robertdebock.common/.github/pull_request_template.md
rename to roles/common/.github/pull_request_template.md
diff --git a/roles/robertdebock.common/.github/settings.yml b/roles/common/.github/settings.yml
similarity index 100%
rename from roles/robertdebock.common/.github/settings.yml
rename to roles/common/.github/settings.yml
diff --git a/roles/robertdebock.common/.github/workflows/galaxy.yml b/roles/common/.github/workflows/galaxy.yml
similarity index 100%
rename from roles/robertdebock.common/.github/workflows/galaxy.yml
rename to roles/common/.github/workflows/galaxy.yml
diff --git a/roles/robertdebock.common/.github/workflows/molecule.yml b/roles/common/.github/workflows/molecule.yml
similarity index 100%
rename from roles/robertdebock.common/.github/workflows/molecule.yml
rename to roles/common/.github/workflows/molecule.yml
diff --git a/roles/robertdebock.common/.gitignore b/roles/common/.gitignore
similarity index 100%
rename from roles/robertdebock.common/.gitignore
rename to roles/common/.gitignore
diff --git a/roles/robertdebock.common/.travis.yml b/roles/common/.travis.yml
similarity index 100%
rename from roles/robertdebock.common/.travis.yml
rename to roles/common/.travis.yml
diff --git a/roles/robertdebock.common/.yamllint b/roles/common/.yamllint
similarity index 100%
rename from roles/robertdebock.common/.yamllint
rename to roles/common/.yamllint
diff --git a/roles/robertdebock.common/CODE_OF_CONDUCT.md b/roles/common/CODE_OF_CONDUCT.md
similarity index 100%
rename from roles/robertdebock.common/CODE_OF_CONDUCT.md
rename to roles/common/CODE_OF_CONDUCT.md
diff --git a/roles/robertdebock.common/CONTRIBUTING.md b/roles/common/CONTRIBUTING.md
similarity index 100%
rename from roles/robertdebock.common/CONTRIBUTING.md
rename to roles/common/CONTRIBUTING.md
diff --git a/roles/robertdebock.common/INSTALL.md b/roles/common/INSTALL.md
similarity index 100%
rename from roles/robertdebock.common/INSTALL.md
rename to roles/common/INSTALL.md
diff --git a/roles/robertdebock.common/LICENSE b/roles/common/LICENSE
similarity index 100%
rename from roles/robertdebock.common/LICENSE
rename to roles/common/LICENSE
diff --git a/roles/robertdebock.common/README.md b/roles/common/README.md
similarity index 100%
rename from roles/robertdebock.common/README.md
rename to roles/common/README.md
diff --git a/roles/robertdebock.common/SECURITY.md b/roles/common/SECURITY.md
similarity index 100%
rename from roles/robertdebock.common/SECURITY.md
rename to roles/common/SECURITY.md
diff --git a/roles/robertdebock.common/defaults/main.yml b/roles/common/defaults/main.yml
similarity index 100%
rename from roles/robertdebock.common/defaults/main.yml
rename to roles/common/defaults/main.yml
diff --git a/roles/robertdebock.common/handlers/main.yml b/roles/common/handlers/main.yml
similarity index 100%
rename from roles/robertdebock.common/handlers/main.yml
rename to roles/common/handlers/main.yml
diff --git a/roles/common/meta/.galaxy_install_info b/roles/common/meta/.galaxy_install_info
new file mode 100644
index 0000000..eccc7b2
--- /dev/null
+++ b/roles/common/meta/.galaxy_install_info
@@ -0,0 +1,2 @@
+install_date: Mon Sep 28 13:22:08 2020
+version: 3.3.4
diff --git a/roles/robertdebock.common/meta/exception.yml b/roles/common/meta/exception.yml
similarity index 100%
rename from roles/robertdebock.common/meta/exception.yml
rename to roles/common/meta/exception.yml
diff --git a/roles/robertdebock.common/meta/main.yml b/roles/common/meta/main.yml
similarity index 100%
rename from roles/robertdebock.common/meta/main.yml
rename to roles/common/meta/main.yml
diff --git a/roles/robertdebock.common/meta/preferences.yml b/roles/common/meta/preferences.yml
similarity index 100%
rename from roles/robertdebock.common/meta/preferences.yml
rename to roles/common/meta/preferences.yml
diff --git a/roles/robertdebock.common/molecule/default/converge.yml b/roles/common/molecule/default/converge.yml
similarity index 100%
rename from roles/robertdebock.common/molecule/default/converge.yml
rename to roles/common/molecule/default/converge.yml
diff --git a/roles/robertdebock.common/molecule/default/molecule.yml b/roles/common/molecule/default/molecule.yml
similarity index 100%
rename from roles/robertdebock.common/molecule/default/molecule.yml
rename to roles/common/molecule/default/molecule.yml
diff --git a/roles/robertdebock.common/molecule/default/prepare.yml b/roles/common/molecule/default/prepare.yml
similarity index 100%
rename from roles/robertdebock.common/molecule/default/prepare.yml
rename to roles/common/molecule/default/prepare.yml
diff --git a/roles/robertdebock.common/molecule/default/verify.yml b/roles/common/molecule/default/verify.yml
similarity index 100%
rename from roles/robertdebock.common/molecule/default/verify.yml
rename to roles/common/molecule/default/verify.yml
diff --git a/roles/robertdebock.common/requirements.yml b/roles/common/requirements.yml
similarity index 100%
rename from roles/robertdebock.common/requirements.yml
rename to roles/common/requirements.yml
diff --git a/roles/robertdebock.common/tasks/assert.yml b/roles/common/tasks/assert.yml
similarity index 100%
rename from roles/robertdebock.common/tasks/assert.yml
rename to roles/common/tasks/assert.yml
diff --git a/roles/robertdebock.common/tasks/main.yml b/roles/common/tasks/main.yml
similarity index 100%
rename from roles/robertdebock.common/tasks/main.yml
rename to roles/common/tasks/main.yml
diff --git a/roles/robertdebock.common/templates/.gitkeep b/roles/common/templates/.gitkeep
similarity index 100%
rename from roles/robertdebock.common/templates/.gitkeep
rename to roles/common/templates/.gitkeep
diff --git a/roles/robertdebock.common/templates/hosts.j2 b/roles/common/templates/hosts.j2
similarity index 100%
rename from roles/robertdebock.common/templates/hosts.j2
rename to roles/common/templates/hosts.j2
diff --git a/roles/robertdebock.common/tox.ini b/roles/common/tox.ini
similarity index 100%
rename from roles/robertdebock.common/tox.ini
rename to roles/common/tox.ini
diff --git a/roles/robertdebock.common/vars/main.yml b/roles/common/vars/main.yml
similarity index 100%
rename from roles/robertdebock.common/vars/main.yml
rename to roles/common/vars/main.yml
diff --git a/roles/robertdebock.docker/.ansible-lint b/roles/docker/.ansible-lint
similarity index 100%
rename from roles/robertdebock.docker/.ansible-lint
rename to roles/docker/.ansible-lint
diff --git a/roles/robertdebock.docker/.github/FUNDING.yml b/roles/docker/.github/FUNDING.yml
similarity index 100%
rename from roles/robertdebock.docker/.github/FUNDING.yml
rename to roles/docker/.github/FUNDING.yml
diff --git a/roles/robertdebock.docker/.github/ISSUE_TEMPLATE/bug_report.md b/roles/docker/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 100%
rename from roles/robertdebock.docker/.github/ISSUE_TEMPLATE/bug_report.md
rename to roles/docker/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/roles/robertdebock.docker/.github/ISSUE_TEMPLATE/feature_request.md b/roles/docker/.github/ISSUE_TEMPLATE/feature_request.md
similarity index 100%
rename from roles/robertdebock.docker/.github/ISSUE_TEMPLATE/feature_request.md
rename to roles/docker/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/roles/robertdebock.docker/.github/pull_request_template.md b/roles/docker/.github/pull_request_template.md
similarity index 100%
rename from roles/robertdebock.docker/.github/pull_request_template.md
rename to roles/docker/.github/pull_request_template.md
diff --git a/roles/robertdebock.docker/.github/settings.yml b/roles/docker/.github/settings.yml
similarity index 100%
rename from roles/robertdebock.docker/.github/settings.yml
rename to roles/docker/.github/settings.yml
diff --git a/roles/robertdebock.docker/.github/workflows/galaxy.yml b/roles/docker/.github/workflows/galaxy.yml
similarity index 100%
rename from roles/robertdebock.docker/.github/workflows/galaxy.yml
rename to roles/docker/.github/workflows/galaxy.yml
diff --git a/roles/robertdebock.docker/.github/workflows/molecule.yml b/roles/docker/.github/workflows/molecule.yml
similarity index 100%
rename from roles/robertdebock.docker/.github/workflows/molecule.yml
rename to roles/docker/.github/workflows/molecule.yml
diff --git a/roles/robertdebock.docker/.gitignore b/roles/docker/.gitignore
similarity index 100%
rename from roles/robertdebock.docker/.gitignore
rename to roles/docker/.gitignore
diff --git a/roles/robertdebock.docker/.travis.yml b/roles/docker/.travis.yml
similarity index 100%
rename from roles/robertdebock.docker/.travis.yml
rename to roles/docker/.travis.yml
diff --git a/roles/robertdebock.docker/.yamllint b/roles/docker/.yamllint
similarity index 100%
rename from roles/robertdebock.docker/.yamllint
rename to roles/docker/.yamllint
diff --git a/roles/robertdebock.docker/CODE_OF_CONDUCT.md b/roles/docker/CODE_OF_CONDUCT.md
similarity index 100%
rename from roles/robertdebock.docker/CODE_OF_CONDUCT.md
rename to roles/docker/CODE_OF_CONDUCT.md
diff --git a/roles/robertdebock.docker/CONTRIBUTING.md b/roles/docker/CONTRIBUTING.md
similarity index 100%
rename from roles/robertdebock.docker/CONTRIBUTING.md
rename to roles/docker/CONTRIBUTING.md
diff --git a/roles/robertdebock.docker/LICENSE b/roles/docker/LICENSE
similarity index 100%
rename from roles/robertdebock.docker/LICENSE
rename to roles/docker/LICENSE
diff --git a/roles/robertdebock.docker/README.md b/roles/docker/README.md
similarity index 100%
rename from roles/robertdebock.docker/README.md
rename to roles/docker/README.md
diff --git a/roles/robertdebock.docker/SECURITY.md b/roles/docker/SECURITY.md
similarity index 100%
rename from roles/robertdebock.docker/SECURITY.md
rename to roles/docker/SECURITY.md
diff --git a/roles/robertdebock.docker/handlers/main.yml b/roles/docker/handlers/main.yml
similarity index 100%
rename from roles/robertdebock.docker/handlers/main.yml
rename to roles/docker/handlers/main.yml
diff --git a/roles/docker/meta/.galaxy_install_info b/roles/docker/meta/.galaxy_install_info
new file mode 100644
index 0000000..4c66e62
--- /dev/null
+++ b/roles/docker/meta/.galaxy_install_info
@@ -0,0 +1,2 @@
+install_date: Mon Sep 28 13:22:11 2020
+version: 2.4.3
diff --git a/roles/robertdebock.docker/meta/exception.yml b/roles/docker/meta/exception.yml
similarity index 100%
rename from roles/robertdebock.docker/meta/exception.yml
rename to roles/docker/meta/exception.yml
diff --git a/roles/robertdebock.docker/meta/main.yml b/roles/docker/meta/main.yml
similarity index 100%
rename from roles/robertdebock.docker/meta/main.yml
rename to roles/docker/meta/main.yml
diff --git a/roles/robertdebock.docker/meta/preferences.yml b/roles/docker/meta/preferences.yml
similarity index 100%
rename from roles/robertdebock.docker/meta/preferences.yml
rename to roles/docker/meta/preferences.yml
diff --git a/roles/robertdebock.docker/molecule/default/converge.yml b/roles/docker/molecule/default/converge.yml
similarity index 100%
rename from roles/robertdebock.docker/molecule/default/converge.yml
rename to roles/docker/molecule/default/converge.yml
diff --git a/roles/robertdebock.docker/molecule/default/molecule.yml b/roles/docker/molecule/default/molecule.yml
similarity index 100%
rename from roles/robertdebock.docker/molecule/default/molecule.yml
rename to roles/docker/molecule/default/molecule.yml
diff --git a/roles/robertdebock.docker/molecule/default/prepare.yml b/roles/docker/molecule/default/prepare.yml
similarity index 100%
rename from roles/robertdebock.docker/molecule/default/prepare.yml
rename to roles/docker/molecule/default/prepare.yml
diff --git a/roles/robertdebock.docker/molecule/default/verify.yml b/roles/docker/molecule/default/verify.yml
similarity index 100%
rename from roles/robertdebock.docker/molecule/default/verify.yml
rename to roles/docker/molecule/default/verify.yml
diff --git a/roles/robertdebock.docker/requirements.yml b/roles/docker/requirements.yml
similarity index 100%
rename from roles/robertdebock.docker/requirements.yml
rename to roles/docker/requirements.yml
diff --git a/roles/robertdebock.docker/tasks/main.yml b/roles/docker/tasks/main.yml
similarity index 100%
rename from roles/robertdebock.docker/tasks/main.yml
rename to roles/docker/tasks/main.yml
diff --git a/roles/robertdebock.docker/tox.ini b/roles/docker/tox.ini
similarity index 100%
rename from roles/robertdebock.docker/tox.ini
rename to roles/docker/tox.ini
diff --git a/roles/robertdebock.docker/vars/main.yml b/roles/docker/vars/main.yml
similarity index 100%
rename from roles/robertdebock.docker/vars/main.yml
rename to roles/docker/vars/main.yml
diff --git a/roles/robertdebock.epel/.ansible-lint b/roles/epel/.ansible-lint
similarity index 100%
rename from roles/robertdebock.epel/.ansible-lint
rename to roles/epel/.ansible-lint
diff --git a/roles/robertdebock.epel/.github/FUNDING.yml b/roles/epel/.github/FUNDING.yml
similarity index 100%
rename from roles/robertdebock.epel/.github/FUNDING.yml
rename to roles/epel/.github/FUNDING.yml
diff --git a/roles/robertdebock.epel/.github/ISSUE_TEMPLATE/bug_report.md b/roles/epel/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 100%
rename from roles/robertdebock.epel/.github/ISSUE_TEMPLATE/bug_report.md
rename to roles/epel/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/roles/robertdebock.epel/.github/ISSUE_TEMPLATE/feature_request.md b/roles/epel/.github/ISSUE_TEMPLATE/feature_request.md
similarity index 100%
rename from roles/robertdebock.epel/.github/ISSUE_TEMPLATE/feature_request.md
rename to roles/epel/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/roles/robertdebock.epel/.github/pull_request_template.md b/roles/epel/.github/pull_request_template.md
similarity index 100%
rename from roles/robertdebock.epel/.github/pull_request_template.md
rename to roles/epel/.github/pull_request_template.md
diff --git a/roles/robertdebock.epel/.github/settings.yml b/roles/epel/.github/settings.yml
similarity index 100%
rename from roles/robertdebock.epel/.github/settings.yml
rename to roles/epel/.github/settings.yml
diff --git a/roles/robertdebock.epel/.github/workflows/galaxy.yml b/roles/epel/.github/workflows/galaxy.yml
similarity index 100%
rename from roles/robertdebock.epel/.github/workflows/galaxy.yml
rename to roles/epel/.github/workflows/galaxy.yml
diff --git a/roles/robertdebock.epel/.github/workflows/molecule.yml b/roles/epel/.github/workflows/molecule.yml
similarity index 100%
rename from roles/robertdebock.epel/.github/workflows/molecule.yml
rename to roles/epel/.github/workflows/molecule.yml
diff --git a/roles/robertdebock.epel/.gitignore b/roles/epel/.gitignore
similarity index 100%
rename from roles/robertdebock.epel/.gitignore
rename to roles/epel/.gitignore
diff --git a/roles/robertdebock.epel/.travis.yml b/roles/epel/.travis.yml
similarity index 100%
rename from roles/robertdebock.epel/.travis.yml
rename to roles/epel/.travis.yml
diff --git a/roles/robertdebock.epel/.yamllint b/roles/epel/.yamllint
similarity index 100%
rename from roles/robertdebock.epel/.yamllint
rename to roles/epel/.yamllint
diff --git a/roles/robertdebock.epel/CODE_OF_CONDUCT.md b/roles/epel/CODE_OF_CONDUCT.md
similarity index 100%
rename from roles/robertdebock.epel/CODE_OF_CONDUCT.md
rename to roles/epel/CODE_OF_CONDUCT.md
diff --git a/roles/robertdebock.epel/CONTRIBUTING.md b/roles/epel/CONTRIBUTING.md
similarity index 100%
rename from roles/robertdebock.epel/CONTRIBUTING.md
rename to roles/epel/CONTRIBUTING.md
diff --git a/roles/robertdebock.epel/LICENSE b/roles/epel/LICENSE
similarity index 100%
rename from roles/robertdebock.epel/LICENSE
rename to roles/epel/LICENSE
diff --git a/roles/robertdebock.epel/README.md b/roles/epel/README.md
similarity index 100%
rename from roles/robertdebock.epel/README.md
rename to roles/epel/README.md
diff --git a/roles/robertdebock.epel/SECURITY.md b/roles/epel/SECURITY.md
similarity index 100%
rename from roles/robertdebock.epel/SECURITY.md
rename to roles/epel/SECURITY.md
diff --git a/roles/robertdebock.epel/handlers/main.yml b/roles/epel/handlers/main.yml
similarity index 100%
rename from roles/robertdebock.epel/handlers/main.yml
rename to roles/epel/handlers/main.yml
diff --git a/roles/epel/meta/.galaxy_install_info b/roles/epel/meta/.galaxy_install_info
new file mode 100644
index 0000000..b49dbf2
--- /dev/null
+++ b/roles/epel/meta/.galaxy_install_info
@@ -0,0 +1,2 @@
+install_date: Mon Sep 28 13:22:15 2020
+version: 2.5.1
diff --git a/roles/robertdebock.epel/meta/main.yml b/roles/epel/meta/main.yml
similarity index 100%
rename from roles/robertdebock.epel/meta/main.yml
rename to roles/epel/meta/main.yml
diff --git a/roles/robertdebock.epel/meta/preferences.yml b/roles/epel/meta/preferences.yml
similarity index 100%
rename from roles/robertdebock.epel/meta/preferences.yml
rename to roles/epel/meta/preferences.yml
diff --git a/roles/robertdebock.epel/molecule/default/converge.yml b/roles/epel/molecule/default/converge.yml
similarity index 100%
rename from roles/robertdebock.epel/molecule/default/converge.yml
rename to roles/epel/molecule/default/converge.yml
diff --git a/roles/robertdebock.epel/molecule/default/molecule.yml b/roles/epel/molecule/default/molecule.yml
similarity index 100%
rename from roles/robertdebock.epel/molecule/default/molecule.yml
rename to roles/epel/molecule/default/molecule.yml
diff --git a/roles/robertdebock.epel/molecule/default/prepare.yml b/roles/epel/molecule/default/prepare.yml
similarity index 100%
rename from roles/robertdebock.epel/molecule/default/prepare.yml
rename to roles/epel/molecule/default/prepare.yml
diff --git a/roles/robertdebock.epel/molecule/default/verify.yml b/roles/epel/molecule/default/verify.yml
similarity index 100%
rename from roles/robertdebock.epel/molecule/default/verify.yml
rename to roles/epel/molecule/default/verify.yml
diff --git a/roles/robertdebock.epel/requirements.yml b/roles/epel/requirements.yml
similarity index 100%
rename from roles/robertdebock.epel/requirements.yml
rename to roles/epel/requirements.yml
diff --git a/roles/robertdebock.epel/tasks/main.yml b/roles/epel/tasks/main.yml
similarity index 100%
rename from roles/robertdebock.epel/tasks/main.yml
rename to roles/epel/tasks/main.yml
diff --git a/roles/robertdebock.epel/tox.ini b/roles/epel/tox.ini
similarity index 100%
rename from roles/robertdebock.epel/tox.ini
rename to roles/epel/tox.ini
diff --git a/roles/robertdebock.epel/vars/main.yml b/roles/epel/vars/main.yml
similarity index 100%
rename from roles/robertdebock.epel/vars/main.yml
rename to roles/epel/vars/main.yml
diff --git a/roles/robertdebock.fail2ban/.ansible-lint b/roles/fail2ban/.ansible-lint
similarity index 100%
rename from roles/robertdebock.fail2ban/.ansible-lint
rename to roles/fail2ban/.ansible-lint
diff --git a/roles/robertdebock.fail2ban/.github/FUNDING.yml b/roles/fail2ban/.github/FUNDING.yml
similarity index 100%
rename from roles/robertdebock.fail2ban/.github/FUNDING.yml
rename to roles/fail2ban/.github/FUNDING.yml
diff --git a/roles/robertdebock.fail2ban/.github/ISSUE_TEMPLATE/bug_report.md b/roles/fail2ban/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 100%
rename from roles/robertdebock.fail2ban/.github/ISSUE_TEMPLATE/bug_report.md
rename to roles/fail2ban/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/roles/robertdebock.fail2ban/.github/ISSUE_TEMPLATE/feature_request.md b/roles/fail2ban/.github/ISSUE_TEMPLATE/feature_request.md
similarity index 100%
rename from roles/robertdebock.fail2ban/.github/ISSUE_TEMPLATE/feature_request.md
rename to roles/fail2ban/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/roles/robertdebock.fail2ban/.github/pull_request_template.md b/roles/fail2ban/.github/pull_request_template.md
similarity index 100%
rename from roles/robertdebock.fail2ban/.github/pull_request_template.md
rename to roles/fail2ban/.github/pull_request_template.md
diff --git a/roles/robertdebock.fail2ban/.github/settings.yml b/roles/fail2ban/.github/settings.yml
similarity index 100%
rename from roles/robertdebock.fail2ban/.github/settings.yml
rename to roles/fail2ban/.github/settings.yml
diff --git a/roles/robertdebock.fail2ban/.github/workflows/galaxy.yml b/roles/fail2ban/.github/workflows/galaxy.yml
similarity index 100%
rename from roles/robertdebock.fail2ban/.github/workflows/galaxy.yml
rename to roles/fail2ban/.github/workflows/galaxy.yml
diff --git a/roles/robertdebock.fail2ban/.github/workflows/molecule.yml b/roles/fail2ban/.github/workflows/molecule.yml
similarity index 100%
rename from roles/robertdebock.fail2ban/.github/workflows/molecule.yml
rename to roles/fail2ban/.github/workflows/molecule.yml
diff --git a/roles/robertdebock.fail2ban/.gitignore b/roles/fail2ban/.gitignore
similarity index 100%
rename from roles/robertdebock.fail2ban/.gitignore
rename to roles/fail2ban/.gitignore
diff --git a/roles/robertdebock.fail2ban/.travis.yml b/roles/fail2ban/.travis.yml
similarity index 100%
rename from roles/robertdebock.fail2ban/.travis.yml
rename to roles/fail2ban/.travis.yml
diff --git a/roles/robertdebock.fail2ban/.yamllint b/roles/fail2ban/.yamllint
similarity index 100%
rename from roles/robertdebock.fail2ban/.yamllint
rename to roles/fail2ban/.yamllint
diff --git a/roles/robertdebock.fail2ban/CODE_OF_CONDUCT.md b/roles/fail2ban/CODE_OF_CONDUCT.md
similarity index 100%
rename from roles/robertdebock.fail2ban/CODE_OF_CONDUCT.md
rename to roles/fail2ban/CODE_OF_CONDUCT.md
diff --git a/roles/robertdebock.fail2ban/CONTRIBUTING.md b/roles/fail2ban/CONTRIBUTING.md
similarity index 100%
rename from roles/robertdebock.fail2ban/CONTRIBUTING.md
rename to roles/fail2ban/CONTRIBUTING.md
diff --git a/roles/robertdebock.fail2ban/LICENSE b/roles/fail2ban/LICENSE
similarity index 100%
rename from roles/robertdebock.fail2ban/LICENSE
rename to roles/fail2ban/LICENSE
diff --git a/roles/robertdebock.fail2ban/README.md b/roles/fail2ban/README.md
similarity index 100%
rename from roles/robertdebock.fail2ban/README.md
rename to roles/fail2ban/README.md
diff --git a/roles/robertdebock.fail2ban/SECURITY.md b/roles/fail2ban/SECURITY.md
similarity index 100%
rename from roles/robertdebock.fail2ban/SECURITY.md
rename to roles/fail2ban/SECURITY.md
diff --git a/roles/robertdebock.fail2ban/defaults/main.yml b/roles/fail2ban/defaults/main.yml
similarity index 100%
rename from roles/robertdebock.fail2ban/defaults/main.yml
rename to roles/fail2ban/defaults/main.yml
diff --git a/roles/robertdebock.fail2ban/handlers/main.yml b/roles/fail2ban/handlers/main.yml
similarity index 100%
rename from roles/robertdebock.fail2ban/handlers/main.yml
rename to roles/fail2ban/handlers/main.yml
diff --git a/roles/fail2ban/meta/.galaxy_install_info b/roles/fail2ban/meta/.galaxy_install_info
new file mode 100644
index 0000000..1e6bee8
--- /dev/null
+++ b/roles/fail2ban/meta/.galaxy_install_info
@@ -0,0 +1,2 @@
+install_date: Mon Sep 28 13:22:18 2020
+version: 3.1.4
diff --git a/roles/robertdebock.fail2ban/meta/exception.yml b/roles/fail2ban/meta/exception.yml
similarity index 100%
rename from roles/robertdebock.fail2ban/meta/exception.yml
rename to roles/fail2ban/meta/exception.yml
diff --git a/roles/robertdebock.fail2ban/meta/main.yml b/roles/fail2ban/meta/main.yml
similarity index 100%
rename from roles/robertdebock.fail2ban/meta/main.yml
rename to roles/fail2ban/meta/main.yml
diff --git a/roles/robertdebock.fail2ban/meta/preferences.yml b/roles/fail2ban/meta/preferences.yml
similarity index 100%
rename from roles/robertdebock.fail2ban/meta/preferences.yml
rename to roles/fail2ban/meta/preferences.yml
diff --git a/roles/robertdebock.fail2ban/molecule/default/converge.yml b/roles/fail2ban/molecule/default/converge.yml
similarity index 100%
rename from roles/robertdebock.fail2ban/molecule/default/converge.yml
rename to roles/fail2ban/molecule/default/converge.yml
diff --git a/roles/robertdebock.fail2ban/molecule/default/molecule.yml b/roles/fail2ban/molecule/default/molecule.yml
similarity index 100%
rename from roles/robertdebock.fail2ban/molecule/default/molecule.yml
rename to roles/fail2ban/molecule/default/molecule.yml
diff --git a/roles/robertdebock.fail2ban/molecule/default/prepare.yml b/roles/fail2ban/molecule/default/prepare.yml
similarity index 100%
rename from roles/robertdebock.fail2ban/molecule/default/prepare.yml
rename to roles/fail2ban/molecule/default/prepare.yml
diff --git a/roles/robertdebock.fail2ban/molecule/default/verify.yml b/roles/fail2ban/molecule/default/verify.yml
similarity index 100%
rename from roles/robertdebock.fail2ban/molecule/default/verify.yml
rename to roles/fail2ban/molecule/default/verify.yml
diff --git a/roles/robertdebock.fail2ban/requirements.yml b/roles/fail2ban/requirements.yml
similarity index 100%
rename from roles/robertdebock.fail2ban/requirements.yml
rename to roles/fail2ban/requirements.yml
diff --git a/roles/robertdebock.fail2ban/tasks/assert.yml b/roles/fail2ban/tasks/assert.yml
similarity index 100%
rename from roles/robertdebock.fail2ban/tasks/assert.yml
rename to roles/fail2ban/tasks/assert.yml
diff --git a/roles/robertdebock.fail2ban/tasks/main.yml b/roles/fail2ban/tasks/main.yml
similarity index 100%
rename from roles/robertdebock.fail2ban/tasks/main.yml
rename to roles/fail2ban/tasks/main.yml
diff --git a/roles/robertdebock.fail2ban/tox.ini b/roles/fail2ban/tox.ini
similarity index 100%
rename from roles/robertdebock.fail2ban/tox.ini
rename to roles/fail2ban/tox.ini
diff --git a/roles/robertdebock.fail2ban/vars/main.yml b/roles/fail2ban/vars/main.yml
similarity index 100%
rename from roles/robertdebock.fail2ban/vars/main.yml
rename to roles/fail2ban/vars/main.yml
diff --git a/roles/robertdebock.git/.ansible-lint b/roles/git/.ansible-lint
similarity index 100%
rename from roles/robertdebock.git/.ansible-lint
rename to roles/git/.ansible-lint
diff --git a/roles/robertdebock.git/.github/FUNDING.yml b/roles/git/.github/FUNDING.yml
similarity index 100%
rename from roles/robertdebock.git/.github/FUNDING.yml
rename to roles/git/.github/FUNDING.yml
diff --git a/roles/robertdebock.git/.github/ISSUE_TEMPLATE/bug_report.md b/roles/git/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 100%
rename from roles/robertdebock.git/.github/ISSUE_TEMPLATE/bug_report.md
rename to roles/git/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/roles/robertdebock.git/.github/ISSUE_TEMPLATE/feature_request.md b/roles/git/.github/ISSUE_TEMPLATE/feature_request.md
similarity index 100%
rename from roles/robertdebock.git/.github/ISSUE_TEMPLATE/feature_request.md
rename to roles/git/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/roles/robertdebock.git/.github/pull_request_template.md b/roles/git/.github/pull_request_template.md
similarity index 100%
rename from roles/robertdebock.git/.github/pull_request_template.md
rename to roles/git/.github/pull_request_template.md
diff --git a/roles/robertdebock.git/.github/settings.yml b/roles/git/.github/settings.yml
similarity index 100%
rename from roles/robertdebock.git/.github/settings.yml
rename to roles/git/.github/settings.yml
diff --git a/roles/robertdebock.git/.github/workflows/galaxy.yml b/roles/git/.github/workflows/galaxy.yml
similarity index 100%
rename from roles/robertdebock.git/.github/workflows/galaxy.yml
rename to roles/git/.github/workflows/galaxy.yml
diff --git a/roles/robertdebock.git/.github/workflows/molecule.yml b/roles/git/.github/workflows/molecule.yml
similarity index 100%
rename from roles/robertdebock.git/.github/workflows/molecule.yml
rename to roles/git/.github/workflows/molecule.yml
diff --git a/roles/robertdebock.git/.gitignore b/roles/git/.gitignore
similarity index 100%
rename from roles/robertdebock.git/.gitignore
rename to roles/git/.gitignore
diff --git a/roles/robertdebock.git/.travis.yml b/roles/git/.travis.yml
similarity index 100%
rename from roles/robertdebock.git/.travis.yml
rename to roles/git/.travis.yml
diff --git a/roles/robertdebock.git/.yamllint b/roles/git/.yamllint
similarity index 100%
rename from roles/robertdebock.git/.yamllint
rename to roles/git/.yamllint
diff --git a/roles/robertdebock.git/CODE_OF_CONDUCT.md b/roles/git/CODE_OF_CONDUCT.md
similarity index 100%
rename from roles/robertdebock.git/CODE_OF_CONDUCT.md
rename to roles/git/CODE_OF_CONDUCT.md
diff --git a/roles/robertdebock.git/CONTRIBUTING.md b/roles/git/CONTRIBUTING.md
similarity index 100%
rename from roles/robertdebock.git/CONTRIBUTING.md
rename to roles/git/CONTRIBUTING.md
diff --git a/roles/robertdebock.git/LICENSE b/roles/git/LICENSE
similarity index 100%
rename from roles/robertdebock.git/LICENSE
rename to roles/git/LICENSE
diff --git a/roles/robertdebock.git/README.md b/roles/git/README.md
similarity index 100%
rename from roles/robertdebock.git/README.md
rename to roles/git/README.md
diff --git a/roles/robertdebock.git/SECURITY.md b/roles/git/SECURITY.md
similarity index 100%
rename from roles/robertdebock.git/SECURITY.md
rename to roles/git/SECURITY.md
diff --git a/roles/robertdebock.git/defaults/main.yml b/roles/git/defaults/main.yml
similarity index 100%
rename from roles/robertdebock.git/defaults/main.yml
rename to roles/git/defaults/main.yml
diff --git a/roles/git/meta/.galaxy_install_info b/roles/git/meta/.galaxy_install_info
new file mode 100644
index 0000000..8676ff0
--- /dev/null
+++ b/roles/git/meta/.galaxy_install_info
@@ -0,0 +1,2 @@
+install_date: Mon Sep 28 13:22:21 2020
+version: 3.3.5
diff --git a/roles/robertdebock.git/meta/main.yml b/roles/git/meta/main.yml
similarity index 100%
rename from roles/robertdebock.git/meta/main.yml
rename to roles/git/meta/main.yml
diff --git a/roles/robertdebock.git/meta/preferences.yml b/roles/git/meta/preferences.yml
similarity index 100%
rename from roles/robertdebock.git/meta/preferences.yml
rename to roles/git/meta/preferences.yml
diff --git a/roles/robertdebock.git/molecule/default/converge.yml b/roles/git/molecule/default/converge.yml
similarity index 100%
rename from roles/robertdebock.git/molecule/default/converge.yml
rename to roles/git/molecule/default/converge.yml
diff --git a/roles/robertdebock.git/molecule/default/molecule.yml b/roles/git/molecule/default/molecule.yml
similarity index 100%
rename from roles/robertdebock.git/molecule/default/molecule.yml
rename to roles/git/molecule/default/molecule.yml
diff --git a/roles/robertdebock.git/molecule/default/prepare.yml b/roles/git/molecule/default/prepare.yml
similarity index 100%
rename from roles/robertdebock.git/molecule/default/prepare.yml
rename to roles/git/molecule/default/prepare.yml
diff --git a/roles/robertdebock.git/molecule/default/verify.yml b/roles/git/molecule/default/verify.yml
similarity index 100%
rename from roles/robertdebock.git/molecule/default/verify.yml
rename to roles/git/molecule/default/verify.yml
diff --git a/roles/robertdebock.git/requirements.yml b/roles/git/requirements.yml
similarity index 100%
rename from roles/robertdebock.git/requirements.yml
rename to roles/git/requirements.yml
diff --git a/roles/robertdebock.git/tasks/assert.yml b/roles/git/tasks/assert.yml
similarity index 100%
rename from roles/robertdebock.git/tasks/assert.yml
rename to roles/git/tasks/assert.yml
diff --git a/roles/robertdebock.git/tasks/main.yml b/roles/git/tasks/main.yml
similarity index 100%
rename from roles/robertdebock.git/tasks/main.yml
rename to roles/git/tasks/main.yml
diff --git a/roles/robertdebock.git/templates/gitconfig.j2 b/roles/git/templates/gitconfig.j2
similarity index 100%
rename from roles/robertdebock.git/templates/gitconfig.j2
rename to roles/git/templates/gitconfig.j2
diff --git a/roles/robertdebock.git/tox.ini b/roles/git/tox.ini
similarity index 100%
rename from roles/robertdebock.git/tox.ini
rename to roles/git/tox.ini
diff --git a/roles/robertdebock.git/vars/main.yml b/roles/git/vars/main.yml
similarity index 100%
rename from roles/robertdebock.git/vars/main.yml
rename to roles/git/vars/main.yml
diff --git a/roles/robertdebock.investigate/.ansible-lint b/roles/investigate/.ansible-lint
similarity index 100%
rename from roles/robertdebock.investigate/.ansible-lint
rename to roles/investigate/.ansible-lint
diff --git a/roles/robertdebock.investigate/.github/FUNDING.yml b/roles/investigate/.github/FUNDING.yml
similarity index 100%
rename from roles/robertdebock.investigate/.github/FUNDING.yml
rename to roles/investigate/.github/FUNDING.yml
diff --git a/roles/robertdebock.investigate/.github/ISSUE_TEMPLATE/bug_report.md b/roles/investigate/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 100%
rename from roles/robertdebock.investigate/.github/ISSUE_TEMPLATE/bug_report.md
rename to roles/investigate/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/roles/robertdebock.investigate/.github/ISSUE_TEMPLATE/feature_request.md b/roles/investigate/.github/ISSUE_TEMPLATE/feature_request.md
similarity index 100%
rename from roles/robertdebock.investigate/.github/ISSUE_TEMPLATE/feature_request.md
rename to roles/investigate/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/roles/robertdebock.investigate/.github/pull_request_template.md b/roles/investigate/.github/pull_request_template.md
similarity index 100%
rename from roles/robertdebock.investigate/.github/pull_request_template.md
rename to roles/investigate/.github/pull_request_template.md
diff --git a/roles/robertdebock.investigate/.github/settings.yml b/roles/investigate/.github/settings.yml
similarity index 100%
rename from roles/robertdebock.investigate/.github/settings.yml
rename to roles/investigate/.github/settings.yml
diff --git a/roles/robertdebock.investigate/.github/workflows/galaxy.yml b/roles/investigate/.github/workflows/galaxy.yml
similarity index 100%
rename from roles/robertdebock.investigate/.github/workflows/galaxy.yml
rename to roles/investigate/.github/workflows/galaxy.yml
diff --git a/roles/robertdebock.investigate/.github/workflows/molecule.yml b/roles/investigate/.github/workflows/molecule.yml
similarity index 100%
rename from roles/robertdebock.investigate/.github/workflows/molecule.yml
rename to roles/investigate/.github/workflows/molecule.yml
diff --git a/roles/robertdebock.investigate/.gitignore b/roles/investigate/.gitignore
similarity index 100%
rename from roles/robertdebock.investigate/.gitignore
rename to roles/investigate/.gitignore
diff --git a/roles/robertdebock.investigate/.travis.yml b/roles/investigate/.travis.yml
similarity index 100%
rename from roles/robertdebock.investigate/.travis.yml
rename to roles/investigate/.travis.yml
diff --git a/roles/robertdebock.investigate/.yamllint b/roles/investigate/.yamllint
similarity index 100%
rename from roles/robertdebock.investigate/.yamllint
rename to roles/investigate/.yamllint
diff --git a/roles/robertdebock.investigate/CODE_OF_CONDUCT.md b/roles/investigate/CODE_OF_CONDUCT.md
similarity index 100%
rename from roles/robertdebock.investigate/CODE_OF_CONDUCT.md
rename to roles/investigate/CODE_OF_CONDUCT.md
diff --git a/roles/robertdebock.investigate/CONTRIBUTING.md b/roles/investigate/CONTRIBUTING.md
similarity index 100%
rename from roles/robertdebock.investigate/CONTRIBUTING.md
rename to roles/investigate/CONTRIBUTING.md
diff --git a/roles/robertdebock.investigate/LICENSE b/roles/investigate/LICENSE
similarity index 100%
rename from roles/robertdebock.investigate/LICENSE
rename to roles/investigate/LICENSE
diff --git a/roles/robertdebock.investigate/README.md b/roles/investigate/README.md
similarity index 100%
rename from roles/robertdebock.investigate/README.md
rename to roles/investigate/README.md
diff --git a/roles/robertdebock.investigate/SECURITY.md b/roles/investigate/SECURITY.md
similarity index 100%
rename from roles/robertdebock.investigate/SECURITY.md
rename to roles/investigate/SECURITY.md
diff --git a/roles/investigate/meta/.galaxy_install_info b/roles/investigate/meta/.galaxy_install_info
new file mode 100644
index 0000000..f75c12d
--- /dev/null
+++ b/roles/investigate/meta/.galaxy_install_info
@@ -0,0 +1,2 @@
+install_date: Mon Sep 28 13:22:23 2020
+version: 2.3.4
diff --git a/roles/robertdebock.investigate/meta/main.yml b/roles/investigate/meta/main.yml
similarity index 100%
rename from roles/robertdebock.investigate/meta/main.yml
rename to roles/investigate/meta/main.yml
diff --git a/roles/robertdebock.investigate/meta/preferences.yml b/roles/investigate/meta/preferences.yml
similarity index 100%
rename from roles/robertdebock.investigate/meta/preferences.yml
rename to roles/investigate/meta/preferences.yml
diff --git a/roles/robertdebock.investigate/molecule/default/converge.yml b/roles/investigate/molecule/default/converge.yml
similarity index 100%
rename from roles/robertdebock.investigate/molecule/default/converge.yml
rename to roles/investigate/molecule/default/converge.yml
diff --git a/roles/robertdebock.investigate/molecule/default/molecule.yml b/roles/investigate/molecule/default/molecule.yml
similarity index 100%
rename from roles/robertdebock.investigate/molecule/default/molecule.yml
rename to roles/investigate/molecule/default/molecule.yml
diff --git a/roles/robertdebock.investigate/molecule/default/prepare.yml b/roles/investigate/molecule/default/prepare.yml
similarity index 100%
rename from roles/robertdebock.investigate/molecule/default/prepare.yml
rename to roles/investigate/molecule/default/prepare.yml
diff --git a/roles/robertdebock.investigate/molecule/default/verify.yml b/roles/investigate/molecule/default/verify.yml
similarity index 100%
rename from roles/robertdebock.investigate/molecule/default/verify.yml
rename to roles/investigate/molecule/default/verify.yml
diff --git a/roles/robertdebock.investigate/requirements.yml b/roles/investigate/requirements.yml
similarity index 100%
rename from roles/robertdebock.investigate/requirements.yml
rename to roles/investigate/requirements.yml
diff --git a/roles/robertdebock.investigate/tasks/main.yml b/roles/investigate/tasks/main.yml
similarity index 100%
rename from roles/robertdebock.investigate/tasks/main.yml
rename to roles/investigate/tasks/main.yml
diff --git a/roles/robertdebock.investigate/tox.ini b/roles/investigate/tox.ini
similarity index 100%
rename from roles/robertdebock.investigate/tox.ini
rename to roles/investigate/tox.ini
diff --git a/roles/robertdebock.investigate/vars/main.yml b/roles/investigate/vars/main.yml
similarity index 100%
rename from roles/robertdebock.investigate/vars/main.yml
rename to roles/investigate/vars/main.yml
diff --git a/roles/robertdebock.molecule/.ansible-lint b/roles/molecule/.ansible-lint
similarity index 100%
rename from roles/robertdebock.molecule/.ansible-lint
rename to roles/molecule/.ansible-lint
diff --git a/roles/robertdebock.molecule/.github/FUNDING.yml b/roles/molecule/.github/FUNDING.yml
similarity index 100%
rename from roles/robertdebock.molecule/.github/FUNDING.yml
rename to roles/molecule/.github/FUNDING.yml
diff --git a/roles/robertdebock.molecule/.github/ISSUE_TEMPLATE/bug_report.md b/roles/molecule/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 100%
rename from roles/robertdebock.molecule/.github/ISSUE_TEMPLATE/bug_report.md
rename to roles/molecule/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/roles/robertdebock.molecule/.github/ISSUE_TEMPLATE/feature_request.md b/roles/molecule/.github/ISSUE_TEMPLATE/feature_request.md
similarity index 100%
rename from roles/robertdebock.molecule/.github/ISSUE_TEMPLATE/feature_request.md
rename to roles/molecule/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/roles/robertdebock.molecule/.github/pull_request_template.md b/roles/molecule/.github/pull_request_template.md
similarity index 100%
rename from roles/robertdebock.molecule/.github/pull_request_template.md
rename to roles/molecule/.github/pull_request_template.md
diff --git a/roles/robertdebock.molecule/.github/settings.yml b/roles/molecule/.github/settings.yml
similarity index 100%
rename from roles/robertdebock.molecule/.github/settings.yml
rename to roles/molecule/.github/settings.yml
diff --git a/roles/robertdebock.molecule/.github/workflows/galaxy.yml b/roles/molecule/.github/workflows/galaxy.yml
similarity index 100%
rename from roles/robertdebock.molecule/.github/workflows/galaxy.yml
rename to roles/molecule/.github/workflows/galaxy.yml
diff --git a/roles/robertdebock.molecule/.github/workflows/molecule.yml b/roles/molecule/.github/workflows/molecule.yml
similarity index 100%
rename from roles/robertdebock.molecule/.github/workflows/molecule.yml
rename to roles/molecule/.github/workflows/molecule.yml
diff --git a/roles/robertdebock.molecule/.gitignore b/roles/molecule/.gitignore
similarity index 100%
rename from roles/robertdebock.molecule/.gitignore
rename to roles/molecule/.gitignore
diff --git a/roles/robertdebock.molecule/.travis.yml b/roles/molecule/.travis.yml
similarity index 100%
rename from roles/robertdebock.molecule/.travis.yml
rename to roles/molecule/.travis.yml
diff --git a/roles/robertdebock.molecule/.yamllint b/roles/molecule/.yamllint
similarity index 100%
rename from roles/robertdebock.molecule/.yamllint
rename to roles/molecule/.yamllint
diff --git a/roles/robertdebock.molecule/CODE_OF_CONDUCT.md b/roles/molecule/CODE_OF_CONDUCT.md
similarity index 100%
rename from roles/robertdebock.molecule/CODE_OF_CONDUCT.md
rename to roles/molecule/CODE_OF_CONDUCT.md
diff --git a/roles/robertdebock.molecule/CONTRIBUTING.md b/roles/molecule/CONTRIBUTING.md
similarity index 100%
rename from roles/robertdebock.molecule/CONTRIBUTING.md
rename to roles/molecule/CONTRIBUTING.md
diff --git a/roles/robertdebock.molecule/LICENSE b/roles/molecule/LICENSE
similarity index 100%
rename from roles/robertdebock.molecule/LICENSE
rename to roles/molecule/LICENSE
diff --git a/roles/robertdebock.molecule/README.md b/roles/molecule/README.md
similarity index 100%
rename from roles/robertdebock.molecule/README.md
rename to roles/molecule/README.md
diff --git a/roles/robertdebock.molecule/SECURITY.md b/roles/molecule/SECURITY.md
similarity index 100%
rename from roles/robertdebock.molecule/SECURITY.md
rename to roles/molecule/SECURITY.md
diff --git a/roles/robertdebock.molecule/defaults/main.yml b/roles/molecule/defaults/main.yml
similarity index 100%
rename from roles/robertdebock.molecule/defaults/main.yml
rename to roles/molecule/defaults/main.yml
diff --git a/roles/molecule/meta/.galaxy_install_info b/roles/molecule/meta/.galaxy_install_info
new file mode 100644
index 0000000..05147fc
--- /dev/null
+++ b/roles/molecule/meta/.galaxy_install_info
@@ -0,0 +1,2 @@
+install_date: Mon Sep 28 13:22:25 2020
+version: 2.3.1
diff --git a/roles/robertdebock.molecule/meta/exception.yml b/roles/molecule/meta/exception.yml
similarity index 100%
rename from roles/robertdebock.molecule/meta/exception.yml
rename to roles/molecule/meta/exception.yml
diff --git a/roles/robertdebock.molecule/meta/main.yml b/roles/molecule/meta/main.yml
similarity index 100%
rename from roles/robertdebock.molecule/meta/main.yml
rename to roles/molecule/meta/main.yml
diff --git a/roles/robertdebock.molecule/meta/preferences.yml b/roles/molecule/meta/preferences.yml
similarity index 100%
rename from roles/robertdebock.molecule/meta/preferences.yml
rename to roles/molecule/meta/preferences.yml
diff --git a/roles/robertdebock.molecule/molecule/default/converge.yml b/roles/molecule/molecule/default/converge.yml
similarity index 100%
rename from roles/robertdebock.molecule/molecule/default/converge.yml
rename to roles/molecule/molecule/default/converge.yml
diff --git a/roles/robertdebock.molecule/molecule/default/molecule.yml b/roles/molecule/molecule/default/molecule.yml
similarity index 100%
rename from roles/robertdebock.molecule/molecule/default/molecule.yml
rename to roles/molecule/molecule/default/molecule.yml
diff --git a/roles/robertdebock.molecule/molecule/default/prepare.yml b/roles/molecule/molecule/default/prepare.yml
similarity index 100%
rename from roles/robertdebock.molecule/molecule/default/prepare.yml
rename to roles/molecule/molecule/default/prepare.yml
diff --git a/roles/robertdebock.molecule/molecule/default/verify.yml b/roles/molecule/molecule/default/verify.yml
similarity index 100%
rename from roles/robertdebock.molecule/molecule/default/verify.yml
rename to roles/molecule/molecule/default/verify.yml
diff --git a/roles/robertdebock.molecule/requirements.yml b/roles/molecule/requirements.yml
similarity index 100%
rename from roles/robertdebock.molecule/requirements.yml
rename to roles/molecule/requirements.yml
diff --git a/roles/robertdebock.molecule/tasks/assert.yml b/roles/molecule/tasks/assert.yml
similarity index 100%
rename from roles/robertdebock.molecule/tasks/assert.yml
rename to roles/molecule/tasks/assert.yml
diff --git a/roles/robertdebock.molecule/tasks/main.yml b/roles/molecule/tasks/main.yml
similarity index 100%
rename from roles/robertdebock.molecule/tasks/main.yml
rename to roles/molecule/tasks/main.yml
diff --git a/roles/robertdebock.molecule/tox.ini b/roles/molecule/tox.ini
similarity index 100%
rename from roles/robertdebock.molecule/tox.ini
rename to roles/molecule/tox.ini
diff --git a/roles/robertdebock.molecule/vars/main.yml b/roles/molecule/vars/main.yml
similarity index 100%
rename from roles/robertdebock.molecule/vars/main.yml
rename to roles/molecule/vars/main.yml
diff --git a/roles/robertdebock.postfix/.ansible-lint b/roles/postfix/.ansible-lint
similarity index 100%
rename from roles/robertdebock.postfix/.ansible-lint
rename to roles/postfix/.ansible-lint
diff --git a/roles/robertdebock.postfix/.github/FUNDING.yml b/roles/postfix/.github/FUNDING.yml
similarity index 100%
rename from roles/robertdebock.postfix/.github/FUNDING.yml
rename to roles/postfix/.github/FUNDING.yml
diff --git a/roles/robertdebock.postfix/.github/ISSUE_TEMPLATE/bug_report.md b/roles/postfix/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 100%
rename from roles/robertdebock.postfix/.github/ISSUE_TEMPLATE/bug_report.md
rename to roles/postfix/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/roles/robertdebock.postfix/.github/ISSUE_TEMPLATE/feature_request.md b/roles/postfix/.github/ISSUE_TEMPLATE/feature_request.md
similarity index 100%
rename from roles/robertdebock.postfix/.github/ISSUE_TEMPLATE/feature_request.md
rename to roles/postfix/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/roles/robertdebock.postfix/.github/pull_request_template.md b/roles/postfix/.github/pull_request_template.md
similarity index 100%
rename from roles/robertdebock.postfix/.github/pull_request_template.md
rename to roles/postfix/.github/pull_request_template.md
diff --git a/roles/robertdebock.postfix/.github/settings.yml b/roles/postfix/.github/settings.yml
similarity index 100%
rename from roles/robertdebock.postfix/.github/settings.yml
rename to roles/postfix/.github/settings.yml
diff --git a/roles/robertdebock.postfix/.github/workflows/galaxy.yml b/roles/postfix/.github/workflows/galaxy.yml
similarity index 100%
rename from roles/robertdebock.postfix/.github/workflows/galaxy.yml
rename to roles/postfix/.github/workflows/galaxy.yml
diff --git a/roles/robertdebock.postfix/.github/workflows/molecule.yml b/roles/postfix/.github/workflows/molecule.yml
similarity index 100%
rename from roles/robertdebock.postfix/.github/workflows/molecule.yml
rename to roles/postfix/.github/workflows/molecule.yml
diff --git a/roles/robertdebock.postfix/.gitignore b/roles/postfix/.gitignore
similarity index 100%
rename from roles/robertdebock.postfix/.gitignore
rename to roles/postfix/.gitignore
diff --git a/roles/robertdebock.postfix/.travis.yml b/roles/postfix/.travis.yml
similarity index 100%
rename from roles/robertdebock.postfix/.travis.yml
rename to roles/postfix/.travis.yml
diff --git a/roles/robertdebock.postfix/.yamllint b/roles/postfix/.yamllint
similarity index 100%
rename from roles/robertdebock.postfix/.yamllint
rename to roles/postfix/.yamllint
diff --git a/roles/robertdebock.postfix/CODE_OF_CONDUCT.md b/roles/postfix/CODE_OF_CONDUCT.md
similarity index 100%
rename from roles/robertdebock.postfix/CODE_OF_CONDUCT.md
rename to roles/postfix/CODE_OF_CONDUCT.md
diff --git a/roles/robertdebock.postfix/CONTRIBUTING.md b/roles/postfix/CONTRIBUTING.md
similarity index 100%
rename from roles/robertdebock.postfix/CONTRIBUTING.md
rename to roles/postfix/CONTRIBUTING.md
diff --git a/roles/robertdebock.postfix/LICENSE b/roles/postfix/LICENSE
similarity index 100%
rename from roles/robertdebock.postfix/LICENSE
rename to roles/postfix/LICENSE
diff --git a/roles/robertdebock.postfix/README.md b/roles/postfix/README.md
similarity index 100%
rename from roles/robertdebock.postfix/README.md
rename to roles/postfix/README.md
diff --git a/roles/robertdebock.postfix/SECURITY.md b/roles/postfix/SECURITY.md
similarity index 100%
rename from roles/robertdebock.postfix/SECURITY.md
rename to roles/postfix/SECURITY.md
diff --git a/roles/robertdebock.postfix/defaults/main.yml b/roles/postfix/defaults/main.yml
similarity index 100%
rename from roles/robertdebock.postfix/defaults/main.yml
rename to roles/postfix/defaults/main.yml
diff --git a/roles/robertdebock.postfix/files/my-postfix.te b/roles/postfix/files/my-postfix.te
similarity index 100%
rename from roles/robertdebock.postfix/files/my-postfix.te
rename to roles/postfix/files/my-postfix.te
diff --git a/roles/robertdebock.postfix/handlers/main.yml b/roles/postfix/handlers/main.yml
similarity index 100%
rename from roles/robertdebock.postfix/handlers/main.yml
rename to roles/postfix/handlers/main.yml
diff --git a/roles/postfix/meta/.galaxy_install_info b/roles/postfix/meta/.galaxy_install_info
new file mode 100644
index 0000000..8880af9
--- /dev/null
+++ b/roles/postfix/meta/.galaxy_install_info
@@ -0,0 +1,2 @@
+install_date: Mon Sep 28 13:22:27 2020
+version: 3.3.2
diff --git a/roles/robertdebock.postfix/meta/exception.yml b/roles/postfix/meta/exception.yml
similarity index 100%
rename from roles/robertdebock.postfix/meta/exception.yml
rename to roles/postfix/meta/exception.yml
diff --git a/roles/robertdebock.postfix/meta/main.yml b/roles/postfix/meta/main.yml
similarity index 100%
rename from roles/robertdebock.postfix/meta/main.yml
rename to roles/postfix/meta/main.yml
diff --git a/roles/robertdebock.postfix/meta/preferences.yml b/roles/postfix/meta/preferences.yml
similarity index 100%
rename from roles/robertdebock.postfix/meta/preferences.yml
rename to roles/postfix/meta/preferences.yml
diff --git a/roles/robertdebock.postfix/molecule/default/converge.yml b/roles/postfix/molecule/default/converge.yml
similarity index 100%
rename from roles/robertdebock.postfix/molecule/default/converge.yml
rename to roles/postfix/molecule/default/converge.yml
diff --git a/roles/robertdebock.postfix/molecule/default/molecule.yml b/roles/postfix/molecule/default/molecule.yml
similarity index 100%
rename from roles/robertdebock.postfix/molecule/default/molecule.yml
rename to roles/postfix/molecule/default/molecule.yml
diff --git a/roles/robertdebock.postfix/molecule/default/prepare.yml b/roles/postfix/molecule/default/prepare.yml
similarity index 100%
rename from roles/robertdebock.postfix/molecule/default/prepare.yml
rename to roles/postfix/molecule/default/prepare.yml
diff --git a/roles/robertdebock.postfix/molecule/default/verify.yml b/roles/postfix/molecule/default/verify.yml
similarity index 100%
rename from roles/robertdebock.postfix/molecule/default/verify.yml
rename to roles/postfix/molecule/default/verify.yml
diff --git a/roles/robertdebock.postfix/requirements.yml b/roles/postfix/requirements.yml
similarity index 100%
rename from roles/robertdebock.postfix/requirements.yml
rename to roles/postfix/requirements.yml
diff --git a/roles/robertdebock.postfix/tasks/assert.yml b/roles/postfix/tasks/assert.yml
similarity index 100%
rename from roles/robertdebock.postfix/tasks/assert.yml
rename to roles/postfix/tasks/assert.yml
diff --git a/roles/robertdebock.postfix/tasks/main.yml b/roles/postfix/tasks/main.yml
similarity index 100%
rename from roles/robertdebock.postfix/tasks/main.yml
rename to roles/postfix/tasks/main.yml
diff --git a/roles/robertdebock.postfix/templates/main.cf.j2 b/roles/postfix/templates/main.cf.j2
similarity index 100%
rename from roles/robertdebock.postfix/templates/main.cf.j2
rename to roles/postfix/templates/main.cf.j2
diff --git a/roles/robertdebock.postfix/templates/master.cf.j2 b/roles/postfix/templates/master.cf.j2
similarity index 100%
rename from roles/robertdebock.postfix/templates/master.cf.j2
rename to roles/postfix/templates/master.cf.j2
diff --git a/roles/robertdebock.postfix/tox.ini b/roles/postfix/tox.ini
similarity index 100%
rename from roles/robertdebock.postfix/tox.ini
rename to roles/postfix/tox.ini
diff --git a/roles/robertdebock.postfix/vars/main.yml b/roles/postfix/vars/main.yml
similarity index 100%
rename from roles/robertdebock.postfix/vars/main.yml
rename to roles/postfix/vars/main.yml
diff --git a/roles/robertdebock.python_pip/.ansible-lint b/roles/python_pip/.ansible-lint
similarity index 100%
rename from roles/robertdebock.python_pip/.ansible-lint
rename to roles/python_pip/.ansible-lint
diff --git a/roles/robertdebock.python_pip/.github/FUNDING.yml b/roles/python_pip/.github/FUNDING.yml
similarity index 100%
rename from roles/robertdebock.python_pip/.github/FUNDING.yml
rename to roles/python_pip/.github/FUNDING.yml
diff --git a/roles/robertdebock.python_pip/.github/ISSUE_TEMPLATE/bug_report.md b/roles/python_pip/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 100%
rename from roles/robertdebock.python_pip/.github/ISSUE_TEMPLATE/bug_report.md
rename to roles/python_pip/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/roles/robertdebock.python_pip/.github/ISSUE_TEMPLATE/feature_request.md b/roles/python_pip/.github/ISSUE_TEMPLATE/feature_request.md
similarity index 100%
rename from roles/robertdebock.python_pip/.github/ISSUE_TEMPLATE/feature_request.md
rename to roles/python_pip/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/roles/robertdebock.python_pip/.github/pull_request_template.md b/roles/python_pip/.github/pull_request_template.md
similarity index 100%
rename from roles/robertdebock.python_pip/.github/pull_request_template.md
rename to roles/python_pip/.github/pull_request_template.md
diff --git a/roles/robertdebock.python_pip/.github/settings.yml b/roles/python_pip/.github/settings.yml
similarity index 100%
rename from roles/robertdebock.python_pip/.github/settings.yml
rename to roles/python_pip/.github/settings.yml
diff --git a/roles/robertdebock.python_pip/.github/workflows/galaxy.yml b/roles/python_pip/.github/workflows/galaxy.yml
similarity index 100%
rename from roles/robertdebock.python_pip/.github/workflows/galaxy.yml
rename to roles/python_pip/.github/workflows/galaxy.yml
diff --git a/roles/robertdebock.python_pip/.github/workflows/molecule.yml b/roles/python_pip/.github/workflows/molecule.yml
similarity index 100%
rename from roles/robertdebock.python_pip/.github/workflows/molecule.yml
rename to roles/python_pip/.github/workflows/molecule.yml
diff --git a/roles/robertdebock.python_pip/.gitignore b/roles/python_pip/.gitignore
similarity index 100%
rename from roles/robertdebock.python_pip/.gitignore
rename to roles/python_pip/.gitignore
diff --git a/roles/robertdebock.python_pip/.travis.yml b/roles/python_pip/.travis.yml
similarity index 100%
rename from roles/robertdebock.python_pip/.travis.yml
rename to roles/python_pip/.travis.yml
diff --git a/roles/robertdebock.python_pip/.yamllint b/roles/python_pip/.yamllint
similarity index 100%
rename from roles/robertdebock.python_pip/.yamllint
rename to roles/python_pip/.yamllint
diff --git a/roles/robertdebock.python_pip/CODE_OF_CONDUCT.md b/roles/python_pip/CODE_OF_CONDUCT.md
similarity index 100%
rename from roles/robertdebock.python_pip/CODE_OF_CONDUCT.md
rename to roles/python_pip/CODE_OF_CONDUCT.md
diff --git a/roles/robertdebock.python_pip/CONTRIBUTING.md b/roles/python_pip/CONTRIBUTING.md
similarity index 100%
rename from roles/robertdebock.python_pip/CONTRIBUTING.md
rename to roles/python_pip/CONTRIBUTING.md
diff --git a/roles/robertdebock.python_pip/LICENSE b/roles/python_pip/LICENSE
similarity index 100%
rename from roles/robertdebock.python_pip/LICENSE
rename to roles/python_pip/LICENSE
diff --git a/roles/robertdebock.python_pip/README.md b/roles/python_pip/README.md
similarity index 100%
rename from roles/robertdebock.python_pip/README.md
rename to roles/python_pip/README.md
diff --git a/roles/robertdebock.python_pip/SECURITY.md b/roles/python_pip/SECURITY.md
similarity index 100%
rename from roles/robertdebock.python_pip/SECURITY.md
rename to roles/python_pip/SECURITY.md
diff --git a/roles/robertdebock.python_pip/defaults/main.yml b/roles/python_pip/defaults/main.yml
similarity index 100%
rename from roles/robertdebock.python_pip/defaults/main.yml
rename to roles/python_pip/defaults/main.yml
diff --git a/roles/python_pip/meta/.galaxy_install_info b/roles/python_pip/meta/.galaxy_install_info
new file mode 100644
index 0000000..d21cfb2
--- /dev/null
+++ b/roles/python_pip/meta/.galaxy_install_info
@@ -0,0 +1,2 @@
+install_date: Mon Sep 28 13:22:31 2020
+version: 3.3.11
diff --git a/roles/robertdebock.python_pip/meta/exception.yml b/roles/python_pip/meta/exception.yml
similarity index 100%
rename from roles/robertdebock.python_pip/meta/exception.yml
rename to roles/python_pip/meta/exception.yml
diff --git a/roles/robertdebock.python_pip/meta/main.yml b/roles/python_pip/meta/main.yml
similarity index 100%
rename from roles/robertdebock.python_pip/meta/main.yml
rename to roles/python_pip/meta/main.yml
diff --git a/roles/robertdebock.python_pip/meta/preferences.yml b/roles/python_pip/meta/preferences.yml
similarity index 100%
rename from roles/robertdebock.python_pip/meta/preferences.yml
rename to roles/python_pip/meta/preferences.yml
diff --git a/roles/robertdebock.python_pip/molecule/default/converge.yml b/roles/python_pip/molecule/default/converge.yml
similarity index 100%
rename from roles/robertdebock.python_pip/molecule/default/converge.yml
rename to roles/python_pip/molecule/default/converge.yml
diff --git a/roles/robertdebock.python_pip/molecule/default/molecule.yml b/roles/python_pip/molecule/default/molecule.yml
similarity index 100%
rename from roles/robertdebock.python_pip/molecule/default/molecule.yml
rename to roles/python_pip/molecule/default/molecule.yml
diff --git a/roles/robertdebock.python_pip/molecule/default/prepare.yml b/roles/python_pip/molecule/default/prepare.yml
similarity index 100%
rename from roles/robertdebock.python_pip/molecule/default/prepare.yml
rename to roles/python_pip/molecule/default/prepare.yml
diff --git a/roles/robertdebock.python_pip/molecule/default/verify.yml b/roles/python_pip/molecule/default/verify.yml
similarity index 100%
rename from roles/robertdebock.python_pip/molecule/default/verify.yml
rename to roles/python_pip/molecule/default/verify.yml
diff --git a/roles/robertdebock.python_pip/requirements.yml b/roles/python_pip/requirements.yml
similarity index 100%
rename from roles/robertdebock.python_pip/requirements.yml
rename to roles/python_pip/requirements.yml
diff --git a/roles/robertdebock.python_pip/tasks/assert.yml b/roles/python_pip/tasks/assert.yml
similarity index 100%
rename from roles/robertdebock.python_pip/tasks/assert.yml
rename to roles/python_pip/tasks/assert.yml
diff --git a/roles/robertdebock.python_pip/tasks/main.yml b/roles/python_pip/tasks/main.yml
similarity index 100%
rename from roles/robertdebock.python_pip/tasks/main.yml
rename to roles/python_pip/tasks/main.yml
diff --git a/roles/robertdebock.python_pip/tox.ini b/roles/python_pip/tox.ini
similarity index 100%
rename from roles/robertdebock.python_pip/tox.ini
rename to roles/python_pip/tox.ini
diff --git a/roles/robertdebock.python_pip/vars/main.yml b/roles/python_pip/vars/main.yml
similarity index 100%
rename from roles/robertdebock.python_pip/vars/main.yml
rename to roles/python_pip/vars/main.yml
diff --git a/roles/robertdebock.service/.ansible-lint b/roles/reboot/.ansible-lint
similarity index 100%
rename from roles/robertdebock.service/.ansible-lint
rename to roles/reboot/.ansible-lint
diff --git a/roles/robertdebock.reboot/.github/FUNDING.yml b/roles/reboot/.github/FUNDING.yml
similarity index 100%
rename from roles/robertdebock.reboot/.github/FUNDING.yml
rename to roles/reboot/.github/FUNDING.yml
diff --git a/roles/robertdebock.reboot/.github/ISSUE_TEMPLATE/bug_report.md b/roles/reboot/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 100%
rename from roles/robertdebock.reboot/.github/ISSUE_TEMPLATE/bug_report.md
rename to roles/reboot/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/roles/robertdebock.reboot/.github/ISSUE_TEMPLATE/feature_request.md b/roles/reboot/.github/ISSUE_TEMPLATE/feature_request.md
similarity index 100%
rename from roles/robertdebock.reboot/.github/ISSUE_TEMPLATE/feature_request.md
rename to roles/reboot/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/roles/robertdebock.reboot/.github/pull_request_template.md b/roles/reboot/.github/pull_request_template.md
similarity index 100%
rename from roles/robertdebock.reboot/.github/pull_request_template.md
rename to roles/reboot/.github/pull_request_template.md
diff --git a/roles/robertdebock.reboot/.github/settings.yml b/roles/reboot/.github/settings.yml
similarity index 100%
rename from roles/robertdebock.reboot/.github/settings.yml
rename to roles/reboot/.github/settings.yml
diff --git a/roles/robertdebock.reboot/.github/workflows/galaxy.yml b/roles/reboot/.github/workflows/galaxy.yml
similarity index 100%
rename from roles/robertdebock.reboot/.github/workflows/galaxy.yml
rename to roles/reboot/.github/workflows/galaxy.yml
diff --git a/roles/robertdebock.ruby/.github/workflows/molecule.yml b/roles/reboot/.github/workflows/molecule.yml
similarity index 94%
rename from roles/robertdebock.ruby/.github/workflows/molecule.yml
rename to roles/reboot/.github/workflows/molecule.yml
index 355a68d..7ef594e 100644
--- a/roles/robertdebock.ruby/.github/workflows/molecule.yml
+++ b/roles/reboot/.github/workflows/molecule.yml
@@ -22,7 +22,7 @@ jobs:
         with:
           path: "${{ github.repository }}"
       - name: molecule
-        uses: robertdebock/molecule-action@2.6.1
+        uses: robertdebock/molecule-action@2.6.3
         with:
           command: lint
   test:
@@ -69,7 +69,7 @@ jobs:
       - name: parse apparmor for mysql
         run: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
       - name: molecule
-        uses: robertdebock/molecule-action@2.6.1
+        uses: robertdebock/molecule-action@2.6.3
         with:
           image: ${{ matrix.config.image }}
           tag: ${{ matrix.config.tag }}
diff --git a/roles/robertdebock.reboot/.gitignore b/roles/reboot/.gitignore
similarity index 100%
rename from roles/robertdebock.reboot/.gitignore
rename to roles/reboot/.gitignore
diff --git a/roles/robertdebock.reboot/.travis.yml b/roles/reboot/.travis.yml
similarity index 50%
rename from roles/robertdebock.reboot/.travis.yml
rename to roles/reboot/.travis.yml
index b82a0ab..64e7245 100644
--- a/roles/robertdebock.reboot/.travis.yml
+++ b/roles/reboot/.travis.yml
@@ -4,6 +4,9 @@
 #
 language: python
 
+os: linux
+dist: xenial
+
 python:
   - "3.8"
 
@@ -13,7 +16,7 @@ services:
 env:
   global:
     namespace="robertdebock"
-  matrix:
+  jobs:
     - image="alpine" tag="latest"
     - image="alpine" tag="edge"
     - image="amazonlinux" tag="1"
@@ -40,5 +43,8 @@ script:
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
-  slack: "FEoY3mASqF90TCYAHL8TycD+EWHVn/qyrvQg6p/KNEd6Gq+g6Q2p5DgUez1Pd7218mkqptsn4DHOF/B9gywNmfHR4XAfJzpM7cW+tNH0LKtzRor6nuFR0CSvxUitVYA5ZhfLq7obuByFNYQK1mIq/E86R9H634FaMzAacp7z5Lxbml+QYx6G+G4P/uAXo9fgqO6lKs9F6YAf4X/Zoauk9R6jxfklx1Pl8iMlWddViigBgxUa9B2+MbGby4QHBv1TCVJMnx0EMqZ7Bar0lititnNtBHWt5m8u563mDlIdXv7ubU0dE0MYjd0tnkoR2gDxhJDWyLGpsePNyPBPRV+fgRiHVCT13TbA3fI/OWUPYEi1jODrsXrGqV1yEmx0iot+XCWYJkXD/nkuAj+AbwORYEZScnwm8H42E8UpsCL3+mXOxV+EWRcUqOc9W6AnrdSNHu42Klg7zJsrcxY0i/yOtsBdZl7MHQpetsUXJuJt1DjnXeqcPadi4K2WkHBFyO2HUbbPK0g3Uq+9NVvTq+1BlQ5Jz88HRRGtl+FtvgFowfatIX2GpDrjlNVAZTo2G3kOgnSom8w/A41yBHqI52QQab8BUxZIGLxEFtVmPjieeWU+C5M68kCMoZnz4iqkvgc6OVvHOpbQg3JOVxjlYf7o+gHEzSFzjy/nYguwe5nLS1g="
+  slack:
+    secure: "GpBPK1AmC7GF6i/GmiqOen2foL/jbZHlISxRco34tgFWGszUsMV88YN4AyiU3PBH+UdqlmEE+ofKb9ugx7Bw93LC0rLMtnBqlTUA3fNLdQPl56Jwy3UlKA8A3SSyA8nMdUhj0NDh3wX4XuBJjqwbluIEsEVifSH1koWQEbEEf0qsc9fkymgvZ770JlGJNq8+oaeVtDRNQ7LCBvDDxNxwJrb5L0g9knWUF+tyO749QapQID8U1iLxeS6FK8EJp88H7N/hjfrR19r8z9TqQoTYS4UQil+fXeKNc6LuinoeUFwPc5ubH7wNMvtgEfbnDwC5w6a4Xw8TeyHM6j1FHHLwqwTGdnXzpO8ltYBYf9fnVzhh13wSJlhRfi+NzBxV8skg+U1En1RXBV2faZkqLsM7Pspx/pISJJwWfCWRuS/T7k2QkvSGjEOhjbPdCHULlkowOYmNMQNG3E7Zl6t0Fpw5l2jXuTX/ojvazqr3Mv+uEueEnF+jDP5AuuaMdLAzMVHf/nZPTPj+IaVOW95mPeWt21dXCfYOcviXFMJj+94KRfBVGRUYs+Ta8TDov3Thiq4eRmsC33ELildRMdoscP1CjLSZ02FY0cm8ZIVJNAJKKeQjsETQPv6pnQzaxB5hsR43hgtSIVTajzIZYuwEew8D4aLy3ObySUVMILhHyI2MDEw="
+    on_success: change
+    template: "%{result}: %{repository_slug}@%{branch}, build <%{build_url}|#%{build_number}> (<%{compare_url}|%{commit}>)"
   email: false
diff --git a/roles/robertdebock.service/.yamllint b/roles/reboot/.yamllint
similarity index 100%
rename from roles/robertdebock.service/.yamllint
rename to roles/reboot/.yamllint
diff --git a/roles/robertdebock.reboot/CODE_OF_CONDUCT.md b/roles/reboot/CODE_OF_CONDUCT.md
similarity index 100%
rename from roles/robertdebock.reboot/CODE_OF_CONDUCT.md
rename to roles/reboot/CODE_OF_CONDUCT.md
diff --git a/roles/robertdebock.reboot/CONTRIBUTING.md b/roles/reboot/CONTRIBUTING.md
similarity index 100%
rename from roles/robertdebock.reboot/CONTRIBUTING.md
rename to roles/reboot/CONTRIBUTING.md
diff --git a/roles/robertdebock.reboot/LICENSE b/roles/reboot/LICENSE
similarity index 100%
rename from roles/robertdebock.reboot/LICENSE
rename to roles/reboot/LICENSE
diff --git a/roles/robertdebock.reboot/README.md b/roles/reboot/README.md
similarity index 97%
rename from roles/robertdebock.reboot/README.md
rename to roles/reboot/README.md
index c57f517..491fc01 100644
--- a/roles/robertdebock.reboot/README.md
+++ b/roles/reboot/README.md
@@ -32,13 +32,13 @@ The machine may need to be prepared using `molecule/resources/prepare.yml`:
     - role: robertdebock.bootstrap
 ```
 
-For verification `molecule/resources/verify.yml` run after the role has been applied.
+For verification `molecule/resources/verify.yml` runs after the role has been applied.
 ```yaml
 ---
 - name: Verify
   hosts: all
   become: yes
-  gather_facts: yes
+  gather_facts: no
 
   tasks:
     - name: check if connection still works
diff --git a/roles/robertdebock.reboot/SECURITY.md b/roles/reboot/SECURITY.md
similarity index 100%
rename from roles/robertdebock.reboot/SECURITY.md
rename to roles/reboot/SECURITY.md
diff --git a/roles/robertdebock.reboot/defaults/main.yml b/roles/reboot/defaults/main.yml
similarity index 100%
rename from roles/robertdebock.reboot/defaults/main.yml
rename to roles/reboot/defaults/main.yml
diff --git a/roles/reboot/meta/.galaxy_install_info b/roles/reboot/meta/.galaxy_install_info
new file mode 100644
index 0000000..7a413c2
--- /dev/null
+++ b/roles/reboot/meta/.galaxy_install_info
@@ -0,0 +1,2 @@
+install_date: Mon Sep 28 13:22:33 2020
+version: 2.6.3
diff --git a/roles/robertdebock.reboot/meta/main.yml b/roles/reboot/meta/main.yml
similarity index 100%
rename from roles/robertdebock.reboot/meta/main.yml
rename to roles/reboot/meta/main.yml
diff --git a/roles/robertdebock.reboot/meta/preferences.yml b/roles/reboot/meta/preferences.yml
similarity index 100%
rename from roles/robertdebock.reboot/meta/preferences.yml
rename to roles/reboot/meta/preferences.yml
diff --git a/roles/robertdebock.reboot/molecule/default/converge.yml b/roles/reboot/molecule/default/converge.yml
similarity index 100%
rename from roles/robertdebock.reboot/molecule/default/converge.yml
rename to roles/reboot/molecule/default/converge.yml
diff --git a/roles/robertdebock.reboot/molecule/default/molecule.yml b/roles/reboot/molecule/default/molecule.yml
similarity index 84%
rename from roles/robertdebock.reboot/molecule/default/molecule.yml
rename to roles/reboot/molecule/default/molecule.yml
index 9340432..a42c832 100644
--- a/roles/robertdebock.reboot/molecule/default/molecule.yml
+++ b/roles/reboot/molecule/default/molecule.yml
@@ -7,9 +7,9 @@ dependency:
   options:
     role-file: requirements.yml
 lint: |
-  PATH=${PATH}
-  yamllint molecule/default/converge.yml
-  ansible-lint molecule/default/converge.yml
+  set -e
+  yamllint .
+  ansible-lint
 driver:
   name: docker
 platforms:
diff --git a/roles/robertdebock.reboot/molecule/default/prepare.yml b/roles/reboot/molecule/default/prepare.yml
similarity index 100%
rename from roles/robertdebock.reboot/molecule/default/prepare.yml
rename to roles/reboot/molecule/default/prepare.yml
diff --git a/roles/robertdebock.update/molecule/default/verify.yml b/roles/reboot/molecule/default/verify.yml
similarity index 84%
rename from roles/robertdebock.update/molecule/default/verify.yml
rename to roles/reboot/molecule/default/verify.yml
index 6ab75cf..b9dc6f8 100644
--- a/roles/robertdebock.update/molecule/default/verify.yml
+++ b/roles/reboot/molecule/default/verify.yml
@@ -2,7 +2,7 @@
 - name: Verify
   hosts: all
   become: yes
-  gather_facts: yes
+  gather_facts: no
 
   tasks:
     - name: check if connection still works
diff --git a/roles/robertdebock.reboot/requirements.yml b/roles/reboot/requirements.yml
similarity index 100%
rename from roles/robertdebock.reboot/requirements.yml
rename to roles/reboot/requirements.yml
diff --git a/roles/robertdebock.reboot/tasks/assert.yml b/roles/reboot/tasks/assert.yml
similarity index 100%
rename from roles/robertdebock.reboot/tasks/assert.yml
rename to roles/reboot/tasks/assert.yml
diff --git a/roles/robertdebock.reboot/tasks/main.yml b/roles/reboot/tasks/main.yml
similarity index 100%
rename from roles/robertdebock.reboot/tasks/main.yml
rename to roles/reboot/tasks/main.yml
diff --git a/roles/robertdebock.reboot/tasks/reboot.yml b/roles/reboot/tasks/reboot.yml
similarity index 100%
rename from roles/robertdebock.reboot/tasks/reboot.yml
rename to roles/reboot/tasks/reboot.yml
diff --git a/roles/robertdebock.vagrant/tox.ini b/roles/reboot/tox.ini
similarity index 62%
rename from roles/robertdebock.vagrant/tox.ini
rename to roles/reboot/tox.ini
index c1bc1d4..c94adfa 100644
--- a/roles/robertdebock.vagrant/tox.ini
+++ b/roles/reboot/tox.ini
@@ -3,16 +3,13 @@
 #
 [tox]
 minversion = 3.7
-# Disabled "next" because of:
-# https://github.com/ansible-community/molecule/issues/2626.
-# envlist = py{38}-ansible-{previous,current,next}
-envlist = py{38}-ansible-{previous,current}
+envlist = py{38}-ansible-{previous,current,next}
 skipsdist = true
 
 [testenv]
 deps =
-    previous: ansible>=2.8, <2.9
-    current: ansible>=2.9
+    previous: ansible>=2.9, <2.10
+    current: ansible
     next: git+https://github.com/ansible/ansible.git@devel
     molecule[lint]>=3, <4
     docker>=4.2, <4.3
diff --git a/roles/robertdebock.reboot/vars/main.yml b/roles/reboot/vars/main.yml
similarity index 100%
rename from roles/robertdebock.reboot/vars/main.yml
rename to roles/reboot/vars/main.yml
diff --git a/roles/requirements.yml b/roles/requirements.yml
index ccb73c8..cabb0af 100644
--- a/roles/requirements.yml
+++ b/roles/requirements.yml
@@ -1,23 +1,45 @@
 ---
 - src: robertdebock.ansible
+  name: ansible
 - src: robertdebock.ansible_lint
+  name: ansible_lint
 - src: robertdebock.ara
+  name: ara
 - src: robertdebock.atom
+  name: atom
 - src: robertdebock.bootstrap
+  name: bootstrap
 - src: robertdebock.buildtools
+  name: buildtools
 - src: robertdebock.common
+  name: common
 - src: robertdebock.docker
+  name: docker
 - src: robertdebock.epel
+  name: epel
 - src: robertdebock.fail2ban
+  name: fail2ban
 - src: robertdebock.git
+  name: git
 - src: robertdebock.investigate
+  name: investigate
 - src: robertdebock.molecule
+  name: molecule
 - src: robertdebock.postfix
+  name: postfix
 - src: robertdebock.python_pip
+  name: python_pip
 - src: robertdebock.reboot
+  name: reboot
 - src: robertdebock.ruby
+  name: ruby
 - src: robertdebock.service
+  name: service
 - src: robertdebock.travis
+  name: travis
 - src: robertdebock.update
+  name: update
 - src: robertdebock.users
+  name: users
 - src: robertdebock.vagrant
+  name: vagrant
diff --git a/roles/robertdebock.ansible/meta/.galaxy_install_info b/roles/robertdebock.ansible/meta/.galaxy_install_info
deleted file mode 100644
index 0538ac1..0000000
--- a/roles/robertdebock.ansible/meta/.galaxy_install_info
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 09:36:23 2020
-version: 2.3.3
diff --git a/roles/robertdebock.ansible_lint/meta/.galaxy_install_info b/roles/robertdebock.ansible_lint/meta/.galaxy_install_info
deleted file mode 100644
index 5d95aa0..0000000
--- a/roles/robertdebock.ansible_lint/meta/.galaxy_install_info
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 09:36:26 2020
-version: 2.3.12
diff --git a/roles/robertdebock.ara/meta/.galaxy_install_info b/roles/robertdebock.ara/meta/.galaxy_install_info
deleted file mode 100644
index 8af3878..0000000
--- a/roles/robertdebock.ara/meta/.galaxy_install_info
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 09:36:29 2020
-version: 2.5.2
diff --git a/roles/robertdebock.atom/meta/.galaxy_install_info b/roles/robertdebock.atom/meta/.galaxy_install_info
deleted file mode 100644
index 5532bcf..0000000
--- a/roles/robertdebock.atom/meta/.galaxy_install_info
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 09:36:32 2020
-version: 2.5.1
diff --git a/roles/robertdebock.bootstrap/meta/.galaxy_install_info b/roles/robertdebock.bootstrap/meta/.galaxy_install_info
deleted file mode 100644
index 3aecda9..0000000
--- a/roles/robertdebock.bootstrap/meta/.galaxy_install_info
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 09:36:35 2020
-version: 4.2.7
diff --git a/roles/robertdebock.buildtools/meta/.galaxy_install_info b/roles/robertdebock.buildtools/meta/.galaxy_install_info
deleted file mode 100644
index 89542e7..0000000
--- a/roles/robertdebock.buildtools/meta/.galaxy_install_info
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 09:36:38 2020
-version: 2.4.15
diff --git a/roles/robertdebock.common/meta/.galaxy_install_info b/roles/robertdebock.common/meta/.galaxy_install_info
deleted file mode 100644
index a15c927..0000000
--- a/roles/robertdebock.common/meta/.galaxy_install_info
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 09:36:41 2020
-version: 3.3.4
diff --git a/roles/robertdebock.docker/meta/.galaxy_install_info b/roles/robertdebock.docker/meta/.galaxy_install_info
deleted file mode 100644
index 8af909d..0000000
--- a/roles/robertdebock.docker/meta/.galaxy_install_info
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 09:36:43 2020
-version: 2.4.3
diff --git a/roles/robertdebock.epel/meta/.galaxy_install_info b/roles/robertdebock.epel/meta/.galaxy_install_info
deleted file mode 100644
index baac4f7..0000000
--- a/roles/robertdebock.epel/meta/.galaxy_install_info
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 09:36:46 2020
-version: 2.5.1
diff --git a/roles/robertdebock.fail2ban/meta/.galaxy_install_info b/roles/robertdebock.fail2ban/meta/.galaxy_install_info
deleted file mode 100644
index 6a48ae9..0000000
--- a/roles/robertdebock.fail2ban/meta/.galaxy_install_info
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 09:36:48 2020
-version: 3.1.4
diff --git a/roles/robertdebock.git/meta/.galaxy_install_info b/roles/robertdebock.git/meta/.galaxy_install_info
deleted file mode 100644
index f62f93c..0000000
--- a/roles/robertdebock.git/meta/.galaxy_install_info
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 09:36:51 2020
-version: 3.3.5
diff --git a/roles/robertdebock.investigate/meta/.galaxy_install_info b/roles/robertdebock.investigate/meta/.galaxy_install_info
deleted file mode 100644
index 575f104..0000000
--- a/roles/robertdebock.investigate/meta/.galaxy_install_info
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 09:36:53 2020
-version: 2.3.4
diff --git a/roles/robertdebock.molecule/meta/.galaxy_install_info b/roles/robertdebock.molecule/meta/.galaxy_install_info
deleted file mode 100644
index dccbe9e..0000000
--- a/roles/robertdebock.molecule/meta/.galaxy_install_info
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 09:36:55 2020
-version: 2.3.1
diff --git a/roles/robertdebock.postfix/meta/.galaxy_install_info b/roles/robertdebock.postfix/meta/.galaxy_install_info
deleted file mode 100644
index d4d07da..0000000
--- a/roles/robertdebock.postfix/meta/.galaxy_install_info
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 09:36:57 2020
-version: 3.3.2
diff --git a/roles/robertdebock.python_pip/meta/.galaxy_install_info b/roles/robertdebock.python_pip/meta/.galaxy_install_info
deleted file mode 100644
index de1c552..0000000
--- a/roles/robertdebock.python_pip/meta/.galaxy_install_info
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 09:37:00 2020
-version: 3.3.11
diff --git a/roles/robertdebock.reboot/meta/.galaxy_install_info b/roles/robertdebock.reboot/meta/.galaxy_install_info
deleted file mode 100644
index badafb5..0000000
--- a/roles/robertdebock.reboot/meta/.galaxy_install_info
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 09:37:03 2020
-version: 2.6.2
diff --git a/roles/robertdebock.ruby/meta/.galaxy_install_info b/roles/robertdebock.ruby/meta/.galaxy_install_info
deleted file mode 100644
index e275765..0000000
--- a/roles/robertdebock.ruby/meta/.galaxy_install_info
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 09:37:06 2020
-version: 2.2.9
diff --git a/roles/robertdebock.service/meta/.galaxy_install_info b/roles/robertdebock.service/meta/.galaxy_install_info
deleted file mode 100644
index dc26d5a..0000000
--- a/roles/robertdebock.service/meta/.galaxy_install_info
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 09:34:22 2020
-version: 2.6.6
diff --git a/roles/robertdebock.travis/meta/.galaxy_install_info b/roles/robertdebock.travis/meta/.galaxy_install_info
deleted file mode 100644
index 8fd7767..0000000
--- a/roles/robertdebock.travis/meta/.galaxy_install_info
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 09:37:08 2020
-version: 3.0.5
diff --git a/roles/robertdebock.update/meta/.galaxy_install_info b/roles/robertdebock.update/meta/.galaxy_install_info
deleted file mode 100644
index 2270c1a..0000000
--- a/roles/robertdebock.update/meta/.galaxy_install_info
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 09:37:11 2020
-version: 2.3.3
diff --git a/roles/robertdebock.users/meta/.galaxy_install_info b/roles/robertdebock.users/meta/.galaxy_install_info
deleted file mode 100644
index 8669798..0000000
--- a/roles/robertdebock.users/meta/.galaxy_install_info
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 09:37:14 2020
-version: 4.3.3
diff --git a/roles/robertdebock.vagrant/meta/.galaxy_install_info b/roles/robertdebock.vagrant/meta/.galaxy_install_info
deleted file mode 100644
index e8570e2..0000000
--- a/roles/robertdebock.vagrant/meta/.galaxy_install_info
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 09:37:16 2020
-version: 3.2.0
diff --git a/roles/robertdebock.reboot/.ansible-lint b/roles/ruby/.ansible-lint
similarity index 100%
rename from roles/robertdebock.reboot/.ansible-lint
rename to roles/ruby/.ansible-lint
diff --git a/roles/robertdebock.ruby/.github/FUNDING.yml b/roles/ruby/.github/FUNDING.yml
similarity index 100%
rename from roles/robertdebock.ruby/.github/FUNDING.yml
rename to roles/ruby/.github/FUNDING.yml
diff --git a/roles/robertdebock.ruby/.github/ISSUE_TEMPLATE/bug_report.md b/roles/ruby/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 100%
rename from roles/robertdebock.ruby/.github/ISSUE_TEMPLATE/bug_report.md
rename to roles/ruby/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/roles/robertdebock.ruby/.github/ISSUE_TEMPLATE/feature_request.md b/roles/ruby/.github/ISSUE_TEMPLATE/feature_request.md
similarity index 100%
rename from roles/robertdebock.ruby/.github/ISSUE_TEMPLATE/feature_request.md
rename to roles/ruby/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/roles/robertdebock.ruby/.github/pull_request_template.md b/roles/ruby/.github/pull_request_template.md
similarity index 100%
rename from roles/robertdebock.ruby/.github/pull_request_template.md
rename to roles/ruby/.github/pull_request_template.md
diff --git a/roles/robertdebock.ruby/.github/settings.yml b/roles/ruby/.github/settings.yml
similarity index 100%
rename from roles/robertdebock.ruby/.github/settings.yml
rename to roles/ruby/.github/settings.yml
diff --git a/roles/robertdebock.ruby/.github/workflows/galaxy.yml b/roles/ruby/.github/workflows/galaxy.yml
similarity index 100%
rename from roles/robertdebock.ruby/.github/workflows/galaxy.yml
rename to roles/ruby/.github/workflows/galaxy.yml
diff --git a/roles/robertdebock.reboot/.github/workflows/molecule.yml b/roles/ruby/.github/workflows/molecule.yml
similarity index 100%
rename from roles/robertdebock.reboot/.github/workflows/molecule.yml
rename to roles/ruby/.github/workflows/molecule.yml
diff --git a/roles/robertdebock.ruby/.gitignore b/roles/ruby/.gitignore
similarity index 100%
rename from roles/robertdebock.ruby/.gitignore
rename to roles/ruby/.gitignore
diff --git a/roles/robertdebock.ruby/.travis.yml b/roles/ruby/.travis.yml
similarity index 100%
rename from roles/robertdebock.ruby/.travis.yml
rename to roles/ruby/.travis.yml
diff --git a/roles/robertdebock.reboot/.yamllint b/roles/ruby/.yamllint
similarity index 100%
rename from roles/robertdebock.reboot/.yamllint
rename to roles/ruby/.yamllint
diff --git a/roles/robertdebock.ruby/CODE_OF_CONDUCT.md b/roles/ruby/CODE_OF_CONDUCT.md
similarity index 100%
rename from roles/robertdebock.ruby/CODE_OF_CONDUCT.md
rename to roles/ruby/CODE_OF_CONDUCT.md
diff --git a/roles/robertdebock.ruby/CONTRIBUTING.md b/roles/ruby/CONTRIBUTING.md
similarity index 100%
rename from roles/robertdebock.ruby/CONTRIBUTING.md
rename to roles/ruby/CONTRIBUTING.md
diff --git a/roles/robertdebock.ruby/LICENSE b/roles/ruby/LICENSE
similarity index 100%
rename from roles/robertdebock.ruby/LICENSE
rename to roles/ruby/LICENSE
diff --git a/roles/robertdebock.ruby/README.md b/roles/ruby/README.md
similarity index 100%
rename from roles/robertdebock.ruby/README.md
rename to roles/ruby/README.md
diff --git a/roles/robertdebock.ruby/SECURITY.md b/roles/ruby/SECURITY.md
similarity index 100%
rename from roles/robertdebock.ruby/SECURITY.md
rename to roles/ruby/SECURITY.md
diff --git a/roles/ruby/meta/.galaxy_install_info b/roles/ruby/meta/.galaxy_install_info
new file mode 100644
index 0000000..eeb3a8e
--- /dev/null
+++ b/roles/ruby/meta/.galaxy_install_info
@@ -0,0 +1,2 @@
+install_date: Mon Sep 28 13:22:36 2020
+version: 2.2.9
diff --git a/roles/robertdebock.ruby/meta/main.yml b/roles/ruby/meta/main.yml
similarity index 100%
rename from roles/robertdebock.ruby/meta/main.yml
rename to roles/ruby/meta/main.yml
diff --git a/roles/robertdebock.ruby/meta/preferences.yml b/roles/ruby/meta/preferences.yml
similarity index 100%
rename from roles/robertdebock.ruby/meta/preferences.yml
rename to roles/ruby/meta/preferences.yml
diff --git a/roles/robertdebock.ruby/molecule/default/converge.yml b/roles/ruby/molecule/default/converge.yml
similarity index 100%
rename from roles/robertdebock.ruby/molecule/default/converge.yml
rename to roles/ruby/molecule/default/converge.yml
diff --git a/roles/robertdebock.ruby/molecule/default/molecule.yml b/roles/ruby/molecule/default/molecule.yml
similarity index 100%
rename from roles/robertdebock.ruby/molecule/default/molecule.yml
rename to roles/ruby/molecule/default/molecule.yml
diff --git a/roles/robertdebock.ruby/molecule/default/prepare.yml b/roles/ruby/molecule/default/prepare.yml
similarity index 100%
rename from roles/robertdebock.ruby/molecule/default/prepare.yml
rename to roles/ruby/molecule/default/prepare.yml
diff --git a/roles/robertdebock.reboot/molecule/default/verify.yml b/roles/ruby/molecule/default/verify.yml
similarity index 100%
rename from roles/robertdebock.reboot/molecule/default/verify.yml
rename to roles/ruby/molecule/default/verify.yml
diff --git a/roles/robertdebock.ruby/requirements.yml b/roles/ruby/requirements.yml
similarity index 100%
rename from roles/robertdebock.ruby/requirements.yml
rename to roles/ruby/requirements.yml
diff --git a/roles/robertdebock.ruby/tasks/main.yml b/roles/ruby/tasks/main.yml
similarity index 100%
rename from roles/robertdebock.ruby/tasks/main.yml
rename to roles/ruby/tasks/main.yml
diff --git a/roles/robertdebock.reboot/tox.ini b/roles/ruby/tox.ini
similarity index 100%
rename from roles/robertdebock.reboot/tox.ini
rename to roles/ruby/tox.ini
diff --git a/roles/robertdebock.ruby/vars/main.yml b/roles/ruby/vars/main.yml
similarity index 100%
rename from roles/robertdebock.ruby/vars/main.yml
rename to roles/ruby/vars/main.yml
diff --git a/roles/robertdebock.users/.ansible-lint b/roles/service/.ansible-lint
similarity index 100%
rename from roles/robertdebock.users/.ansible-lint
rename to roles/service/.ansible-lint
diff --git a/roles/robertdebock.service/.github/FUNDING.yml b/roles/service/.github/FUNDING.yml
similarity index 100%
rename from roles/robertdebock.service/.github/FUNDING.yml
rename to roles/service/.github/FUNDING.yml
diff --git a/roles/robertdebock.service/.github/ISSUE_TEMPLATE/bug_report.md b/roles/service/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 100%
rename from roles/robertdebock.service/.github/ISSUE_TEMPLATE/bug_report.md
rename to roles/service/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/roles/robertdebock.service/.github/ISSUE_TEMPLATE/feature_request.md b/roles/service/.github/ISSUE_TEMPLATE/feature_request.md
similarity index 100%
rename from roles/robertdebock.service/.github/ISSUE_TEMPLATE/feature_request.md
rename to roles/service/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/roles/robertdebock.service/.github/pull_request_template.md b/roles/service/.github/pull_request_template.md
similarity index 100%
rename from roles/robertdebock.service/.github/pull_request_template.md
rename to roles/service/.github/pull_request_template.md
diff --git a/roles/robertdebock.service/.github/settings.yml b/roles/service/.github/settings.yml
similarity index 100%
rename from roles/robertdebock.service/.github/settings.yml
rename to roles/service/.github/settings.yml
diff --git a/roles/robertdebock.service/.github/workflows/galaxy.yml b/roles/service/.github/workflows/galaxy.yml
similarity index 100%
rename from roles/robertdebock.service/.github/workflows/galaxy.yml
rename to roles/service/.github/workflows/galaxy.yml
diff --git a/roles/robertdebock.service/.github/workflows/molecule.yml b/roles/service/.github/workflows/molecule.yml
similarity index 100%
rename from roles/robertdebock.service/.github/workflows/molecule.yml
rename to roles/service/.github/workflows/molecule.yml
diff --git a/roles/robertdebock.service/.gitignore b/roles/service/.gitignore
similarity index 100%
rename from roles/robertdebock.service/.gitignore
rename to roles/service/.gitignore
diff --git a/roles/robertdebock.service/.travis.yml b/roles/service/.travis.yml
similarity index 100%
rename from roles/robertdebock.service/.travis.yml
rename to roles/service/.travis.yml
diff --git a/roles/robertdebock.users/.yamllint b/roles/service/.yamllint
similarity index 100%
rename from roles/robertdebock.users/.yamllint
rename to roles/service/.yamllint
diff --git a/roles/robertdebock.service/CODE_OF_CONDUCT.md b/roles/service/CODE_OF_CONDUCT.md
similarity index 100%
rename from roles/robertdebock.service/CODE_OF_CONDUCT.md
rename to roles/service/CODE_OF_CONDUCT.md
diff --git a/roles/robertdebock.service/CONTRIBUTING.md b/roles/service/CONTRIBUTING.md
similarity index 100%
rename from roles/robertdebock.service/CONTRIBUTING.md
rename to roles/service/CONTRIBUTING.md
diff --git a/roles/robertdebock.service/LICENSE b/roles/service/LICENSE
similarity index 100%
rename from roles/robertdebock.service/LICENSE
rename to roles/service/LICENSE
diff --git a/roles/robertdebock.service/README.md b/roles/service/README.md
similarity index 100%
rename from roles/robertdebock.service/README.md
rename to roles/service/README.md
diff --git a/roles/robertdebock.service/SECURITY.md b/roles/service/SECURITY.md
similarity index 100%
rename from roles/robertdebock.service/SECURITY.md
rename to roles/service/SECURITY.md
diff --git a/roles/robertdebock.service/defaults/main.yml b/roles/service/defaults/main.yml
similarity index 100%
rename from roles/robertdebock.service/defaults/main.yml
rename to roles/service/defaults/main.yml
diff --git a/roles/robertdebock.service/handlers/main.yml b/roles/service/handlers/main.yml
similarity index 100%
rename from roles/robertdebock.service/handlers/main.yml
rename to roles/service/handlers/main.yml
diff --git a/roles/service/meta/.galaxy_install_info b/roles/service/meta/.galaxy_install_info
new file mode 100644
index 0000000..e94ab9c
--- /dev/null
+++ b/roles/service/meta/.galaxy_install_info
@@ -0,0 +1,2 @@
+install_date: Mon Sep 28 13:22:39 2020
+version: 2.6.6
diff --git a/roles/robertdebock.service/meta/main.yml b/roles/service/meta/main.yml
similarity index 100%
rename from roles/robertdebock.service/meta/main.yml
rename to roles/service/meta/main.yml
diff --git a/roles/robertdebock.service/meta/preferences.yml b/roles/service/meta/preferences.yml
similarity index 100%
rename from roles/robertdebock.service/meta/preferences.yml
rename to roles/service/meta/preferences.yml
diff --git a/roles/robertdebock.service/molecule/default/converge.yml b/roles/service/molecule/default/converge.yml
similarity index 100%
rename from roles/robertdebock.service/molecule/default/converge.yml
rename to roles/service/molecule/default/converge.yml
diff --git a/roles/robertdebock.service/molecule/default/molecule.yml b/roles/service/molecule/default/molecule.yml
similarity index 100%
rename from roles/robertdebock.service/molecule/default/molecule.yml
rename to roles/service/molecule/default/molecule.yml
diff --git a/roles/robertdebock.service/molecule/default/prepare.yml b/roles/service/molecule/default/prepare.yml
similarity index 100%
rename from roles/robertdebock.service/molecule/default/prepare.yml
rename to roles/service/molecule/default/prepare.yml
diff --git a/roles/robertdebock.service/molecule/default/verify.yml b/roles/service/molecule/default/verify.yml
similarity index 100%
rename from roles/robertdebock.service/molecule/default/verify.yml
rename to roles/service/molecule/default/verify.yml
diff --git a/roles/robertdebock.service/requirements.yml b/roles/service/requirements.yml
similarity index 100%
rename from roles/robertdebock.service/requirements.yml
rename to roles/service/requirements.yml
diff --git a/roles/robertdebock.service/tasks/assert.yml b/roles/service/tasks/assert.yml
similarity index 100%
rename from roles/robertdebock.service/tasks/assert.yml
rename to roles/service/tasks/assert.yml
diff --git a/roles/robertdebock.service/tasks/main.yml b/roles/service/tasks/main.yml
similarity index 100%
rename from roles/robertdebock.service/tasks/main.yml
rename to roles/service/tasks/main.yml
diff --git a/roles/robertdebock.service/templates/.gitkeep b/roles/service/templates/.gitkeep
similarity index 100%
rename from roles/robertdebock.service/templates/.gitkeep
rename to roles/service/templates/.gitkeep
diff --git a/roles/robertdebock.service/templates/systemd.j2 b/roles/service/templates/systemd.j2
similarity index 100%
rename from roles/robertdebock.service/templates/systemd.j2
rename to roles/service/templates/systemd.j2
diff --git a/roles/robertdebock.service/templates/sysvinit.j2 b/roles/service/templates/sysvinit.j2
similarity index 100%
rename from roles/robertdebock.service/templates/sysvinit.j2
rename to roles/service/templates/sysvinit.j2
diff --git a/roles/robertdebock.ruby/tox.ini b/roles/service/tox.ini
similarity index 100%
rename from roles/robertdebock.ruby/tox.ini
rename to roles/service/tox.ini
diff --git a/roles/robertdebock.service/vars/main.yml b/roles/service/vars/main.yml
similarity index 100%
rename from roles/robertdebock.service/vars/main.yml
rename to roles/service/vars/main.yml
diff --git a/roles/robertdebock.travis/.ansible-lint b/roles/travis/.ansible-lint
similarity index 100%
rename from roles/robertdebock.travis/.ansible-lint
rename to roles/travis/.ansible-lint
diff --git a/roles/robertdebock.travis/.github/FUNDING.yml b/roles/travis/.github/FUNDING.yml
similarity index 100%
rename from roles/robertdebock.travis/.github/FUNDING.yml
rename to roles/travis/.github/FUNDING.yml
diff --git a/roles/robertdebock.travis/.github/ISSUE_TEMPLATE/bug_report.md b/roles/travis/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 100%
rename from roles/robertdebock.travis/.github/ISSUE_TEMPLATE/bug_report.md
rename to roles/travis/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/roles/robertdebock.travis/.github/ISSUE_TEMPLATE/feature_request.md b/roles/travis/.github/ISSUE_TEMPLATE/feature_request.md
similarity index 100%
rename from roles/robertdebock.travis/.github/ISSUE_TEMPLATE/feature_request.md
rename to roles/travis/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/roles/robertdebock.travis/.github/pull_request_template.md b/roles/travis/.github/pull_request_template.md
similarity index 100%
rename from roles/robertdebock.travis/.github/pull_request_template.md
rename to roles/travis/.github/pull_request_template.md
diff --git a/roles/robertdebock.travis/.github/settings.yml b/roles/travis/.github/settings.yml
similarity index 100%
rename from roles/robertdebock.travis/.github/settings.yml
rename to roles/travis/.github/settings.yml
diff --git a/roles/robertdebock.travis/.github/workflows/galaxy.yml b/roles/travis/.github/workflows/galaxy.yml
similarity index 100%
rename from roles/robertdebock.travis/.github/workflows/galaxy.yml
rename to roles/travis/.github/workflows/galaxy.yml
diff --git a/roles/robertdebock.travis/.github/workflows/molecule.yml b/roles/travis/.github/workflows/molecule.yml
similarity index 100%
rename from roles/robertdebock.travis/.github/workflows/molecule.yml
rename to roles/travis/.github/workflows/molecule.yml
diff --git a/roles/robertdebock.travis/.gitignore b/roles/travis/.gitignore
similarity index 100%
rename from roles/robertdebock.travis/.gitignore
rename to roles/travis/.gitignore
diff --git a/roles/robertdebock.travis/.travis.yml b/roles/travis/.travis.yml
similarity index 100%
rename from roles/robertdebock.travis/.travis.yml
rename to roles/travis/.travis.yml
diff --git a/roles/robertdebock.ruby/.yamllint b/roles/travis/.yamllint
similarity index 100%
rename from roles/robertdebock.ruby/.yamllint
rename to roles/travis/.yamllint
diff --git a/roles/robertdebock.travis/CODE_OF_CONDUCT.md b/roles/travis/CODE_OF_CONDUCT.md
similarity index 100%
rename from roles/robertdebock.travis/CODE_OF_CONDUCT.md
rename to roles/travis/CODE_OF_CONDUCT.md
diff --git a/roles/robertdebock.travis/CONTRIBUTING.md b/roles/travis/CONTRIBUTING.md
similarity index 100%
rename from roles/robertdebock.travis/CONTRIBUTING.md
rename to roles/travis/CONTRIBUTING.md
diff --git a/roles/robertdebock.travis/LICENSE b/roles/travis/LICENSE
similarity index 100%
rename from roles/robertdebock.travis/LICENSE
rename to roles/travis/LICENSE
diff --git a/roles/robertdebock.travis/README.md b/roles/travis/README.md
similarity index 100%
rename from roles/robertdebock.travis/README.md
rename to roles/travis/README.md
diff --git a/roles/robertdebock.travis/SECURITY.md b/roles/travis/SECURITY.md
similarity index 100%
rename from roles/robertdebock.travis/SECURITY.md
rename to roles/travis/SECURITY.md
diff --git a/roles/travis/meta/.galaxy_install_info b/roles/travis/meta/.galaxy_install_info
new file mode 100644
index 0000000..55d8aae
--- /dev/null
+++ b/roles/travis/meta/.galaxy_install_info
@@ -0,0 +1,2 @@
+install_date: Mon Sep 28 13:22:41 2020
+version: 3.0.5
diff --git a/roles/robertdebock.travis/meta/exception.yml b/roles/travis/meta/exception.yml
similarity index 100%
rename from roles/robertdebock.travis/meta/exception.yml
rename to roles/travis/meta/exception.yml
diff --git a/roles/robertdebock.travis/meta/main.yml b/roles/travis/meta/main.yml
similarity index 100%
rename from roles/robertdebock.travis/meta/main.yml
rename to roles/travis/meta/main.yml
diff --git a/roles/robertdebock.travis/meta/preferences.yml b/roles/travis/meta/preferences.yml
similarity index 100%
rename from roles/robertdebock.travis/meta/preferences.yml
rename to roles/travis/meta/preferences.yml
diff --git a/roles/robertdebock.travis/molecule/default/converge.yml b/roles/travis/molecule/default/converge.yml
similarity index 100%
rename from roles/robertdebock.travis/molecule/default/converge.yml
rename to roles/travis/molecule/default/converge.yml
diff --git a/roles/robertdebock.travis/molecule/default/molecule.yml b/roles/travis/molecule/default/molecule.yml
similarity index 100%
rename from roles/robertdebock.travis/molecule/default/molecule.yml
rename to roles/travis/molecule/default/molecule.yml
diff --git a/roles/robertdebock.travis/molecule/default/prepare.yml b/roles/travis/molecule/default/prepare.yml
similarity index 100%
rename from roles/robertdebock.travis/molecule/default/prepare.yml
rename to roles/travis/molecule/default/prepare.yml
diff --git a/roles/robertdebock.ruby/molecule/default/verify.yml b/roles/travis/molecule/default/verify.yml
similarity index 100%
rename from roles/robertdebock.ruby/molecule/default/verify.yml
rename to roles/travis/molecule/default/verify.yml
diff --git a/roles/robertdebock.travis/requirements.yml b/roles/travis/requirements.yml
similarity index 100%
rename from roles/robertdebock.travis/requirements.yml
rename to roles/travis/requirements.yml
diff --git a/roles/robertdebock.travis/tasks/main.yml b/roles/travis/tasks/main.yml
similarity index 100%
rename from roles/robertdebock.travis/tasks/main.yml
rename to roles/travis/tasks/main.yml
diff --git a/roles/robertdebock.service/tox.ini b/roles/travis/tox.ini
similarity index 100%
rename from roles/robertdebock.service/tox.ini
rename to roles/travis/tox.ini
diff --git a/roles/robertdebock.travis/vars/main.yml b/roles/travis/vars/main.yml
similarity index 100%
rename from roles/robertdebock.travis/vars/main.yml
rename to roles/travis/vars/main.yml
diff --git a/roles/robertdebock.update/.ansible-lint b/roles/update/.ansible-lint
similarity index 100%
rename from roles/robertdebock.update/.ansible-lint
rename to roles/update/.ansible-lint
diff --git a/roles/robertdebock.update/.github/FUNDING.yml b/roles/update/.github/FUNDING.yml
similarity index 100%
rename from roles/robertdebock.update/.github/FUNDING.yml
rename to roles/update/.github/FUNDING.yml
diff --git a/roles/robertdebock.update/.github/ISSUE_TEMPLATE/bug_report.md b/roles/update/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 100%
rename from roles/robertdebock.update/.github/ISSUE_TEMPLATE/bug_report.md
rename to roles/update/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/roles/robertdebock.update/.github/ISSUE_TEMPLATE/feature_request.md b/roles/update/.github/ISSUE_TEMPLATE/feature_request.md
similarity index 100%
rename from roles/robertdebock.update/.github/ISSUE_TEMPLATE/feature_request.md
rename to roles/update/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/roles/robertdebock.update/.github/pull_request_template.md b/roles/update/.github/pull_request_template.md
similarity index 100%
rename from roles/robertdebock.update/.github/pull_request_template.md
rename to roles/update/.github/pull_request_template.md
diff --git a/roles/robertdebock.update/.github/settings.yml b/roles/update/.github/settings.yml
similarity index 100%
rename from roles/robertdebock.update/.github/settings.yml
rename to roles/update/.github/settings.yml
diff --git a/roles/robertdebock.update/.github/workflows/galaxy.yml b/roles/update/.github/workflows/galaxy.yml
similarity index 100%
rename from roles/robertdebock.update/.github/workflows/galaxy.yml
rename to roles/update/.github/workflows/galaxy.yml
diff --git a/roles/robertdebock.update/.github/workflows/molecule.yml b/roles/update/.github/workflows/molecule.yml
similarity index 100%
rename from roles/robertdebock.update/.github/workflows/molecule.yml
rename to roles/update/.github/workflows/molecule.yml
diff --git a/roles/robertdebock.update/.gitignore b/roles/update/.gitignore
similarity index 100%
rename from roles/robertdebock.update/.gitignore
rename to roles/update/.gitignore
diff --git a/roles/robertdebock.update/.travis.yml b/roles/update/.travis.yml
similarity index 100%
rename from roles/robertdebock.update/.travis.yml
rename to roles/update/.travis.yml
diff --git a/roles/robertdebock.travis/.yamllint b/roles/update/.yamllint
similarity index 100%
rename from roles/robertdebock.travis/.yamllint
rename to roles/update/.yamllint
diff --git a/roles/robertdebock.update/CODE_OF_CONDUCT.md b/roles/update/CODE_OF_CONDUCT.md
similarity index 100%
rename from roles/robertdebock.update/CODE_OF_CONDUCT.md
rename to roles/update/CODE_OF_CONDUCT.md
diff --git a/roles/robertdebock.update/CONTRIBUTING.md b/roles/update/CONTRIBUTING.md
similarity index 100%
rename from roles/robertdebock.update/CONTRIBUTING.md
rename to roles/update/CONTRIBUTING.md
diff --git a/roles/robertdebock.update/LICENSE b/roles/update/LICENSE
similarity index 100%
rename from roles/robertdebock.update/LICENSE
rename to roles/update/LICENSE
diff --git a/roles/robertdebock.update/README.md b/roles/update/README.md
similarity index 100%
rename from roles/robertdebock.update/README.md
rename to roles/update/README.md
diff --git a/roles/robertdebock.update/SECURITY.md b/roles/update/SECURITY.md
similarity index 100%
rename from roles/robertdebock.update/SECURITY.md
rename to roles/update/SECURITY.md
diff --git a/roles/robertdebock.update/defaults/main.yml b/roles/update/defaults/main.yml
similarity index 100%
rename from roles/robertdebock.update/defaults/main.yml
rename to roles/update/defaults/main.yml
diff --git a/roles/robertdebock.update/handlers/main.yml b/roles/update/handlers/main.yml
similarity index 100%
rename from roles/robertdebock.update/handlers/main.yml
rename to roles/update/handlers/main.yml
diff --git a/roles/update/meta/.galaxy_install_info b/roles/update/meta/.galaxy_install_info
new file mode 100644
index 0000000..2b3b846
--- /dev/null
+++ b/roles/update/meta/.galaxy_install_info
@@ -0,0 +1,2 @@
+install_date: Mon Sep 28 13:22:43 2020
+version: 2.3.3
diff --git a/roles/robertdebock.update/meta/exception.yml b/roles/update/meta/exception.yml
similarity index 100%
rename from roles/robertdebock.update/meta/exception.yml
rename to roles/update/meta/exception.yml
diff --git a/roles/robertdebock.update/meta/main.yml b/roles/update/meta/main.yml
similarity index 100%
rename from roles/robertdebock.update/meta/main.yml
rename to roles/update/meta/main.yml
diff --git a/roles/robertdebock.update/meta/preferences.yml b/roles/update/meta/preferences.yml
similarity index 100%
rename from roles/robertdebock.update/meta/preferences.yml
rename to roles/update/meta/preferences.yml
diff --git a/roles/robertdebock.update/molecule/default/converge.yml b/roles/update/molecule/default/converge.yml
similarity index 100%
rename from roles/robertdebock.update/molecule/default/converge.yml
rename to roles/update/molecule/default/converge.yml
diff --git a/roles/robertdebock.update/molecule/default/molecule.yml b/roles/update/molecule/default/molecule.yml
similarity index 100%
rename from roles/robertdebock.update/molecule/default/molecule.yml
rename to roles/update/molecule/default/molecule.yml
diff --git a/roles/robertdebock.update/molecule/default/prepare.yml b/roles/update/molecule/default/prepare.yml
similarity index 100%
rename from roles/robertdebock.update/molecule/default/prepare.yml
rename to roles/update/molecule/default/prepare.yml
diff --git a/roles/robertdebock.travis/molecule/default/verify.yml b/roles/update/molecule/default/verify.yml
similarity index 100%
rename from roles/robertdebock.travis/molecule/default/verify.yml
rename to roles/update/molecule/default/verify.yml
diff --git a/roles/robertdebock.update/requirements.yml b/roles/update/requirements.yml
similarity index 100%
rename from roles/robertdebock.update/requirements.yml
rename to roles/update/requirements.yml
diff --git a/roles/robertdebock.update/tasks/assert.yml b/roles/update/tasks/assert.yml
similarity index 100%
rename from roles/robertdebock.update/tasks/assert.yml
rename to roles/update/tasks/assert.yml
diff --git a/roles/robertdebock.update/tasks/main.yml b/roles/update/tasks/main.yml
similarity index 100%
rename from roles/robertdebock.update/tasks/main.yml
rename to roles/update/tasks/main.yml
diff --git a/roles/robertdebock.travis/tox.ini b/roles/update/tox.ini
similarity index 100%
rename from roles/robertdebock.travis/tox.ini
rename to roles/update/tox.ini
diff --git a/roles/robertdebock.ruby/.ansible-lint b/roles/users/.ansible-lint
similarity index 89%
rename from roles/robertdebock.ruby/.ansible-lint
rename to roles/users/.ansible-lint
index acb2d05..cb2872e 100644
--- a/roles/robertdebock.ruby/.ansible-lint
+++ b/roles/users/.ansible-lint
@@ -4,3 +4,4 @@
 exclude_paths:
   - ./meta/preferences.yml
   - ./molecule/default/verify.yml
+  - ./.tox
diff --git a/roles/robertdebock.users/.github/FUNDING.yml b/roles/users/.github/FUNDING.yml
similarity index 100%
rename from roles/robertdebock.users/.github/FUNDING.yml
rename to roles/users/.github/FUNDING.yml
diff --git a/roles/robertdebock.users/.github/ISSUE_TEMPLATE/bug_report.md b/roles/users/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 100%
rename from roles/robertdebock.users/.github/ISSUE_TEMPLATE/bug_report.md
rename to roles/users/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/roles/robertdebock.users/.github/ISSUE_TEMPLATE/feature_request.md b/roles/users/.github/ISSUE_TEMPLATE/feature_request.md
similarity index 100%
rename from roles/robertdebock.users/.github/ISSUE_TEMPLATE/feature_request.md
rename to roles/users/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/roles/robertdebock.users/.github/pull_request_template.md b/roles/users/.github/pull_request_template.md
similarity index 100%
rename from roles/robertdebock.users/.github/pull_request_template.md
rename to roles/users/.github/pull_request_template.md
diff --git a/roles/robertdebock.users/.github/settings.yml b/roles/users/.github/settings.yml
similarity index 100%
rename from roles/robertdebock.users/.github/settings.yml
rename to roles/users/.github/settings.yml
diff --git a/roles/robertdebock.users/.github/workflows/galaxy.yml b/roles/users/.github/workflows/galaxy.yml
similarity index 100%
rename from roles/robertdebock.users/.github/workflows/galaxy.yml
rename to roles/users/.github/workflows/galaxy.yml
diff --git a/roles/robertdebock.users/.github/workflows/molecule.yml b/roles/users/.github/workflows/molecule.yml
similarity index 100%
rename from roles/robertdebock.users/.github/workflows/molecule.yml
rename to roles/users/.github/workflows/molecule.yml
diff --git a/roles/robertdebock.users/.gitignore b/roles/users/.gitignore
similarity index 100%
rename from roles/robertdebock.users/.gitignore
rename to roles/users/.gitignore
diff --git a/roles/robertdebock.users/.travis.yml b/roles/users/.travis.yml
similarity index 100%
rename from roles/robertdebock.users/.travis.yml
rename to roles/users/.travis.yml
diff --git a/roles/robertdebock.vagrant/.yamllint b/roles/users/.yamllint
similarity index 100%
rename from roles/robertdebock.vagrant/.yamllint
rename to roles/users/.yamllint
diff --git a/roles/robertdebock.users/CODE_OF_CONDUCT.md b/roles/users/CODE_OF_CONDUCT.md
similarity index 100%
rename from roles/robertdebock.users/CODE_OF_CONDUCT.md
rename to roles/users/CODE_OF_CONDUCT.md
diff --git a/roles/robertdebock.users/CONTRIBUTING.md b/roles/users/CONTRIBUTING.md
similarity index 100%
rename from roles/robertdebock.users/CONTRIBUTING.md
rename to roles/users/CONTRIBUTING.md
diff --git a/roles/robertdebock.users/LICENSE b/roles/users/LICENSE
similarity index 100%
rename from roles/robertdebock.users/LICENSE
rename to roles/users/LICENSE
diff --git a/roles/robertdebock.users/README.md b/roles/users/README.md
similarity index 100%
rename from roles/robertdebock.users/README.md
rename to roles/users/README.md
diff --git a/roles/robertdebock.users/SECURITY.md b/roles/users/SECURITY.md
similarity index 100%
rename from roles/robertdebock.users/SECURITY.md
rename to roles/users/SECURITY.md
diff --git a/roles/robertdebock.users/defaults/main.yml b/roles/users/defaults/main.yml
similarity index 100%
rename from roles/robertdebock.users/defaults/main.yml
rename to roles/users/defaults/main.yml
diff --git a/roles/users/meta/.galaxy_install_info b/roles/users/meta/.galaxy_install_info
new file mode 100644
index 0000000..54407be
--- /dev/null
+++ b/roles/users/meta/.galaxy_install_info
@@ -0,0 +1,2 @@
+install_date: Mon Sep 28 13:22:46 2020
+version: 4.3.3
diff --git a/roles/robertdebock.users/meta/main.yml b/roles/users/meta/main.yml
similarity index 100%
rename from roles/robertdebock.users/meta/main.yml
rename to roles/users/meta/main.yml
diff --git a/roles/robertdebock.users/meta/preferences.yml b/roles/users/meta/preferences.yml
similarity index 100%
rename from roles/robertdebock.users/meta/preferences.yml
rename to roles/users/meta/preferences.yml
diff --git a/roles/robertdebock.users/molecule/default/converge.yml b/roles/users/molecule/default/converge.yml
similarity index 100%
rename from roles/robertdebock.users/molecule/default/converge.yml
rename to roles/users/molecule/default/converge.yml
diff --git a/roles/robertdebock.users/molecule/default/molecule.yml b/roles/users/molecule/default/molecule.yml
similarity index 100%
rename from roles/robertdebock.users/molecule/default/molecule.yml
rename to roles/users/molecule/default/molecule.yml
diff --git a/roles/robertdebock.users/molecule/default/prepare.yml b/roles/users/molecule/default/prepare.yml
similarity index 100%
rename from roles/robertdebock.users/molecule/default/prepare.yml
rename to roles/users/molecule/default/prepare.yml
diff --git a/roles/robertdebock.users/molecule/default/ssh_keys/keyuser b/roles/users/molecule/default/ssh_keys/keyuser
similarity index 100%
rename from roles/robertdebock.users/molecule/default/ssh_keys/keyuser
rename to roles/users/molecule/default/ssh_keys/keyuser
diff --git a/roles/robertdebock.users/molecule/default/ssh_keys/keyuser.ppk b/roles/users/molecule/default/ssh_keys/keyuser.ppk
similarity index 100%
rename from roles/robertdebock.users/molecule/default/ssh_keys/keyuser.ppk
rename to roles/users/molecule/default/ssh_keys/keyuser.ppk
diff --git a/roles/robertdebock.users/molecule/default/ssh_keys/keyuser.pub b/roles/users/molecule/default/ssh_keys/keyuser.pub
similarity index 100%
rename from roles/robertdebock.users/molecule/default/ssh_keys/keyuser.pub
rename to roles/users/molecule/default/ssh_keys/keyuser.pub
diff --git a/roles/robertdebock.users/molecule/default/ssh_keys/privkeyuser b/roles/users/molecule/default/ssh_keys/privkeyuser
similarity index 100%
rename from roles/robertdebock.users/molecule/default/ssh_keys/privkeyuser
rename to roles/users/molecule/default/ssh_keys/privkeyuser
diff --git a/roles/robertdebock.users/molecule/default/ssh_keys/privkeyuser.ppk b/roles/users/molecule/default/ssh_keys/privkeyuser.ppk
similarity index 100%
rename from roles/robertdebock.users/molecule/default/ssh_keys/privkeyuser.ppk
rename to roles/users/molecule/default/ssh_keys/privkeyuser.ppk
diff --git a/roles/robertdebock.users/molecule/default/ssh_keys/privkeyuser.pub b/roles/users/molecule/default/ssh_keys/privkeyuser.pub
similarity index 100%
rename from roles/robertdebock.users/molecule/default/ssh_keys/privkeyuser.pub
rename to roles/users/molecule/default/ssh_keys/privkeyuser.pub
diff --git a/roles/robertdebock.users/molecule/default/verify.yml b/roles/users/molecule/default/verify.yml
similarity index 100%
rename from roles/robertdebock.users/molecule/default/verify.yml
rename to roles/users/molecule/default/verify.yml
diff --git a/roles/robertdebock.users/requirements.yml b/roles/users/requirements.yml
similarity index 100%
rename from roles/robertdebock.users/requirements.yml
rename to roles/users/requirements.yml
diff --git a/roles/robertdebock.users/tasks/assert.yml b/roles/users/tasks/assert.yml
similarity index 100%
rename from roles/robertdebock.users/tasks/assert.yml
rename to roles/users/tasks/assert.yml
diff --git a/roles/robertdebock.users/tasks/group.yml b/roles/users/tasks/group.yml
similarity index 100%
rename from roles/robertdebock.users/tasks/group.yml
rename to roles/users/tasks/group.yml
diff --git a/roles/robertdebock.users/tasks/main.yml b/roles/users/tasks/main.yml
similarity index 100%
rename from roles/robertdebock.users/tasks/main.yml
rename to roles/users/tasks/main.yml
diff --git a/roles/robertdebock.users/tasks/user.yml b/roles/users/tasks/user.yml
similarity index 100%
rename from roles/robertdebock.users/tasks/user.yml
rename to roles/users/tasks/user.yml
diff --git a/roles/robertdebock.users/tasks/user_authorized_key.yml b/roles/users/tasks/user_authorized_key.yml
similarity index 100%
rename from roles/robertdebock.users/tasks/user_authorized_key.yml
rename to roles/users/tasks/user_authorized_key.yml
diff --git a/roles/robertdebock.users/templates/.gitkeep b/roles/users/templates/.gitkeep
similarity index 100%
rename from roles/robertdebock.users/templates/.gitkeep
rename to roles/users/templates/.gitkeep
diff --git a/roles/robertdebock.users/templates/cron.allow.j2 b/roles/users/templates/cron.allow.j2
similarity index 100%
rename from roles/robertdebock.users/templates/cron.allow.j2
rename to roles/users/templates/cron.allow.j2
diff --git a/roles/robertdebock.users/templates/sudo.j2 b/roles/users/templates/sudo.j2
similarity index 100%
rename from roles/robertdebock.users/templates/sudo.j2
rename to roles/users/templates/sudo.j2
diff --git a/roles/robertdebock.update/tox.ini b/roles/users/tox.ini
similarity index 100%
rename from roles/robertdebock.update/tox.ini
rename to roles/users/tox.ini
diff --git a/roles/robertdebock.users/vars/main.yml b/roles/users/vars/main.yml
similarity index 100%
rename from roles/robertdebock.users/vars/main.yml
rename to roles/users/vars/main.yml
diff --git a/roles/robertdebock.vagrant/.ansible-lint b/roles/vagrant/.ansible-lint
similarity index 100%
rename from roles/robertdebock.vagrant/.ansible-lint
rename to roles/vagrant/.ansible-lint
diff --git a/roles/robertdebock.vagrant/.github/FUNDING.yml b/roles/vagrant/.github/FUNDING.yml
similarity index 100%
rename from roles/robertdebock.vagrant/.github/FUNDING.yml
rename to roles/vagrant/.github/FUNDING.yml
diff --git a/roles/robertdebock.vagrant/.github/ISSUE_TEMPLATE/bug_report.md b/roles/vagrant/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 100%
rename from roles/robertdebock.vagrant/.github/ISSUE_TEMPLATE/bug_report.md
rename to roles/vagrant/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/roles/robertdebock.vagrant/.github/ISSUE_TEMPLATE/feature_request.md b/roles/vagrant/.github/ISSUE_TEMPLATE/feature_request.md
similarity index 100%
rename from roles/robertdebock.vagrant/.github/ISSUE_TEMPLATE/feature_request.md
rename to roles/vagrant/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/roles/robertdebock.vagrant/.github/pull_request_template.md b/roles/vagrant/.github/pull_request_template.md
similarity index 100%
rename from roles/robertdebock.vagrant/.github/pull_request_template.md
rename to roles/vagrant/.github/pull_request_template.md
diff --git a/roles/robertdebock.vagrant/.github/settings.yml b/roles/vagrant/.github/settings.yml
similarity index 100%
rename from roles/robertdebock.vagrant/.github/settings.yml
rename to roles/vagrant/.github/settings.yml
diff --git a/roles/robertdebock.vagrant/.github/workflows/galaxy.yml b/roles/vagrant/.github/workflows/galaxy.yml
similarity index 100%
rename from roles/robertdebock.vagrant/.github/workflows/galaxy.yml
rename to roles/vagrant/.github/workflows/galaxy.yml
diff --git a/roles/robertdebock.vagrant/.github/workflows/molecule.yml b/roles/vagrant/.github/workflows/molecule.yml
similarity index 100%
rename from roles/robertdebock.vagrant/.github/workflows/molecule.yml
rename to roles/vagrant/.github/workflows/molecule.yml
diff --git a/roles/robertdebock.vagrant/.gitignore b/roles/vagrant/.gitignore
similarity index 100%
rename from roles/robertdebock.vagrant/.gitignore
rename to roles/vagrant/.gitignore
diff --git a/roles/robertdebock.vagrant/.travis.yml b/roles/vagrant/.travis.yml
similarity index 100%
rename from roles/robertdebock.vagrant/.travis.yml
rename to roles/vagrant/.travis.yml
diff --git a/roles/robertdebock.update/.yamllint b/roles/vagrant/.yamllint
similarity index 90%
rename from roles/robertdebock.update/.yamllint
rename to roles/vagrant/.yamllint
index c5ae64b..894450c 100644
--- a/roles/robertdebock.update/.yamllint
+++ b/roles/vagrant/.yamllint
@@ -10,3 +10,6 @@ rules:
     level: error
   line-length: disable
   truthy: disable
+
+ignore: |
+  .tox/
diff --git a/roles/robertdebock.vagrant/CODE_OF_CONDUCT.md b/roles/vagrant/CODE_OF_CONDUCT.md
similarity index 100%
rename from roles/robertdebock.vagrant/CODE_OF_CONDUCT.md
rename to roles/vagrant/CODE_OF_CONDUCT.md
diff --git a/roles/robertdebock.vagrant/CONTRIBUTING.md b/roles/vagrant/CONTRIBUTING.md
similarity index 100%
rename from roles/robertdebock.vagrant/CONTRIBUTING.md
rename to roles/vagrant/CONTRIBUTING.md
diff --git a/roles/robertdebock.vagrant/LICENSE b/roles/vagrant/LICENSE
similarity index 100%
rename from roles/robertdebock.vagrant/LICENSE
rename to roles/vagrant/LICENSE
diff --git a/roles/robertdebock.vagrant/README.md b/roles/vagrant/README.md
similarity index 100%
rename from roles/robertdebock.vagrant/README.md
rename to roles/vagrant/README.md
diff --git a/roles/robertdebock.vagrant/SECURITY.md b/roles/vagrant/SECURITY.md
similarity index 100%
rename from roles/robertdebock.vagrant/SECURITY.md
rename to roles/vagrant/SECURITY.md
diff --git a/roles/robertdebock.vagrant/defaults/main.yml b/roles/vagrant/defaults/main.yml
similarity index 100%
rename from roles/robertdebock.vagrant/defaults/main.yml
rename to roles/vagrant/defaults/main.yml
diff --git a/roles/vagrant/meta/.galaxy_install_info b/roles/vagrant/meta/.galaxy_install_info
new file mode 100644
index 0000000..fde6c96
--- /dev/null
+++ b/roles/vagrant/meta/.galaxy_install_info
@@ -0,0 +1,2 @@
+install_date: Mon Sep 28 13:22:49 2020
+version: 3.2.0
diff --git a/roles/robertdebock.vagrant/meta/exception.yml b/roles/vagrant/meta/exception.yml
similarity index 100%
rename from roles/robertdebock.vagrant/meta/exception.yml
rename to roles/vagrant/meta/exception.yml
diff --git a/roles/robertdebock.vagrant/meta/main.yml b/roles/vagrant/meta/main.yml
similarity index 100%
rename from roles/robertdebock.vagrant/meta/main.yml
rename to roles/vagrant/meta/main.yml
diff --git a/roles/robertdebock.vagrant/meta/preferences.yml b/roles/vagrant/meta/preferences.yml
similarity index 100%
rename from roles/robertdebock.vagrant/meta/preferences.yml
rename to roles/vagrant/meta/preferences.yml
diff --git a/roles/robertdebock.vagrant/molecule/default/converge.yml b/roles/vagrant/molecule/default/converge.yml
similarity index 100%
rename from roles/robertdebock.vagrant/molecule/default/converge.yml
rename to roles/vagrant/molecule/default/converge.yml
diff --git a/roles/robertdebock.vagrant/molecule/default/molecule.yml b/roles/vagrant/molecule/default/molecule.yml
similarity index 100%
rename from roles/robertdebock.vagrant/molecule/default/molecule.yml
rename to roles/vagrant/molecule/default/molecule.yml
diff --git a/roles/robertdebock.vagrant/molecule/default/prepare.yml b/roles/vagrant/molecule/default/prepare.yml
similarity index 100%
rename from roles/robertdebock.vagrant/molecule/default/prepare.yml
rename to roles/vagrant/molecule/default/prepare.yml
diff --git a/roles/robertdebock.vagrant/molecule/default/verify.yml b/roles/vagrant/molecule/default/verify.yml
similarity index 100%
rename from roles/robertdebock.vagrant/molecule/default/verify.yml
rename to roles/vagrant/molecule/default/verify.yml
diff --git a/roles/robertdebock.vagrant/requirements.yml b/roles/vagrant/requirements.yml
similarity index 100%
rename from roles/robertdebock.vagrant/requirements.yml
rename to roles/vagrant/requirements.yml
diff --git a/roles/robertdebock.vagrant/tasks/assert.yml b/roles/vagrant/tasks/assert.yml
similarity index 100%
rename from roles/robertdebock.vagrant/tasks/assert.yml
rename to roles/vagrant/tasks/assert.yml
diff --git a/roles/robertdebock.vagrant/tasks/main.yml b/roles/vagrant/tasks/main.yml
similarity index 100%
rename from roles/robertdebock.vagrant/tasks/main.yml
rename to roles/vagrant/tasks/main.yml
diff --git a/roles/robertdebock.users/tox.ini b/roles/vagrant/tox.ini
similarity index 100%
rename from roles/robertdebock.users/tox.ini
rename to roles/vagrant/tox.ini
diff --git a/roles/robertdebock.vagrant/vars/main.yml b/roles/vagrant/vars/main.yml
similarity index 100%
rename from roles/robertdebock.vagrant/vars/main.yml
rename to roles/vagrant/vars/main.yml