diff --git a/.gitignore 2 b/.gitignore 2
deleted file mode 100644
index c44b579..0000000
--- a/.gitignore 2	
+++ /dev/null
@@ -1,5 +0,0 @@
-id_rsa
-!roles/requirements.yml
-files/ssh_keys
-.vagrant
-releases
diff --git a/.vagrant 2/machines/fedora29/libvirt/action_provision b/.vagrant 2/machines/fedora29/libvirt/action_provision
deleted file mode 100644
index a4a94fc..0000000
--- a/.vagrant 2/machines/fedora29/libvirt/action_provision	
+++ /dev/null
@@ -1 +0,0 @@
-1.5:400d2d5f-317e-4e33-b7b1-d1bfe81d1c6b
\ No newline at end of file
diff --git a/.vagrant 2/machines/fedora29/libvirt/creator_uid b/.vagrant 2/machines/fedora29/libvirt/creator_uid
deleted file mode 100644
index e37d32a..0000000
--- a/.vagrant 2/machines/fedora29/libvirt/creator_uid	
+++ /dev/null
@@ -1 +0,0 @@
-1000
\ No newline at end of file
diff --git a/.vagrant 2/machines/fedora29/libvirt/id b/.vagrant 2/machines/fedora29/libvirt/id
deleted file mode 100644
index d464ecb..0000000
--- a/.vagrant 2/machines/fedora29/libvirt/id	
+++ /dev/null
@@ -1 +0,0 @@
-400d2d5f-317e-4e33-b7b1-d1bfe81d1c6b
\ No newline at end of file
diff --git a/.vagrant 2/machines/fedora29/libvirt/index_uuid b/.vagrant 2/machines/fedora29/libvirt/index_uuid
deleted file mode 100644
index a8d91d3..0000000
--- a/.vagrant 2/machines/fedora29/libvirt/index_uuid	
+++ /dev/null
@@ -1 +0,0 @@
-84b666789624430aaca9e528b8ccb0fe
\ No newline at end of file
diff --git a/.vagrant 2/machines/fedora29/libvirt/synced_folders b/.vagrant 2/machines/fedora29/libvirt/synced_folders
deleted file mode 100644
index 9e26dfe..0000000
--- a/.vagrant 2/machines/fedora29/libvirt/synced_folders	
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/.vagrant 2/machines/fedora29/libvirt/vagrant_cwd b/.vagrant 2/machines/fedora29/libvirt/vagrant_cwd
deleted file mode 100644
index 9b2b41f..0000000
--- a/.vagrant 2/machines/fedora29/libvirt/vagrant_cwd	
+++ /dev/null
@@ -1 +0,0 @@
-/home/robertdb/Documents/github.com/robertdebock/ansible-development-environment
\ No newline at end of file
diff --git a/.vagrant 2/machines/ubuntu/libvirt/action_provision b/.vagrant 2/machines/ubuntu/libvirt/action_provision
deleted file mode 100644
index 564623e..0000000
--- a/.vagrant 2/machines/ubuntu/libvirt/action_provision	
+++ /dev/null
@@ -1 +0,0 @@
-1.5:62cd93f9-1823-4998-bbb2-689ff16ffff9
\ No newline at end of file
diff --git a/.vagrant 2/machines/ubuntu/libvirt/creator_uid b/.vagrant 2/machines/ubuntu/libvirt/creator_uid
deleted file mode 100644
index e37d32a..0000000
--- a/.vagrant 2/machines/ubuntu/libvirt/creator_uid	
+++ /dev/null
@@ -1 +0,0 @@
-1000
\ No newline at end of file
diff --git a/.vagrant 2/machines/ubuntu/libvirt/id b/.vagrant 2/machines/ubuntu/libvirt/id
deleted file mode 100644
index fbe33ba..0000000
--- a/.vagrant 2/machines/ubuntu/libvirt/id	
+++ /dev/null
@@ -1 +0,0 @@
-62cd93f9-1823-4998-bbb2-689ff16ffff9
\ No newline at end of file
diff --git a/.vagrant 2/machines/ubuntu/libvirt/index_uuid b/.vagrant 2/machines/ubuntu/libvirt/index_uuid
deleted file mode 100644
index 4dee885..0000000
--- a/.vagrant 2/machines/ubuntu/libvirt/index_uuid	
+++ /dev/null
@@ -1 +0,0 @@
-12a1f187bde545f580760461bc482332
\ No newline at end of file
diff --git a/.vagrant 2/machines/ubuntu/libvirt/synced_folders b/.vagrant 2/machines/ubuntu/libvirt/synced_folders
deleted file mode 100644
index 9e26dfe..0000000
--- a/.vagrant 2/machines/ubuntu/libvirt/synced_folders	
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/.vagrant 2/machines/ubuntu/libvirt/vagrant_cwd b/.vagrant 2/machines/ubuntu/libvirt/vagrant_cwd
deleted file mode 100644
index 9b2b41f..0000000
--- a/.vagrant 2/machines/ubuntu/libvirt/vagrant_cwd	
+++ /dev/null
@@ -1 +0,0 @@
-/home/robertdb/Documents/github.com/robertdebock/ansible-development-environment
\ No newline at end of file
diff --git a/Vagrantfile 2 b/Vagrantfile 2
new file mode 120000
index 0000000..0333340
--- /dev/null
+++ b/Vagrantfile 2	
@@ -0,0 +1 @@
+Vagrantfile.libvirt
\ No newline at end of file
diff --git a/ansible 2.cfg b/ansible 2.cfg
deleted file mode 100644
index b2f1f16..0000000
--- a/ansible 2.cfg	
+++ /dev/null
@@ -1,6 +0,0 @@
-[defaults]
-retry_files_enabled=no
-inventory=inventory
-stdout_callback=yaml
-host_key_checking=no
-roles_path=roles
diff --git a/files 2/gitconfig b/files 2/gitconfig
deleted file mode 100644
index 19289fd..0000000
--- a/files 2/gitconfig	
+++ /dev/null
@@ -1,3 +0,0 @@
-[user]
-	email = robert@meinit.nl
-	name = Robert de Bock
diff --git a/inventory 2/group_vars/python3.yml b/inventory 2/group_vars/python3.yml
deleted file mode 100644
index f1a3ed4..0000000
--- a/inventory 2/group_vars/python3.yml	
+++ /dev/null
@@ -1 +0,0 @@
-ansible_python_interpreter: /usr/bin/python3
diff --git a/inventory 2/host_vars/fedora.yml b/inventory 2/host_vars/fedora.yml
deleted file mode 100644
index a78c254..0000000
--- a/inventory 2/host_vars/fedora.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-ansible_pyhton_interpreter: /usr/bin/python3
diff --git a/inventory 2/hosts b/inventory 2/hosts
deleted file mode 100644
index 0746820..0000000
--- a/inventory 2/hosts	
+++ /dev/null
@@ -1,5 +0,0 @@
-#fedora-s-1vcpu-2gb-fra1-01 ansible_host=167.99.141.134
-#ubuntu-s-2vcpu-4gb-nyc1-01 ansible_host=206.189.178.203 ansible_user=root
-
-[python3]
-fedora
diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml
index c70c18c..2a174b3 100644
--- a/inventory/group_vars/all.yml
+++ b/inventory/group_vars/all.yml
@@ -341,6 +341,8 @@ git_repositories:
     dest: ansible-role-travis
   - repo: ssh://git@github.com/robertdebock/ansible-role-tune2fs.git
     dest: ansible-role-tune2fs
+  - repo: ssh://git@github.com/robertdebock/ansible-role-turn.git
+    dest: ansible-role-turn
   - repo: ssh://git@github.com/robertdebock/ansible-role-types.git
     dest: ansible-role-types
   - repo: ssh://git@github.com/robertdebock/ansible-role-ulimit.git
diff --git a/roles/ansible/.github 2/FUNDING.yml b/roles/ansible/.github 2/FUNDING.yml
deleted file mode 100644
index 67320f0..0000000
--- a/roles/ansible/.github 2/FUNDING.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-github: robertdebock
diff --git a/roles/ansible/.github 2/pull_request_template.md b/roles/ansible/.github 2/pull_request_template.md
deleted file mode 100644
index b1578c0..0000000
--- a/roles/ansible/.github 2/pull_request_template.md	
+++ /dev/null
@@ -1,11 +0,0 @@
----
-name: Pull request
-about: Describe the proposed change
-
----
-
-**Describe the change**
-A clear and concise description of what the pull request is.
-
-**Testing**
-In case a feature was added, how were tests performed?
diff --git a/roles/ansible/.github 2/settings.yml b/roles/ansible/.github 2/settings.yml
deleted file mode 100644
index 5019e26..0000000
--- a/roles/ansible/.github 2/settings.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
----
-#
-# Ansible managed
-#
-repository:
-  description: Install and configure ansible on your system.
-  homepage: https://robertdebock.nl/
diff --git a/roles/ansible/.gitignore 2 b/roles/ansible/.gitignore 2
deleted file mode 100644
index 982db11..0000000
--- a/roles/ansible/.gitignore 2	
+++ /dev/null
@@ -1,4 +0,0 @@
-.molecule
-*.log
-*.swp
-.tox
diff --git a/roles/ansible/meta 2/.galaxy_install_info b/roles/ansible/meta 2/.galaxy_install_info
deleted file mode 100644
index f7195d6..0000000
--- a/roles/ansible/meta 2/.galaxy_install_info	
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 13:21:49 2020
-version: 2.3.3
diff --git a/roles/ansible/meta 2/exception.yml b/roles/ansible/meta 2/exception.yml
deleted file mode 100644
index 95e813f..0000000
--- a/roles/ansible/meta 2/exception.yml	
+++ /dev/null
@@ -1,4 +0,0 @@
----
-exceptions:
-  - variation: amazonlinux:1
-    reason: "No package matching 'python3-pip'"
diff --git a/roles/ansible/meta 2/preferences.yml b/roles/ansible/meta 2/preferences.yml
deleted file mode 100644
index e7fdebf..0000000
--- a/roles/ansible/meta 2/preferences.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-tox_parallel: yes
diff --git a/roles/ansible/molecule 2/default/converge.yml b/roles/ansible/molecule 2/default/converge.yml
deleted file mode 100644
index 935c6b8..0000000
--- a/roles/ansible/molecule 2/default/converge.yml	
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Converge
-  hosts: all
-  become: yes
-  gather_facts: yes
-
-  roles:
-    - role: ansible-role-ansible
diff --git a/roles/ansible/molecule 2/default/prepare.yml b/roles/ansible/molecule 2/default/prepare.yml
deleted file mode 100644
index fcdc074..0000000
--- a/roles/ansible/molecule 2/default/prepare.yml	
+++ /dev/null
@@ -1,11 +0,0 @@
----
-- name: Prepare
-  hosts: all
-  gather_facts: no
-  become: yes
-
-  roles:
-    - role: robertdebock.bootstrap
-    - role: robertdebock.epel
-    - role: robertdebock.buildtools
-    - role: robertdebock.python_pip
diff --git a/roles/ansible/molecule 2/default/verify.yml b/roles/ansible/molecule 2/default/verify.yml
deleted file mode 100644
index 4733d21..0000000
--- a/roles/ansible/molecule 2/default/verify.yml	
+++ /dev/null
@@ -1,11 +0,0 @@
----
-- name: Verify
-  hosts: all
-  become: no
-  gather_facts: no
-
-  tasks:
-    - name: run ansible
-      shell: ansible --version > ansible.version
-      args:
-        creates: ansible.version
diff --git a/roles/ansible/requirements 2.yml b/roles/ansible/requirements 2.yml
deleted file mode 100644
index 2fd552b..0000000
--- a/roles/ansible/requirements 2.yml	
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- robertdebock.bootstrap
-- robertdebock.buildtools
-- robertdebock.epel
-- robertdebock.python_pip
diff --git a/roles/ansible_lint/.github 2/FUNDING.yml b/roles/ansible_lint/.github 2/FUNDING.yml
deleted file mode 100644
index 67320f0..0000000
--- a/roles/ansible_lint/.github 2/FUNDING.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-github: robertdebock
diff --git a/roles/ansible_lint/.github 2/pull_request_template.md b/roles/ansible_lint/.github 2/pull_request_template.md
deleted file mode 100644
index b1578c0..0000000
--- a/roles/ansible_lint/.github 2/pull_request_template.md	
+++ /dev/null
@@ -1,11 +0,0 @@
----
-name: Pull request
-about: Describe the proposed change
-
----
-
-**Describe the change**
-A clear and concise description of what the pull request is.
-
-**Testing**
-In case a feature was added, how were tests performed?
diff --git a/roles/ansible_lint/.github 2/settings.yml b/roles/ansible_lint/.github 2/settings.yml
deleted file mode 100644
index 2ae14d3..0000000
--- a/roles/ansible_lint/.github 2/settings.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
----
-#
-# Ansible managed
-#
-repository:
-  description: Install ansible-lint on your system.
-  homepage: https://robertdebock.nl/
diff --git a/roles/ansible_lint/.gitignore 2 b/roles/ansible_lint/.gitignore 2
deleted file mode 100644
index 982db11..0000000
--- a/roles/ansible_lint/.gitignore 2	
+++ /dev/null
@@ -1,4 +0,0 @@
-.molecule
-*.log
-*.swp
-.tox
diff --git a/roles/ansible_lint/meta 2/.galaxy_install_info b/roles/ansible_lint/meta 2/.galaxy_install_info
deleted file mode 100644
index f2ff1d7..0000000
--- a/roles/ansible_lint/meta 2/.galaxy_install_info	
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 13:21:51 2020
-version: 2.3.12
diff --git a/roles/ansible_lint/meta 2/exception.yml b/roles/ansible_lint/meta 2/exception.yml
deleted file mode 100644
index 0f73f3c..0000000
--- a/roles/ansible_lint/meta 2/exception.yml	
+++ /dev/null
@@ -1,6 +0,0 @@
----
-exceptions:
-  - variation: amazonlinux:1
-    reason: "No package matching 'python3-pip'"
-  - variation: amazonlinux
-    reason: "No module named pkg_resources"
diff --git a/roles/ansible_lint/meta 2/preferences.yml b/roles/ansible_lint/meta 2/preferences.yml
deleted file mode 100644
index e7fdebf..0000000
--- a/roles/ansible_lint/meta 2/preferences.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-tox_parallel: yes
diff --git a/roles/ansible_lint/requirements 2.yml b/roles/ansible_lint/requirements 2.yml
deleted file mode 100644
index 2fd552b..0000000
--- a/roles/ansible_lint/requirements 2.yml	
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- robertdebock.bootstrap
-- robertdebock.buildtools
-- robertdebock.epel
-- robertdebock.python_pip
diff --git a/roles/ansible_lint/vars 2/main.yml b/roles/ansible_lint/vars 2/main.yml
deleted file mode 100644
index 0a1756c..0000000
--- a/roles/ansible_lint/vars 2/main.yml	
+++ /dev/null
@@ -1,5 +0,0 @@
----
-# vars file for ansible_lint
-
-ansible_lint_packages:
-  - ansible-lint
diff --git a/roles/ara/.github 2/FUNDING.yml b/roles/ara/.github 2/FUNDING.yml
deleted file mode 100644
index 67320f0..0000000
--- a/roles/ara/.github 2/FUNDING.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-github: robertdebock
diff --git a/roles/ara/.github 2/pull_request_template.md b/roles/ara/.github 2/pull_request_template.md
deleted file mode 100644
index b1578c0..0000000
--- a/roles/ara/.github 2/pull_request_template.md	
+++ /dev/null
@@ -1,11 +0,0 @@
----
-name: Pull request
-about: Describe the proposed change
-
----
-
-**Describe the change**
-A clear and concise description of what the pull request is.
-
-**Testing**
-In case a feature was added, how were tests performed?
diff --git a/roles/ara/.github 2/settings.yml b/roles/ara/.github 2/settings.yml
deleted file mode 100644
index e9e274a..0000000
--- a/roles/ara/.github 2/settings.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
----
-#
-# Ansible managed
-#
-repository:
-  description: Install and configure ara on your system.
-  homepage: https://robertdebock.nl/
diff --git a/roles/ara/.gitignore 2 b/roles/ara/.gitignore 2
deleted file mode 100644
index 982db11..0000000
--- a/roles/ara/.gitignore 2	
+++ /dev/null
@@ -1,4 +0,0 @@
-.molecule
-*.log
-*.swp
-.tox
diff --git a/roles/ara/meta 2/.galaxy_install_info b/roles/ara/meta 2/.galaxy_install_info
deleted file mode 100644
index ebc4342..0000000
--- a/roles/ara/meta 2/.galaxy_install_info	
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 13:21:56 2020
-version: 2.5.2
diff --git a/roles/ara/meta 2/preferences.yml b/roles/ara/meta 2/preferences.yml
deleted file mode 100644
index e7fdebf..0000000
--- a/roles/ara/meta 2/preferences.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-tox_parallel: yes
diff --git a/roles/ara/molecule 2/default/converge.yml b/roles/ara/molecule 2/default/converge.yml
deleted file mode 100644
index 2b8d6e5..0000000
--- a/roles/ara/molecule 2/default/converge.yml	
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Converge
-  hosts: all
-  become: yes
-  gather_facts: yes
-
-  roles:
-    - role: ansible-role-ara
diff --git a/roles/ara/molecule 2/default/prepare.yml b/roles/ara/molecule 2/default/prepare.yml
deleted file mode 100644
index b7ec2fa..0000000
--- a/roles/ara/molecule 2/default/prepare.yml	
+++ /dev/null
@@ -1,11 +0,0 @@
----
-- name: Prepare
-  hosts: all
-  become: yes
-  gather_facts: no
-
-  roles:
-    - role: robertdebock.bootstrap
-    - role: robertdebock.buildtools
-    - role: robertdebock.epel
-    - role: robertdebock.python_pip
diff --git a/roles/ara/molecule 2/default/verify.yml b/roles/ara/molecule 2/default/verify.yml
deleted file mode 100644
index b9dc6f8..0000000
--- a/roles/ara/molecule 2/default/verify.yml	
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- name: Verify
-  hosts: all
-  become: yes
-  gather_facts: no
-
-  tasks:
-    - name: check if connection still works
-      ping:
diff --git a/roles/atom/.github 2/FUNDING.yml b/roles/atom/.github 2/FUNDING.yml
deleted file mode 100644
index 67320f0..0000000
--- a/roles/atom/.github 2/FUNDING.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-github: robertdebock
diff --git a/roles/atom/.github 2/pull_request_template.md b/roles/atom/.github 2/pull_request_template.md
deleted file mode 100644
index b1578c0..0000000
--- a/roles/atom/.github 2/pull_request_template.md	
+++ /dev/null
@@ -1,11 +0,0 @@
----
-name: Pull request
-about: Describe the proposed change
-
----
-
-**Describe the change**
-A clear and concise description of what the pull request is.
-
-**Testing**
-In case a feature was added, how were tests performed?
diff --git a/roles/atom/.github 2/settings.yml b/roles/atom/.github 2/settings.yml
deleted file mode 100644
index 45c678d..0000000
--- a/roles/atom/.github 2/settings.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
----
-#
-# Ansible managed
-#
-repository:
-  description: Install atom on your system.
-  homepage: https://robertdebock.nl/
diff --git a/roles/atom/.gitignore 2 b/roles/atom/.gitignore 2
deleted file mode 100644
index 982db11..0000000
--- a/roles/atom/.gitignore 2	
+++ /dev/null
@@ -1,4 +0,0 @@
-.molecule
-*.log
-*.swp
-.tox
diff --git a/roles/atom/meta 2/.galaxy_install_info b/roles/atom/meta 2/.galaxy_install_info
deleted file mode 100644
index 6564449..0000000
--- a/roles/atom/meta 2/.galaxy_install_info	
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 13:21:59 2020
-version: 2.5.1
diff --git a/roles/atom/meta 2/exception.yml b/roles/atom/meta 2/exception.yml
deleted file mode 100644
index aaa4bb6..0000000
--- a/roles/atom/meta 2/exception.yml	
+++ /dev/null
@@ -1,6 +0,0 @@
----
-exceptions:
-  - variation: amazonlinux:1
-    reason: "Package: atom ... Requires: libsecret-1.so.0 ... and ... polkit"
-  - variation: debian:bullseye
-    reason: "An error occurred during the test sequence action: 'idempotence'. Cleaning up."
diff --git a/roles/atom/meta 2/preferences.yml b/roles/atom/meta 2/preferences.yml
deleted file mode 100644
index e7fdebf..0000000
--- a/roles/atom/meta 2/preferences.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-tox_parallel: yes
diff --git a/roles/atom/molecule 2/default/converge.yml b/roles/atom/molecule 2/default/converge.yml
deleted file mode 100644
index 0e76e11..0000000
--- a/roles/atom/molecule 2/default/converge.yml	
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Converge
-  hosts: all
-  become: yes
-  gather_facts: yes
-
-  roles:
-    - role: ansible-role-atom
diff --git a/roles/atom/molecule 2/default/prepare.yml b/roles/atom/molecule 2/default/prepare.yml
deleted file mode 100644
index feb7d81..0000000
--- a/roles/atom/molecule 2/default/prepare.yml	
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Prepare
-  hosts: all
-  gather_facts: no
-  become: yes
-
-  roles:
-    - role: robertdebock.bootstrap
diff --git a/roles/atom/molecule 2/default/verify.yml b/roles/atom/molecule 2/default/verify.yml
deleted file mode 100644
index 303c2a7..0000000
--- a/roles/atom/molecule 2/default/verify.yml	
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- name: Verify
-  hosts: all
-  become: yes
-  gather_facts: no
-
-  tasks:
-    - name: check if atom exists works
-      command: file /usr/bin/atom
diff --git a/roles/atom/requirements 2.yml b/roles/atom/requirements 2.yml
deleted file mode 100644
index 46dec9d..0000000
--- a/roles/atom/requirements 2.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-- robertdebock.bootstrap
diff --git a/roles/bootstrap/.ansible-lint 2 b/roles/bootstrap/.ansible-lint 2
deleted file mode 100644
index cb2872e..0000000
--- a/roles/bootstrap/.ansible-lint 2	
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Ansible managed
-#
-exclude_paths:
-  - ./meta/preferences.yml
-  - ./molecule/default/verify.yml
-  - ./.tox
diff --git a/roles/bootstrap/.github 2/FUNDING.yml b/roles/bootstrap/.github 2/FUNDING.yml
deleted file mode 100644
index 67320f0..0000000
--- a/roles/bootstrap/.github 2/FUNDING.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-github: robertdebock
diff --git a/roles/bootstrap/.github 2/pull_request_template.md b/roles/bootstrap/.github 2/pull_request_template.md
deleted file mode 100644
index b1578c0..0000000
--- a/roles/bootstrap/.github 2/pull_request_template.md	
+++ /dev/null
@@ -1,11 +0,0 @@
----
-name: Pull request
-about: Describe the proposed change
-
----
-
-**Describe the change**
-A clear and concise description of what the pull request is.
-
-**Testing**
-In case a feature was added, how were tests performed?
diff --git a/roles/bootstrap/.github 2/settings.yml b/roles/bootstrap/.github 2/settings.yml
deleted file mode 100644
index eaf6fb8..0000000
--- a/roles/bootstrap/.github 2/settings.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
----
-#
-# Ansible managed
-#
-repository:
-  description: Prepare your system to be managed by Ansible.
-  homepage: https://robertdebock.nl/
diff --git a/roles/bootstrap/.gitignore 2 b/roles/bootstrap/.gitignore 2
deleted file mode 100644
index 982db11..0000000
--- a/roles/bootstrap/.gitignore 2	
+++ /dev/null
@@ -1,4 +0,0 @@
-.molecule
-*.log
-*.swp
-.tox
diff --git a/roles/bootstrap/meta 2/.galaxy_install_info b/roles/bootstrap/meta 2/.galaxy_install_info
deleted file mode 100644
index 7ed929e..0000000
--- a/roles/bootstrap/meta 2/.galaxy_install_info	
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 13:22:02 2020
-version: 4.2.7
diff --git a/roles/bootstrap/meta 2/preferences.yml b/roles/bootstrap/meta 2/preferences.yml
deleted file mode 100644
index e7fdebf..0000000
--- a/roles/bootstrap/meta 2/preferences.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-tox_parallel: yes
diff --git a/roles/bootstrap/molecule 2/default/converge.yml b/roles/bootstrap/molecule 2/default/converge.yml
deleted file mode 100644
index 3cd3d54..0000000
--- a/roles/bootstrap/molecule 2/default/converge.yml	
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Converge
-  hosts: all
-  become: yes
-  gather_facts: no
-
-  roles:
-    - role: ansible-role-bootstrap
diff --git a/roles/bootstrap/molecule 2/default/verify.yml b/roles/bootstrap/molecule 2/default/verify.yml
deleted file mode 100644
index 3bb4ea3..0000000
--- a/roles/bootstrap/molecule 2/default/verify.yml	
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- name: Verify
-  hosts: all
-  become: no
-  gather_facts: no
-
-  tasks:
-    - name: test connection
-      ping:
diff --git a/roles/buildtools/.github 2/FUNDING.yml b/roles/buildtools/.github 2/FUNDING.yml
deleted file mode 100644
index 67320f0..0000000
--- a/roles/buildtools/.github 2/FUNDING.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-github: robertdebock
diff --git a/roles/buildtools/.github 2/pull_request_template.md b/roles/buildtools/.github 2/pull_request_template.md
deleted file mode 100644
index b1578c0..0000000
--- a/roles/buildtools/.github 2/pull_request_template.md	
+++ /dev/null
@@ -1,11 +0,0 @@
----
-name: Pull request
-about: Describe the proposed change
-
----
-
-**Describe the change**
-A clear and concise description of what the pull request is.
-
-**Testing**
-In case a feature was added, how were tests performed?
diff --git a/roles/buildtools/.github 2/settings.yml b/roles/buildtools/.github 2/settings.yml
deleted file mode 100644
index 4d5d933..0000000
--- a/roles/buildtools/.github 2/settings.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
----
-#
-# Ansible managed
-#
-repository:
-  description: Install buildtools on your system.
-  homepage: https://robertdebock.nl/
diff --git a/roles/buildtools/.gitignore 2 b/roles/buildtools/.gitignore 2
deleted file mode 100644
index 982db11..0000000
--- a/roles/buildtools/.gitignore 2	
+++ /dev/null
@@ -1,4 +0,0 @@
-.molecule
-*.log
-*.swp
-.tox
diff --git a/roles/buildtools/meta 2/.galaxy_install_info b/roles/buildtools/meta 2/.galaxy_install_info
deleted file mode 100644
index 1e3aaeb..0000000
--- a/roles/buildtools/meta 2/.galaxy_install_info	
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 13:22:05 2020
-version: 2.4.15
diff --git a/roles/buildtools/meta 2/exception.yml b/roles/buildtools/meta 2/exception.yml
deleted file mode 100644
index 02f8e69..0000000
--- a/roles/buildtools/meta 2/exception.yml	
+++ /dev/null
@@ -1,4 +0,0 @@
----
-exceptions:
-  - variation: EL
-    reason: "No package matching 'bison' found available, installed or updated"
diff --git a/roles/buildtools/meta 2/preferences.yml b/roles/buildtools/meta 2/preferences.yml
deleted file mode 100644
index e7fdebf..0000000
--- a/roles/buildtools/meta 2/preferences.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-tox_parallel: yes
diff --git a/roles/buildtools/molecule 2/default/converge.yml b/roles/buildtools/molecule 2/default/converge.yml
deleted file mode 100644
index 88675b2..0000000
--- a/roles/buildtools/molecule 2/default/converge.yml	
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Converge
-  hosts: all
-  become: yes
-  gather_facts: yes
-
-  roles:
-    - role: ansible-role-buildtools
diff --git a/roles/buildtools/molecule 2/default/prepare.yml b/roles/buildtools/molecule 2/default/prepare.yml
deleted file mode 100644
index feb7d81..0000000
--- a/roles/buildtools/molecule 2/default/prepare.yml	
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Prepare
-  hosts: all
-  gather_facts: no
-  become: yes
-
-  roles:
-    - role: robertdebock.bootstrap
diff --git a/roles/buildtools/requirements 2.yml b/roles/buildtools/requirements 2.yml
deleted file mode 100644
index 46dec9d..0000000
--- a/roles/buildtools/requirements 2.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-- robertdebock.bootstrap
diff --git a/roles/common/.github 2/FUNDING.yml b/roles/common/.github 2/FUNDING.yml
deleted file mode 100644
index 67320f0..0000000
--- a/roles/common/.github 2/FUNDING.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-github: robertdebock
diff --git a/roles/common/.github 2/pull_request_template.md b/roles/common/.github 2/pull_request_template.md
deleted file mode 100644
index b1578c0..0000000
--- a/roles/common/.github 2/pull_request_template.md	
+++ /dev/null
@@ -1,11 +0,0 @@
----
-name: Pull request
-about: Describe the proposed change
-
----
-
-**Describe the change**
-A clear and concise description of what the pull request is.
-
-**Testing**
-In case a feature was added, how were tests performed?
diff --git a/roles/common/.github 2/settings.yml b/roles/common/.github 2/settings.yml
deleted file mode 100644
index 54f4b17..0000000
--- a/roles/common/.github 2/settings.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
----
-#
-# Ansible managed
-#
-repository:
-  description: The purpose of this role is to configure common things on your system.
-  homepage: https://robertdebock.nl/
diff --git a/roles/common/.gitignore 2 b/roles/common/.gitignore 2
deleted file mode 100644
index 982db11..0000000
--- a/roles/common/.gitignore 2	
+++ /dev/null
@@ -1,4 +0,0 @@
-.molecule
-*.log
-*.swp
-.tox
diff --git a/roles/common/meta 2/.galaxy_install_info b/roles/common/meta 2/.galaxy_install_info
deleted file mode 100644
index eccc7b2..0000000
--- a/roles/common/meta 2/.galaxy_install_info	
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 13:22:08 2020
-version: 3.3.4
diff --git a/roles/common/meta 2/exception.yml b/roles/common/meta 2/exception.yml
deleted file mode 100644
index 1c78591..0000000
--- a/roles/common/meta 2/exception.yml	
+++ /dev/null
@@ -1,4 +0,0 @@
----
-exceptions:
-  - variation: amazonlinux
-    reason: "set hostname: [Errno 2] No such file or directory: '/etc/sysconfig/network'"
diff --git a/roles/common/meta 2/preferences.yml b/roles/common/meta 2/preferences.yml
deleted file mode 100644
index e7fdebf..0000000
--- a/roles/common/meta 2/preferences.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-tox_parallel: yes
diff --git a/roles/common/molecule 2/default/converge.yml b/roles/common/molecule 2/default/converge.yml
deleted file mode 100644
index b309e96..0000000
--- a/roles/common/molecule 2/default/converge.yml	
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Converge
-  hosts: all
-  become: yes
-  gather_facts: yes
-
-  roles:
-    - role: ansible-role-common
diff --git a/roles/common/molecule 2/default/prepare.yml b/roles/common/molecule 2/default/prepare.yml
deleted file mode 100644
index feb7d81..0000000
--- a/roles/common/molecule 2/default/prepare.yml	
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Prepare
-  hosts: all
-  gather_facts: no
-  become: yes
-
-  roles:
-    - role: robertdebock.bootstrap
diff --git a/roles/common/molecule 2/default/verify.yml b/roles/common/molecule 2/default/verify.yml
deleted file mode 100644
index b9dc6f8..0000000
--- a/roles/common/molecule 2/default/verify.yml	
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- name: Verify
-  hosts: all
-  become: yes
-  gather_facts: no
-
-  tasks:
-    - name: check if connection still works
-      ping:
diff --git a/roles/common/requirements 2.yml b/roles/common/requirements 2.yml
deleted file mode 100644
index 46dec9d..0000000
--- a/roles/common/requirements 2.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-- robertdebock.bootstrap
diff --git a/roles/docker/.github 2/FUNDING.yml b/roles/docker/.github 2/FUNDING.yml
deleted file mode 100644
index 67320f0..0000000
--- a/roles/docker/.github 2/FUNDING.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-github: robertdebock
diff --git a/roles/docker/.github 2/pull_request_template.md b/roles/docker/.github 2/pull_request_template.md
deleted file mode 100644
index b1578c0..0000000
--- a/roles/docker/.github 2/pull_request_template.md	
+++ /dev/null
@@ -1,11 +0,0 @@
----
-name: Pull request
-about: Describe the proposed change
-
----
-
-**Describe the change**
-A clear and concise description of what the pull request is.
-
-**Testing**
-In case a feature was added, how were tests performed?
diff --git a/roles/docker/.github 2/settings.yml b/roles/docker/.github 2/settings.yml
deleted file mode 100644
index 059ae76..0000000
--- a/roles/docker/.github 2/settings.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
----
-#
-# Ansible managed
-#
-repository:
-  description: Install and configure Docker (non-CE) on your system.
-  homepage: https://robertdebock.nl/
diff --git a/roles/docker/.gitignore 2 b/roles/docker/.gitignore 2
deleted file mode 100644
index 982db11..0000000
--- a/roles/docker/.gitignore 2	
+++ /dev/null
@@ -1,4 +0,0 @@
-.molecule
-*.log
-*.swp
-.tox
diff --git a/roles/docker/meta 2/.galaxy_install_info b/roles/docker/meta 2/.galaxy_install_info
deleted file mode 100644
index 4c66e62..0000000
--- a/roles/docker/meta 2/.galaxy_install_info	
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 13:22:11 2020
-version: 2.4.3
diff --git a/roles/docker/meta 2/exception.yml b/roles/docker/meta 2/exception.yml
deleted file mode 100644
index 774cd36..0000000
--- a/roles/docker/meta 2/exception.yml	
+++ /dev/null
@@ -1,6 +0,0 @@
----
-exceptions:
-  - variation: Ubuntu
-    reason: "Unable to find any of pip2, pip to use."
-  - variation: amazonlinux
-    reason: "Required dependency (python_pip) does not work on amazonlinux."
diff --git a/roles/docker/meta 2/preferences.yml b/roles/docker/meta 2/preferences.yml
deleted file mode 100644
index e7fdebf..0000000
--- a/roles/docker/meta 2/preferences.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-tox_parallel: yes
diff --git a/roles/docker/molecule 2/default/converge.yml b/roles/docker/molecule 2/default/converge.yml
deleted file mode 100644
index bdbb251..0000000
--- a/roles/docker/molecule 2/default/converge.yml	
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Converge
-  hosts: all
-  become: yes
-  gather_facts: yes
-
-  roles:
-    - role: ansible-role-docker
diff --git a/roles/docker/molecule 2/default/prepare.yml b/roles/docker/molecule 2/default/prepare.yml
deleted file mode 100644
index 0d6f180..0000000
--- a/roles/docker/molecule 2/default/prepare.yml	
+++ /dev/null
@@ -1,12 +0,0 @@
----
-- name: Prepare
-  hosts: all
-  gather_facts: no
-  become: yes
-
-  roles:
-    - role: robertdebock.bootstrap
-    - role: robertdebock.core_dependencies
-    - role: robertdebock.buildtools
-    - role: robertdebock.epel
-    - role: robertdebock.python_pip
diff --git a/roles/docker/molecule 2/default/verify.yml b/roles/docker/molecule 2/default/verify.yml
deleted file mode 100644
index 091a21e..0000000
--- a/roles/docker/molecule 2/default/verify.yml	
+++ /dev/null
@@ -1,15 +0,0 @@
----
-- name: Verify
-  hosts: all
-  become: yes
-  gather_facts: no
-
-  tasks:
-    - name: Create a container
-      docker_container:
-        name: openssh
-        image: robertdebock/docker-centos-openssh
-        ports:
-          - "2222:22"
-      when:
-        - ansible_connection != "docker"
diff --git a/roles/epel/.ansible-lint 2 b/roles/epel/.ansible-lint 2
deleted file mode 100644
index cb2872e..0000000
--- a/roles/epel/.ansible-lint 2	
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Ansible managed
-#
-exclude_paths:
-  - ./meta/preferences.yml
-  - ./molecule/default/verify.yml
-  - ./.tox
diff --git a/roles/epel/.github 2/FUNDING.yml b/roles/epel/.github 2/FUNDING.yml
deleted file mode 100644
index 67320f0..0000000
--- a/roles/epel/.github 2/FUNDING.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-github: robertdebock
diff --git a/roles/epel/.github 2/pull_request_template.md b/roles/epel/.github 2/pull_request_template.md
deleted file mode 100644
index b1578c0..0000000
--- a/roles/epel/.github 2/pull_request_template.md	
+++ /dev/null
@@ -1,11 +0,0 @@
----
-name: Pull request
-about: Describe the proposed change
-
----
-
-**Describe the change**
-A clear and concise description of what the pull request is.
-
-**Testing**
-In case a feature was added, how were tests performed?
diff --git a/roles/epel/.github 2/settings.yml b/roles/epel/.github 2/settings.yml
deleted file mode 100644
index 491309e..0000000
--- a/roles/epel/.github 2/settings.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
----
-#
-# Ansible managed
-#
-repository:
-  description: Install epel on your system.
-  homepage: https://robertdebock.nl/
diff --git a/roles/epel/.gitignore 2 b/roles/epel/.gitignore 2
deleted file mode 100644
index 982db11..0000000
--- a/roles/epel/.gitignore 2	
+++ /dev/null
@@ -1,4 +0,0 @@
-.molecule
-*.log
-*.swp
-.tox
diff --git a/roles/epel/handlers 2/main.yml b/roles/epel/handlers 2/main.yml
deleted file mode 100644
index a281a2c..0000000
--- a/roles/epel/handlers 2/main.yml	
+++ /dev/null
@@ -1,5 +0,0 @@
----
-# handlers file for epel
-- name: yum update cache
-  yum:
-    update_cache: yes
diff --git a/roles/epel/meta 2/.galaxy_install_info b/roles/epel/meta 2/.galaxy_install_info
deleted file mode 100644
index b49dbf2..0000000
--- a/roles/epel/meta 2/.galaxy_install_info	
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 13:22:15 2020
-version: 2.5.1
diff --git a/roles/epel/meta 2/preferences.yml b/roles/epel/meta 2/preferences.yml
deleted file mode 100644
index e7fdebf..0000000
--- a/roles/epel/meta 2/preferences.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-tox_parallel: yes
diff --git a/roles/epel/molecule 2/default/converge.yml b/roles/epel/molecule 2/default/converge.yml
deleted file mode 100644
index edaa8ef..0000000
--- a/roles/epel/molecule 2/default/converge.yml	
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Converge
-  hosts: all
-  become: yes
-  gather_facts: yes
-
-  roles:
-    - role: ansible-role-epel
diff --git a/roles/epel/molecule 2/default/prepare.yml b/roles/epel/molecule 2/default/prepare.yml
deleted file mode 100644
index feb7d81..0000000
--- a/roles/epel/molecule 2/default/prepare.yml	
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Prepare
-  hosts: all
-  gather_facts: no
-  become: yes
-
-  roles:
-    - role: robertdebock.bootstrap
diff --git a/roles/epel/molecule 2/default/verify.yml b/roles/epel/molecule 2/default/verify.yml
deleted file mode 100644
index 8a418ca..0000000
--- a/roles/epel/molecule 2/default/verify.yml	
+++ /dev/null
@@ -1,11 +0,0 @@
----
-- name: Verify
-  hosts: all
-  become: yes
-  gather_facts: no
-
-  tasks:
-    - name: install a package from epel
-      package:
-        name: aalib
-        state: present
diff --git a/roles/epel/requirements 2.yml b/roles/epel/requirements 2.yml
deleted file mode 100644
index 46dec9d..0000000
--- a/roles/epel/requirements 2.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-- robertdebock.bootstrap
diff --git a/roles/fail2ban/.github 2/FUNDING.yml b/roles/fail2ban/.github 2/FUNDING.yml
deleted file mode 100644
index 67320f0..0000000
--- a/roles/fail2ban/.github 2/FUNDING.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-github: robertdebock
diff --git a/roles/fail2ban/.github 2/pull_request_template.md b/roles/fail2ban/.github 2/pull_request_template.md
deleted file mode 100644
index b1578c0..0000000
--- a/roles/fail2ban/.github 2/pull_request_template.md	
+++ /dev/null
@@ -1,11 +0,0 @@
----
-name: Pull request
-about: Describe the proposed change
-
----
-
-**Describe the change**
-A clear and concise description of what the pull request is.
-
-**Testing**
-In case a feature was added, how were tests performed?
diff --git a/roles/fail2ban/.github 2/settings.yml b/roles/fail2ban/.github 2/settings.yml
deleted file mode 100644
index 577ba15..0000000
--- a/roles/fail2ban/.github 2/settings.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
----
-#
-# Ansible managed
-#
-repository:
-  description: Install and configure fail2ban on your system.
-  homepage: https://robertdebock.nl/
diff --git a/roles/fail2ban/.gitignore 2 b/roles/fail2ban/.gitignore 2
deleted file mode 100644
index 982db11..0000000
--- a/roles/fail2ban/.gitignore 2	
+++ /dev/null
@@ -1,4 +0,0 @@
-.molecule
-*.log
-*.swp
-.tox
diff --git a/roles/fail2ban/meta 2/.galaxy_install_info b/roles/fail2ban/meta 2/.galaxy_install_info
deleted file mode 100644
index 1e6bee8..0000000
--- a/roles/fail2ban/meta 2/.galaxy_install_info	
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 13:22:18 2020
-version: 3.1.4
diff --git a/roles/fail2ban/meta 2/exception.yml b/roles/fail2ban/meta 2/exception.yml
deleted file mode 100644
index c364baa..0000000
--- a/roles/fail2ban/meta 2/exception.yml	
+++ /dev/null
@@ -1,6 +0,0 @@
----
-exceptions:
-  - variation: alpine
-    reason: "Service `fail2ban' needs non existent service `logger'"
-  - variation: amazonlinux:1
-    reason: "file /etc/ethertypes conflicts between attempted installs of ebtables-2.0.10-16.amzn2.x86_64 and iptables-1.8.2-16.amzn2.0.1.x86_64"
diff --git a/roles/fail2ban/meta 2/preferences.yml b/roles/fail2ban/meta 2/preferences.yml
deleted file mode 100644
index e7fdebf..0000000
--- a/roles/fail2ban/meta 2/preferences.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-tox_parallel: yes
diff --git a/roles/fail2ban/molecule 2/default/converge.yml b/roles/fail2ban/molecule 2/default/converge.yml
deleted file mode 100644
index 3194da6..0000000
--- a/roles/fail2ban/molecule 2/default/converge.yml	
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Converge
-  hosts: all
-  become: yes
-  gather_facts: yes
-
-  roles:
-    - role: ansible-role-fail2ban
diff --git a/roles/fail2ban/molecule 2/default/prepare.yml b/roles/fail2ban/molecule 2/default/prepare.yml
deleted file mode 100644
index c8572a5..0000000
--- a/roles/fail2ban/molecule 2/default/prepare.yml	
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- name: Prepare
-  hosts: all
-  gather_facts: no
-  become: yes
-
-  roles:
-    - role: robertdebock.bootstrap
-    - role: robertdebock.epel
diff --git a/roles/fail2ban/molecule 2/default/verify.yml b/roles/fail2ban/molecule 2/default/verify.yml
deleted file mode 100644
index b9dc6f8..0000000
--- a/roles/fail2ban/molecule 2/default/verify.yml	
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- name: Verify
-  hosts: all
-  become: yes
-  gather_facts: no
-
-  tasks:
-    - name: check if connection still works
-      ping:
diff --git a/roles/fail2ban/requirements 2.yml b/roles/fail2ban/requirements 2.yml
deleted file mode 100644
index cecd945..0000000
--- a/roles/fail2ban/requirements 2.yml	
+++ /dev/null
@@ -1,3 +0,0 @@
----
-- robertdebock.bootstrap
-- robertdebock.epel
diff --git a/roles/git/.ansible-lint 2 b/roles/git/.ansible-lint 2
deleted file mode 100644
index cb2872e..0000000
--- a/roles/git/.ansible-lint 2	
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Ansible managed
-#
-exclude_paths:
-  - ./meta/preferences.yml
-  - ./molecule/default/verify.yml
-  - ./.tox
diff --git a/roles/git/.github 2/FUNDING.yml b/roles/git/.github 2/FUNDING.yml
deleted file mode 100644
index 67320f0..0000000
--- a/roles/git/.github 2/FUNDING.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-github: robertdebock
diff --git a/roles/git/.github 2/pull_request_template.md b/roles/git/.github 2/pull_request_template.md
deleted file mode 100644
index b1578c0..0000000
--- a/roles/git/.github 2/pull_request_template.md	
+++ /dev/null
@@ -1,11 +0,0 @@
----
-name: Pull request
-about: Describe the proposed change
-
----
-
-**Describe the change**
-A clear and concise description of what the pull request is.
-
-**Testing**
-In case a feature was added, how were tests performed?
diff --git a/roles/git/.github 2/settings.yml b/roles/git/.github 2/settings.yml
deleted file mode 100644
index 041c2ef..0000000
--- a/roles/git/.github 2/settings.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
----
-#
-# Ansible managed
-#
-repository:
-  description: Install and configure git on your system.
-  homepage: https://robertdebock.nl/
diff --git a/roles/git/.gitignore 2 b/roles/git/.gitignore 2
deleted file mode 100644
index 982db11..0000000
--- a/roles/git/.gitignore 2	
+++ /dev/null
@@ -1,4 +0,0 @@
-.molecule
-*.log
-*.swp
-.tox
diff --git a/roles/git/meta 2/.galaxy_install_info b/roles/git/meta 2/.galaxy_install_info
deleted file mode 100644
index 8676ff0..0000000
--- a/roles/git/meta 2/.galaxy_install_info	
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 13:22:21 2020
-version: 3.3.5
diff --git a/roles/git/meta 2/preferences.yml b/roles/git/meta 2/preferences.yml
deleted file mode 100644
index e7fdebf..0000000
--- a/roles/git/meta 2/preferences.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-tox_parallel: yes
diff --git a/roles/git/requirements 2.yml b/roles/git/requirements 2.yml
deleted file mode 100644
index 46dec9d..0000000
--- a/roles/git/requirements 2.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-- robertdebock.bootstrap
diff --git a/roles/git/templates 2/gitconfig.j2 b/roles/git/templates 2/gitconfig.j2
deleted file mode 100644
index 49567af..0000000
--- a/roles/git/templates 2/gitconfig.j2	
+++ /dev/null
@@ -1,3 +0,0 @@
-[user]
-	email = {{ git_user_email }}
-	name = {{ git_user_name }}
diff --git a/roles/git/vars 2/main.yml b/roles/git/vars 2/main.yml
deleted file mode 100644
index fbc7f01..0000000
--- a/roles/git/vars 2/main.yml	
+++ /dev/null
@@ -1,5 +0,0 @@
----
-# vars file for git
-
-git_packages:
-  - git
diff --git a/roles/investigate/.ansible-lint 2 b/roles/investigate/.ansible-lint 2
deleted file mode 100644
index cb2872e..0000000
--- a/roles/investigate/.ansible-lint 2	
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Ansible managed
-#
-exclude_paths:
-  - ./meta/preferences.yml
-  - ./molecule/default/verify.yml
-  - ./.tox
diff --git a/roles/investigate/.github 2/FUNDING.yml b/roles/investigate/.github 2/FUNDING.yml
deleted file mode 100644
index 67320f0..0000000
--- a/roles/investigate/.github 2/FUNDING.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-github: robertdebock
diff --git a/roles/investigate/.github 2/pull_request_template.md b/roles/investigate/.github 2/pull_request_template.md
deleted file mode 100644
index b1578c0..0000000
--- a/roles/investigate/.github 2/pull_request_template.md	
+++ /dev/null
@@ -1,11 +0,0 @@
----
-name: Pull request
-about: Describe the proposed change
-
----
-
-**Describe the change**
-A clear and concise description of what the pull request is.
-
-**Testing**
-In case a feature was added, how were tests performed?
diff --git a/roles/investigate/.github 2/settings.yml b/roles/investigate/.github 2/settings.yml
deleted file mode 100644
index 373a9a0..0000000
--- a/roles/investigate/.github 2/settings.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
----
-#
-# Ansible managed
-#
-repository:
-  description: Install and configure investigation tools on your system.
-  homepage: https://robertdebock.nl/
diff --git a/roles/investigate/.gitignore 2 b/roles/investigate/.gitignore 2
deleted file mode 100644
index 982db11..0000000
--- a/roles/investigate/.gitignore 2	
+++ /dev/null
@@ -1,4 +0,0 @@
-.molecule
-*.log
-*.swp
-.tox
diff --git a/roles/investigate/meta 2/.galaxy_install_info b/roles/investigate/meta 2/.galaxy_install_info
deleted file mode 100644
index f75c12d..0000000
--- a/roles/investigate/meta 2/.galaxy_install_info	
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 13:22:23 2020
-version: 2.3.4
diff --git a/roles/investigate/meta 2/preferences.yml b/roles/investigate/meta 2/preferences.yml
deleted file mode 100644
index e7fdebf..0000000
--- a/roles/investigate/meta 2/preferences.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-tox_parallel: yes
diff --git a/roles/investigate/requirements 2.yml b/roles/investigate/requirements 2.yml
deleted file mode 100644
index cecd945..0000000
--- a/roles/investigate/requirements 2.yml	
+++ /dev/null
@@ -1,3 +0,0 @@
----
-- robertdebock.bootstrap
-- robertdebock.epel
diff --git a/roles/molecule/.github 2/FUNDING.yml b/roles/molecule/.github 2/FUNDING.yml
deleted file mode 100644
index 67320f0..0000000
--- a/roles/molecule/.github 2/FUNDING.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-github: robertdebock
diff --git a/roles/molecule/.github 2/pull_request_template.md b/roles/molecule/.github 2/pull_request_template.md
deleted file mode 100644
index b1578c0..0000000
--- a/roles/molecule/.github 2/pull_request_template.md	
+++ /dev/null
@@ -1,11 +0,0 @@
----
-name: Pull request
-about: Describe the proposed change
-
----
-
-**Describe the change**
-A clear and concise description of what the pull request is.
-
-**Testing**
-In case a feature was added, how were tests performed?
diff --git a/roles/molecule/.github 2/settings.yml b/roles/molecule/.github 2/settings.yml
deleted file mode 100644
index c7caec3..0000000
--- a/roles/molecule/.github 2/settings.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
----
-#
-# Ansible managed
-#
-repository:
-  description: Install Molecule on your system.
-  homepage: https://robertdebock.nl/
diff --git a/roles/molecule/.gitignore 2 b/roles/molecule/.gitignore 2
deleted file mode 100644
index 982db11..0000000
--- a/roles/molecule/.gitignore 2	
+++ /dev/null
@@ -1,4 +0,0 @@
-.molecule
-*.log
-*.swp
-.tox
diff --git a/roles/molecule/meta 2/.galaxy_install_info b/roles/molecule/meta 2/.galaxy_install_info
deleted file mode 100644
index 05147fc..0000000
--- a/roles/molecule/meta 2/.galaxy_install_info	
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 13:22:25 2020
-version: 2.3.1
diff --git a/roles/molecule/meta 2/preferences.yml b/roles/molecule/meta 2/preferences.yml
deleted file mode 100644
index e7fdebf..0000000
--- a/roles/molecule/meta 2/preferences.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-tox_parallel: yes
diff --git a/roles/molecule/molecule 2/default/converge.yml b/roles/molecule/molecule 2/default/converge.yml
deleted file mode 100644
index f62959c..0000000
--- a/roles/molecule/molecule 2/default/converge.yml	
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Converge
-  hosts: all
-  become: yes
-  gather_facts: yes
-
-  roles:
-    - role: ansible-role-molecule
diff --git a/roles/molecule/molecule 2/default/prepare.yml b/roles/molecule/molecule 2/default/prepare.yml
deleted file mode 100644
index a44724a..0000000
--- a/roles/molecule/molecule 2/default/prepare.yml	
+++ /dev/null
@@ -1,11 +0,0 @@
----
-- name: Prepare
-  hosts: all
-  gather_facts: no
-  become: yes
-
-  roles:
-    - role: robertdebock.bootstrap
-    - role: robertdebock.buildtools
-    - role: robertdebock.epel
-    - role: robertdebock.python_pip
diff --git a/roles/molecule/molecule 2/default/verify.yml b/roles/molecule/molecule 2/default/verify.yml
deleted file mode 100644
index b9dc6f8..0000000
--- a/roles/molecule/molecule 2/default/verify.yml	
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- name: Verify
-  hosts: all
-  become: yes
-  gather_facts: no
-
-  tasks:
-    - name: check if connection still works
-      ping:
diff --git a/roles/molecule/requirements 2.yml b/roles/molecule/requirements 2.yml
deleted file mode 100644
index 2fd552b..0000000
--- a/roles/molecule/requirements 2.yml	
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- robertdebock.bootstrap
-- robertdebock.buildtools
-- robertdebock.epel
-- robertdebock.python_pip
diff --git a/roles/postfix/.github 2/FUNDING.yml b/roles/postfix/.github 2/FUNDING.yml
deleted file mode 100644
index 67320f0..0000000
--- a/roles/postfix/.github 2/FUNDING.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-github: robertdebock
diff --git a/roles/postfix/.github 2/pull_request_template.md b/roles/postfix/.github 2/pull_request_template.md
deleted file mode 100644
index b1578c0..0000000
--- a/roles/postfix/.github 2/pull_request_template.md	
+++ /dev/null
@@ -1,11 +0,0 @@
----
-name: Pull request
-about: Describe the proposed change
-
----
-
-**Describe the change**
-A clear and concise description of what the pull request is.
-
-**Testing**
-In case a feature was added, how were tests performed?
diff --git a/roles/postfix/.github 2/settings.yml b/roles/postfix/.github 2/settings.yml
deleted file mode 100644
index ae4da49..0000000
--- a/roles/postfix/.github 2/settings.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
----
-#
-# Ansible managed
-#
-repository:
-  description: Install and configure postfix on your system.
-  homepage: https://robertdebock.nl/
diff --git a/roles/postfix/.gitignore 2 b/roles/postfix/.gitignore 2
deleted file mode 100644
index 982db11..0000000
--- a/roles/postfix/.gitignore 2	
+++ /dev/null
@@ -1,4 +0,0 @@
-.molecule
-*.log
-*.swp
-.tox
diff --git a/roles/postfix/meta 2/.galaxy_install_info b/roles/postfix/meta 2/.galaxy_install_info
deleted file mode 100644
index 8880af9..0000000
--- a/roles/postfix/meta 2/.galaxy_install_info	
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 13:22:27 2020
-version: 3.3.2
diff --git a/roles/postfix/meta 2/exception.yml b/roles/postfix/meta 2/exception.yml
deleted file mode 100644
index d70b96a..0000000
--- a/roles/postfix/meta 2/exception.yml	
+++ /dev/null
@@ -1,6 +0,0 @@
----
-exceptions:
-  - variation: opensuse
-    reason: "Not idempotent on configure postfix (main.cf) and configure postfix"
-  - variation: alpine
-    reason: "451, 4.3.0 <root@example.com>: Temporary lookup failure"
diff --git a/roles/postfix/meta 2/preferences.yml b/roles/postfix/meta 2/preferences.yml
deleted file mode 100644
index e7fdebf..0000000
--- a/roles/postfix/meta 2/preferences.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-tox_parallel: yes
diff --git a/roles/postfix/requirements 2.yml b/roles/postfix/requirements 2.yml
deleted file mode 100644
index e531325..0000000
--- a/roles/postfix/requirements 2.yml	
+++ /dev/null
@@ -1,3 +0,0 @@
----
-- robertdebock.bootstrap
-- robertdebock.core_dependencies
diff --git a/roles/python_pip/.github 2/FUNDING.yml b/roles/python_pip/.github 2/FUNDING.yml
deleted file mode 100644
index 67320f0..0000000
--- a/roles/python_pip/.github 2/FUNDING.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-github: robertdebock
diff --git a/roles/python_pip/.github 2/pull_request_template.md b/roles/python_pip/.github 2/pull_request_template.md
deleted file mode 100644
index b1578c0..0000000
--- a/roles/python_pip/.github 2/pull_request_template.md	
+++ /dev/null
@@ -1,11 +0,0 @@
----
-name: Pull request
-about: Describe the proposed change
-
----
-
-**Describe the change**
-A clear and concise description of what the pull request is.
-
-**Testing**
-In case a feature was added, how were tests performed?
diff --git a/roles/python_pip/.github 2/settings.yml b/roles/python_pip/.github 2/settings.yml
deleted file mode 100644
index 98dbddf..0000000
--- a/roles/python_pip/.github 2/settings.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
----
-#
-# Ansible managed
-#
-repository:
-  description: Install pythons pip on your system.
-  homepage: https://robertdebock.nl/
diff --git a/roles/python_pip/.gitignore 2 b/roles/python_pip/.gitignore 2
deleted file mode 100644
index 982db11..0000000
--- a/roles/python_pip/.gitignore 2	
+++ /dev/null
@@ -1,4 +0,0 @@
-.molecule
-*.log
-*.swp
-.tox
diff --git a/roles/python_pip/meta 2/.galaxy_install_info b/roles/python_pip/meta 2/.galaxy_install_info
deleted file mode 100644
index d21cfb2..0000000
--- a/roles/python_pip/meta 2/.galaxy_install_info	
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 13:22:31 2020
-version: 3.3.11
diff --git a/roles/python_pip/meta 2/exception.yml b/roles/python_pip/meta 2/exception.yml
deleted file mode 100644
index c6f46c0..0000000
--- a/roles/python_pip/meta 2/exception.yml	
+++ /dev/null
@@ -1,6 +0,0 @@
----
-exceptions:
-  - variation: amazonline:1
-    reason: "ImportError: No module named pkg_resources"
-  - variation: amazonline
-    reason: "ImportError: No module named pkg_resources"
diff --git a/roles/python_pip/meta 2/preferences.yml b/roles/python_pip/meta 2/preferences.yml
deleted file mode 100644
index e7fdebf..0000000
--- a/roles/python_pip/meta 2/preferences.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-tox_parallel: yes
diff --git a/roles/python_pip/molecule 2/default/converge.yml b/roles/python_pip/molecule 2/default/converge.yml
deleted file mode 100644
index ee3c770..0000000
--- a/roles/python_pip/molecule 2/default/converge.yml	
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Converge
-  hosts: all
-  become: yes
-  gather_facts: yes
-
-  roles:
-    - role: ansible-role-python_pip
diff --git a/roles/python_pip/molecule 2/default/prepare.yml b/roles/python_pip/molecule 2/default/prepare.yml
deleted file mode 100644
index 1772675..0000000
--- a/roles/python_pip/molecule 2/default/prepare.yml	
+++ /dev/null
@@ -1,10 +0,0 @@
----
-- name: Prepare
-  hosts: all
-  gather_facts: no
-  become: yes
-
-  roles:
-    - role: robertdebock.bootstrap
-    - role: robertdebock.epel
-    - role: robertdebock.buildtools
diff --git a/roles/python_pip/requirements 2.yml b/roles/python_pip/requirements 2.yml
deleted file mode 100644
index 0682eb0..0000000
--- a/roles/python_pip/requirements 2.yml	
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- robertdebock.bootstrap
-- robertdebock.buildtools
-- robertdebock.epel
diff --git a/roles/reboot/.ansible-lint 2 b/roles/reboot/.ansible-lint 2
deleted file mode 100644
index cb2872e..0000000
--- a/roles/reboot/.ansible-lint 2	
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Ansible managed
-#
-exclude_paths:
-  - ./meta/preferences.yml
-  - ./molecule/default/verify.yml
-  - ./.tox
diff --git a/roles/reboot/.github 2/FUNDING.yml b/roles/reboot/.github 2/FUNDING.yml
deleted file mode 100644
index 67320f0..0000000
--- a/roles/reboot/.github 2/FUNDING.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-github: robertdebock
diff --git a/roles/reboot/.github 2/pull_request_template.md b/roles/reboot/.github 2/pull_request_template.md
deleted file mode 100644
index b1578c0..0000000
--- a/roles/reboot/.github 2/pull_request_template.md	
+++ /dev/null
@@ -1,11 +0,0 @@
----
-name: Pull request
-about: Describe the proposed change
-
----
-
-**Describe the change**
-A clear and concise description of what the pull request is.
-
-**Testing**
-In case a feature was added, how were tests performed?
diff --git a/roles/reboot/.github 2/settings.yml b/roles/reboot/.github 2/settings.yml
deleted file mode 100644
index 82c8276..0000000
--- a/roles/reboot/.github 2/settings.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
----
-#
-# Ansible managed
-#
-repository:
-  description: The purpose of this role is to reboot your system.
-  homepage: https://robertdebock.nl/
diff --git a/roles/reboot/.gitignore 2 b/roles/reboot/.gitignore 2
deleted file mode 100644
index 982db11..0000000
--- a/roles/reboot/.gitignore 2	
+++ /dev/null
@@ -1,4 +0,0 @@
-.molecule
-*.log
-*.swp
-.tox
diff --git a/roles/reboot/meta 2/.galaxy_install_info b/roles/reboot/meta 2/.galaxy_install_info
deleted file mode 100644
index 7a413c2..0000000
--- a/roles/reboot/meta 2/.galaxy_install_info	
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 13:22:33 2020
-version: 2.6.3
diff --git a/roles/reboot/meta 2/preferences.yml b/roles/reboot/meta 2/preferences.yml
deleted file mode 100644
index e7fdebf..0000000
--- a/roles/reboot/meta 2/preferences.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-tox_parallel: yes
diff --git a/roles/reboot/molecule 2/default/converge.yml b/roles/reboot/molecule 2/default/converge.yml
deleted file mode 100644
index f85ea78..0000000
--- a/roles/reboot/molecule 2/default/converge.yml	
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Converge
-  hosts: all
-  become: yes
-  gather_facts: yes
-
-  roles:
-    - role: ansible-role-reboot
diff --git a/roles/reboot/molecule 2/default/prepare.yml b/roles/reboot/molecule 2/default/prepare.yml
deleted file mode 100644
index feb7d81..0000000
--- a/roles/reboot/molecule 2/default/prepare.yml	
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Prepare
-  hosts: all
-  gather_facts: no
-  become: yes
-
-  roles:
-    - role: robertdebock.bootstrap
diff --git a/roles/reboot/molecule 2/default/verify.yml b/roles/reboot/molecule 2/default/verify.yml
deleted file mode 100644
index b9dc6f8..0000000
--- a/roles/reboot/molecule 2/default/verify.yml	
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- name: Verify
-  hosts: all
-  become: yes
-  gather_facts: no
-
-  tasks:
-    - name: check if connection still works
-      ping:
diff --git a/roles/reboot/requirements 2.yml b/roles/reboot/requirements 2.yml
deleted file mode 100644
index 46dec9d..0000000
--- a/roles/reboot/requirements 2.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-- robertdebock.bootstrap
diff --git a/roles/ruby/.ansible-lint 2 b/roles/ruby/.ansible-lint 2
deleted file mode 100644
index acb2d05..0000000
--- a/roles/ruby/.ansible-lint 2	
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Ansible managed
-#
-exclude_paths:
-  - ./meta/preferences.yml
-  - ./molecule/default/verify.yml
diff --git a/roles/ruby/.github 2/FUNDING.yml b/roles/ruby/.github 2/FUNDING.yml
deleted file mode 100644
index 67320f0..0000000
--- a/roles/ruby/.github 2/FUNDING.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-github: robertdebock
diff --git a/roles/ruby/.github 2/pull_request_template.md b/roles/ruby/.github 2/pull_request_template.md
deleted file mode 100644
index b1578c0..0000000
--- a/roles/ruby/.github 2/pull_request_template.md	
+++ /dev/null
@@ -1,11 +0,0 @@
----
-name: Pull request
-about: Describe the proposed change
-
----
-
-**Describe the change**
-A clear and concise description of what the pull request is.
-
-**Testing**
-In case a feature was added, how were tests performed?
diff --git a/roles/ruby/.github 2/settings.yml b/roles/ruby/.github 2/settings.yml
deleted file mode 100644
index 6a92b70..0000000
--- a/roles/ruby/.github 2/settings.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
----
-#
-# Ansible managed
-#
-repository:
-  description: Install ruby on your system.
-  homepage: https://robertdebock.nl/
diff --git a/roles/ruby/.gitignore 2 b/roles/ruby/.gitignore 2
deleted file mode 100644
index 982db11..0000000
--- a/roles/ruby/.gitignore 2	
+++ /dev/null
@@ -1,4 +0,0 @@
-.molecule
-*.log
-*.swp
-.tox
diff --git a/roles/ruby/meta 2/.galaxy_install_info b/roles/ruby/meta 2/.galaxy_install_info
deleted file mode 100644
index eeb3a8e..0000000
--- a/roles/ruby/meta 2/.galaxy_install_info	
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 13:22:36 2020
-version: 2.2.9
diff --git a/roles/ruby/meta 2/preferences.yml b/roles/ruby/meta 2/preferences.yml
deleted file mode 100644
index e7fdebf..0000000
--- a/roles/ruby/meta 2/preferences.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-tox_parallel: yes
diff --git a/roles/ruby/molecule 2/default/converge.yml b/roles/ruby/molecule 2/default/converge.yml
deleted file mode 100644
index b12ce21..0000000
--- a/roles/ruby/molecule 2/default/converge.yml	
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Converge
-  hosts: all
-  become: yes
-  gather_facts: yes
-
-  roles:
-    - role: ansible-role-ruby
diff --git a/roles/ruby/molecule 2/default/prepare.yml b/roles/ruby/molecule 2/default/prepare.yml
deleted file mode 100644
index f76c7bf..0000000
--- a/roles/ruby/molecule 2/default/prepare.yml	
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Prepare
-  hosts: all
-  become: yes
-  gather_facts: no
-
-  roles:
-    - role: robertdebock.bootstrap
diff --git a/roles/ruby/molecule 2/default/verify.yml b/roles/ruby/molecule 2/default/verify.yml
deleted file mode 100644
index 6ab75cf..0000000
--- a/roles/ruby/molecule 2/default/verify.yml	
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- name: Verify
-  hosts: all
-  become: yes
-  gather_facts: yes
-
-  tasks:
-    - name: check if connection still works
-      ping:
diff --git a/roles/ruby/requirements 2.yml b/roles/ruby/requirements 2.yml
deleted file mode 100644
index 46dec9d..0000000
--- a/roles/ruby/requirements 2.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-- robertdebock.bootstrap
diff --git a/roles/ruby/tasks 2/main.yml b/roles/ruby/tasks 2/main.yml
deleted file mode 100644
index 9817d7a..0000000
--- a/roles/ruby/tasks 2/main.yml	
+++ /dev/null
@@ -1,5 +0,0 @@
----
-# tasks file for ruby
-- name: install ruby
-  package:
-    name: "{{ ruby_packages }}"
diff --git a/roles/ruby/vars 2/main.yml b/roles/ruby/vars 2/main.yml
deleted file mode 100644
index 275d903..0000000
--- a/roles/ruby/vars 2/main.yml	
+++ /dev/null
@@ -1,5 +0,0 @@
----
-# vars file for ruby
-
-ruby_packages:
-  - ruby
diff --git a/roles/service/.ansible-lint 2 b/roles/service/.ansible-lint 2
deleted file mode 100644
index cb2872e..0000000
--- a/roles/service/.ansible-lint 2	
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Ansible managed
-#
-exclude_paths:
-  - ./meta/preferences.yml
-  - ./molecule/default/verify.yml
-  - ./.tox
diff --git a/roles/service/.github 2/FUNDING.yml b/roles/service/.github 2/FUNDING.yml
deleted file mode 100644
index 67320f0..0000000
--- a/roles/service/.github 2/FUNDING.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-github: robertdebock
diff --git a/roles/service/.github 2/pull_request_template.md b/roles/service/.github 2/pull_request_template.md
deleted file mode 100644
index b1578c0..0000000
--- a/roles/service/.github 2/pull_request_template.md	
+++ /dev/null
@@ -1,11 +0,0 @@
----
-name: Pull request
-about: Describe the proposed change
-
----
-
-**Describe the change**
-A clear and concise description of what the pull request is.
-
-**Testing**
-In case a feature was added, how were tests performed?
diff --git a/roles/service/.github 2/settings.yml b/roles/service/.github 2/settings.yml
deleted file mode 100644
index 8bb3037..0000000
--- a/roles/service/.github 2/settings.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
----
-#
-# Ansible managed
-#
-repository:
-  description: Add custom services to your Linux system.
-  homepage: https://robertdebock.nl/
diff --git a/roles/service/.gitignore 2 b/roles/service/.gitignore 2
deleted file mode 100644
index 982db11..0000000
--- a/roles/service/.gitignore 2	
+++ /dev/null
@@ -1,4 +0,0 @@
-.molecule
-*.log
-*.swp
-.tox
diff --git a/roles/service/meta 2/.galaxy_install_info b/roles/service/meta 2/.galaxy_install_info
deleted file mode 100644
index e94ab9c..0000000
--- a/roles/service/meta 2/.galaxy_install_info	
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 13:22:39 2020
-version: 2.6.6
diff --git a/roles/service/meta 2/preferences.yml b/roles/service/meta 2/preferences.yml
deleted file mode 100644
index e7fdebf..0000000
--- a/roles/service/meta 2/preferences.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-tox_parallel: yes
diff --git a/roles/service/requirements 2.yml b/roles/service/requirements 2.yml
deleted file mode 100644
index 46dec9d..0000000
--- a/roles/service/requirements 2.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-- robertdebock.bootstrap
diff --git a/roles/travis/.github 2/FUNDING.yml b/roles/travis/.github 2/FUNDING.yml
deleted file mode 100644
index 67320f0..0000000
--- a/roles/travis/.github 2/FUNDING.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-github: robertdebock
diff --git a/roles/travis/.github 2/pull_request_template.md b/roles/travis/.github 2/pull_request_template.md
deleted file mode 100644
index b1578c0..0000000
--- a/roles/travis/.github 2/pull_request_template.md	
+++ /dev/null
@@ -1,11 +0,0 @@
----
-name: Pull request
-about: Describe the proposed change
-
----
-
-**Describe the change**
-A clear and concise description of what the pull request is.
-
-**Testing**
-In case a feature was added, how were tests performed?
diff --git a/roles/travis/.github 2/settings.yml b/roles/travis/.github 2/settings.yml
deleted file mode 100644
index 9cd2a21..0000000
--- a/roles/travis/.github 2/settings.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
----
-#
-# Ansible managed
-#
-repository:
-  description: Installs travis on your system.
-  homepage: https://robertdebock.nl/
diff --git a/roles/travis/.gitignore 2 b/roles/travis/.gitignore 2
deleted file mode 100644
index 982db11..0000000
--- a/roles/travis/.gitignore 2	
+++ /dev/null
@@ -1,4 +0,0 @@
-.molecule
-*.log
-*.swp
-.tox
diff --git a/roles/travis/meta 2/.galaxy_install_info b/roles/travis/meta 2/.galaxy_install_info
deleted file mode 100644
index 55d8aae..0000000
--- a/roles/travis/meta 2/.galaxy_install_info	
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 13:22:41 2020
-version: 3.0.5
diff --git a/roles/travis/meta 2/exception.yml b/roles/travis/meta 2/exception.yml
deleted file mode 100644
index 66d9e65..0000000
--- a/roles/travis/meta 2/exception.yml	
+++ /dev/null
@@ -1,6 +0,0 @@
----
-exceptions:
-  - variation: CentOS 7
-    reason: "Dependency faraday requires Ruby version >= 2.3"
-  - variation: Fedora
-    reason: "extconf failed, exit code 1"
diff --git a/roles/travis/meta 2/preferences.yml b/roles/travis/meta 2/preferences.yml
deleted file mode 100644
index e7fdebf..0000000
--- a/roles/travis/meta 2/preferences.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-tox_parallel: yes
diff --git a/roles/travis/molecule 2/default/converge.yml b/roles/travis/molecule 2/default/converge.yml
deleted file mode 100644
index 3143587..0000000
--- a/roles/travis/molecule 2/default/converge.yml	
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Converge
-  hosts: all
-  become: yes
-  gather_facts: yes
-
-  roles:
-    - role: ansible-role-travis
diff --git a/roles/travis/molecule 2/default/prepare.yml b/roles/travis/molecule 2/default/prepare.yml
deleted file mode 100644
index a4f3931..0000000
--- a/roles/travis/molecule 2/default/prepare.yml	
+++ /dev/null
@@ -1,10 +0,0 @@
----
-- name: Prepare
-  hosts: all
-  gather_facts: no
-  become: yes
-
-  roles:
-    - role: robertdebock.bootstrap
-    - role: robertdebock.buildtools
-    - role: robertdebock.ruby
diff --git a/roles/travis/molecule 2/default/verify.yml b/roles/travis/molecule 2/default/verify.yml
deleted file mode 100644
index 6ab75cf..0000000
--- a/roles/travis/molecule 2/default/verify.yml	
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- name: Verify
-  hosts: all
-  become: yes
-  gather_facts: yes
-
-  tasks:
-    - name: check if connection still works
-      ping:
diff --git a/roles/travis/requirements 2.yml b/roles/travis/requirements 2.yml
deleted file mode 100644
index 5c1fe87..0000000
--- a/roles/travis/requirements 2.yml	
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- robertdebock.bootstrap
-- robertdebock.buildtools
-- robertdebock.ruby
diff --git a/roles/update/.github 2/FUNDING.yml b/roles/update/.github 2/FUNDING.yml
deleted file mode 100644
index 67320f0..0000000
--- a/roles/update/.github 2/FUNDING.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-github: robertdebock
diff --git a/roles/update/.github 2/pull_request_template.md b/roles/update/.github 2/pull_request_template.md
deleted file mode 100644
index b1578c0..0000000
--- a/roles/update/.github 2/pull_request_template.md	
+++ /dev/null
@@ -1,11 +0,0 @@
----
-name: Pull request
-about: Describe the proposed change
-
----
-
-**Describe the change**
-A clear and concise description of what the pull request is.
-
-**Testing**
-In case a feature was added, how were tests performed?
diff --git a/roles/update/.github 2/settings.yml b/roles/update/.github 2/settings.yml
deleted file mode 100644
index 823f25d..0000000
--- a/roles/update/.github 2/settings.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
----
-#
-# Ansible managed
-#
-repository:
-  description: Install updates on your system.
-  homepage: https://robertdebock.nl/
diff --git a/roles/update/.gitignore 2 b/roles/update/.gitignore 2
deleted file mode 100644
index 982db11..0000000
--- a/roles/update/.gitignore 2	
+++ /dev/null
@@ -1,4 +0,0 @@
-.molecule
-*.log
-*.swp
-.tox
diff --git a/roles/update/meta 2/.galaxy_install_info b/roles/update/meta 2/.galaxy_install_info
deleted file mode 100644
index 2b3b846..0000000
--- a/roles/update/meta 2/.galaxy_install_info	
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 13:22:43 2020
-version: 2.3.3
diff --git a/roles/update/meta 2/exception.yml b/roles/update/meta 2/exception.yml
deleted file mode 100644
index 6da44d3..0000000
--- a/roles/update/meta 2/exception.yml	
+++ /dev/null
@@ -1,4 +0,0 @@
----
-exceptions:
-  - variation: Archlinux & Ansible 2.7
-    reason: New-style module did not handle its own exit
diff --git a/roles/update/meta 2/preferences.yml b/roles/update/meta 2/preferences.yml
deleted file mode 100644
index e7fdebf..0000000
--- a/roles/update/meta 2/preferences.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-tox_parallel: yes
diff --git a/roles/update/molecule 2/default/converge.yml b/roles/update/molecule 2/default/converge.yml
deleted file mode 100644
index b42ae1d..0000000
--- a/roles/update/molecule 2/default/converge.yml	
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Converge
-  hosts: all
-  become: yes
-  gather_facts: yes
-
-  roles:
-    - role: ansible-role-update
diff --git a/roles/update/molecule 2/default/prepare.yml b/roles/update/molecule 2/default/prepare.yml
deleted file mode 100644
index f76c7bf..0000000
--- a/roles/update/molecule 2/default/prepare.yml	
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Prepare
-  hosts: all
-  become: yes
-  gather_facts: no
-
-  roles:
-    - role: robertdebock.bootstrap
diff --git a/roles/update/molecule 2/default/verify.yml b/roles/update/molecule 2/default/verify.yml
deleted file mode 100644
index 6ab75cf..0000000
--- a/roles/update/molecule 2/default/verify.yml	
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- name: Verify
-  hosts: all
-  become: yes
-  gather_facts: yes
-
-  tasks:
-    - name: check if connection still works
-      ping:
diff --git a/roles/update/requirements 2.yml b/roles/update/requirements 2.yml
deleted file mode 100644
index 46dec9d..0000000
--- a/roles/update/requirements 2.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-- robertdebock.bootstrap
diff --git a/roles/users/.ansible-lint 2 b/roles/users/.ansible-lint 2
deleted file mode 100644
index cb2872e..0000000
--- a/roles/users/.ansible-lint 2	
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Ansible managed
-#
-exclude_paths:
-  - ./meta/preferences.yml
-  - ./molecule/default/verify.yml
-  - ./.tox
diff --git a/roles/users/.github 2/FUNDING.yml b/roles/users/.github 2/FUNDING.yml
deleted file mode 100644
index 67320f0..0000000
--- a/roles/users/.github 2/FUNDING.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-github: robertdebock
diff --git a/roles/users/.github 2/pull_request_template.md b/roles/users/.github 2/pull_request_template.md
deleted file mode 100644
index b1578c0..0000000
--- a/roles/users/.github 2/pull_request_template.md	
+++ /dev/null
@@ -1,11 +0,0 @@
----
-name: Pull request
-about: Describe the proposed change
-
----
-
-**Describe the change**
-A clear and concise description of what the pull request is.
-
-**Testing**
-In case a feature was added, how were tests performed?
diff --git a/roles/users/.github 2/settings.yml b/roles/users/.github 2/settings.yml
deleted file mode 100644
index cd26217..0000000
--- a/roles/users/.github 2/settings.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
----
-#
-# Ansible managed
-#
-repository:
-  description: The purpose of this role is to add users and groups on your system.
-  homepage: https://robertdebock.nl/
diff --git a/roles/users/.gitignore 2 b/roles/users/.gitignore 2
deleted file mode 100644
index 982db11..0000000
--- a/roles/users/.gitignore 2	
+++ /dev/null
@@ -1,4 +0,0 @@
-.molecule
-*.log
-*.swp
-.tox
diff --git a/roles/users/meta 2/.galaxy_install_info b/roles/users/meta 2/.galaxy_install_info
deleted file mode 100644
index 54407be..0000000
--- a/roles/users/meta 2/.galaxy_install_info	
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 13:22:46 2020
-version: 4.3.3
diff --git a/roles/users/meta 2/preferences.yml b/roles/users/meta 2/preferences.yml
deleted file mode 100644
index e7fdebf..0000000
--- a/roles/users/meta 2/preferences.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-tox_parallel: yes
diff --git a/roles/users/requirements 2.yml b/roles/users/requirements 2.yml
deleted file mode 100644
index e531325..0000000
--- a/roles/users/requirements 2.yml	
+++ /dev/null
@@ -1,3 +0,0 @@
----
-- robertdebock.bootstrap
-- robertdebock.core_dependencies
diff --git a/roles/users/templates 2/.gitkeep b/roles/users/templates 2/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/roles/users/templates 2/cron.allow.j2 b/roles/users/templates 2/cron.allow.j2
deleted file mode 100644
index 2b339d4..0000000
--- a/roles/users/templates 2/cron.allow.j2	
+++ /dev/null
@@ -1,10 +0,0 @@
-{{ ansible_managed | comment }}
-{% if users_user_list is defined %}
-{% for user in users_user_list %}
-{% if user.cron_allow is defined %}
-{% if user.cron_allow %}
-{{ user.name }}
-{% endif %}
-{% endif %}
-{% endfor %}
-{% endif %}
diff --git a/roles/users/templates 2/sudo.j2 b/roles/users/templates 2/sudo.j2
deleted file mode 100644
index 43459cc..0000000
--- a/roles/users/templates 2/sudo.j2	
+++ /dev/null
@@ -1,2 +0,0 @@
-{{ ansible_managed | comment }}
-{{ user.name }} {{ user.sudo_options }}
diff --git a/roles/vagrant/.github 2/FUNDING.yml b/roles/vagrant/.github 2/FUNDING.yml
deleted file mode 100644
index 67320f0..0000000
--- a/roles/vagrant/.github 2/FUNDING.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-github: robertdebock
diff --git a/roles/vagrant/.github 2/pull_request_template.md b/roles/vagrant/.github 2/pull_request_template.md
deleted file mode 100644
index b1578c0..0000000
--- a/roles/vagrant/.github 2/pull_request_template.md	
+++ /dev/null
@@ -1,11 +0,0 @@
----
-name: Pull request
-about: Describe the proposed change
-
----
-
-**Describe the change**
-A clear and concise description of what the pull request is.
-
-**Testing**
-In case a feature was added, how were tests performed?
diff --git a/roles/vagrant/.github 2/settings.yml b/roles/vagrant/.github 2/settings.yml
deleted file mode 100644
index 2e9c8e3..0000000
--- a/roles/vagrant/.github 2/settings.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
----
-#
-# Ansible managed
-#
-repository:
-  description: Install vagrant on your system.
-  homepage: https://robertdebock.nl/
diff --git a/roles/vagrant/.gitignore 2 b/roles/vagrant/.gitignore 2
deleted file mode 100644
index 982db11..0000000
--- a/roles/vagrant/.gitignore 2	
+++ /dev/null
@@ -1,4 +0,0 @@
-.molecule
-*.log
-*.swp
-.tox
diff --git a/roles/vagrant/meta 2/.galaxy_install_info b/roles/vagrant/meta 2/.galaxy_install_info
deleted file mode 100644
index fde6c96..0000000
--- a/roles/vagrant/meta 2/.galaxy_install_info	
+++ /dev/null
@@ -1,2 +0,0 @@
-install_date: Mon Sep 28 13:22:49 2020
-version: 3.2.0
diff --git a/roles/vagrant/meta 2/exception.yml b/roles/vagrant/meta 2/exception.yml
deleted file mode 100644
index 5897a1b..0000000
--- a/roles/vagrant/meta 2/exception.yml	
+++ /dev/null
@@ -1,4 +0,0 @@
----
-exceptions:
-  - variation: alpine
-    reason: "Dependency not available: python_pip"
diff --git a/roles/vagrant/meta 2/preferences.yml b/roles/vagrant/meta 2/preferences.yml
deleted file mode 100644
index e7fdebf..0000000
--- a/roles/vagrant/meta 2/preferences.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
----
-tox_parallel: yes
diff --git a/roles/vagrant/molecule 2/default/converge.yml b/roles/vagrant/molecule 2/default/converge.yml
deleted file mode 100644
index 1fd5d5d..0000000
--- a/roles/vagrant/molecule 2/default/converge.yml	
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Converge
-  hosts: all
-  become: yes
-  gather_facts: yes
-
-  roles:
-    - role: ansible-role-vagrant
diff --git a/roles/vagrant/molecule 2/default/prepare.yml b/roles/vagrant/molecule 2/default/prepare.yml
deleted file mode 100644
index 0d6f180..0000000
--- a/roles/vagrant/molecule 2/default/prepare.yml	
+++ /dev/null
@@ -1,12 +0,0 @@
----
-- name: Prepare
-  hosts: all
-  gather_facts: no
-  become: yes
-
-  roles:
-    - role: robertdebock.bootstrap
-    - role: robertdebock.core_dependencies
-    - role: robertdebock.buildtools
-    - role: robertdebock.epel
-    - role: robertdebock.python_pip
diff --git a/roles/vagrant/molecule 2/default/verify.yml b/roles/vagrant/molecule 2/default/verify.yml
deleted file mode 100644
index e71561d..0000000
--- a/roles/vagrant/molecule 2/default/verify.yml	
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- name: Verify
-  hosts: all
-  become: yes
-  gather_facts: no
-
-  tasks:
-    - name: try vagrant
-      command: vagrant --version