diff --git a/apache/handlers/.main.yml.swp b/apache/handlers/.main.yml.swp
deleted file mode 100644
index bee0725..0000000
Binary files a/apache/handlers/.main.yml.swp and /dev/null differ
diff --git a/apache/handlers/main.yml b/roles/apache/handlers/main.yml
similarity index 100%
rename from apache/handlers/main.yml
rename to roles/apache/handlers/main.yml
diff --git a/apache/meta/main.yml b/roles/apache/meta/main.yml
similarity index 100%
rename from apache/meta/main.yml
rename to roles/apache/meta/main.yml
diff --git a/apache/tasks/main.yml b/roles/apache/tasks/main.yml
similarity index 100%
rename from apache/tasks/main.yml
rename to roles/apache/tasks/main.yml
diff --git a/collabora/meta/main.yml b/roles/collabora/meta/main.yml
similarity index 100%
rename from collabora/meta/main.yml
rename to roles/collabora/meta/main.yml
diff --git a/collabora/tasks/apache.yml b/roles/collabora/tasks/apache.yml
similarity index 100%
rename from collabora/tasks/apache.yml
rename to roles/collabora/tasks/apache.yml
diff --git a/collabora/tasks/collabora.yml b/roles/collabora/tasks/collabora.yml
similarity index 100%
rename from collabora/tasks/collabora.yml
rename to roles/collabora/tasks/collabora.yml
diff --git a/collabora/tasks/main.yml b/roles/collabora/tasks/main.yml
similarity index 100%
rename from collabora/tasks/main.yml
rename to roles/collabora/tasks/main.yml
diff --git a/collabora/templates/etc/apache2/sites-available/ansible_domain-le-ssl.conf.j2 b/roles/collabora/templates/etc/apache2/sites-available/ansible_domain-le-ssl.conf.j2
similarity index 100%
rename from collabora/templates/etc/apache2/sites-available/ansible_domain-le-ssl.conf.j2
rename to roles/collabora/templates/etc/apache2/sites-available/ansible_domain-le-ssl.conf.j2
diff --git a/collabora/templates/etc/apache2/sites-available/ansible_domain.conf.j2 b/roles/collabora/templates/etc/apache2/sites-available/ansible_domain.conf.j2
similarity index 100%
rename from collabora/templates/etc/apache2/sites-available/ansible_domain.conf.j2
rename to roles/collabora/templates/etc/apache2/sites-available/ansible_domain.conf.j2
diff --git a/collabora/templates/etc/collabora/docker-compose.yml.j2 b/roles/collabora/templates/etc/collabora/docker-compose.yml.j2
similarity index 100%
rename from collabora/templates/etc/collabora/docker-compose.yml.j2
rename to roles/collabora/templates/etc/collabora/docker-compose.yml.j2
diff --git a/common/defaults/main.yml b/roles/common/defaults/main.yml
similarity index 100%
rename from common/defaults/main.yml
rename to roles/common/defaults/main.yml
diff --git a/common/tasks/apt.yml b/roles/common/tasks/apt.yml
similarity index 100%
rename from common/tasks/apt.yml
rename to roles/common/tasks/apt.yml
diff --git a/common/tasks/apticron.yml b/roles/common/tasks/apticron.yml
similarity index 100%
rename from common/tasks/apticron.yml
rename to roles/common/tasks/apticron.yml
diff --git a/common/tasks/disk-check.yml b/roles/common/tasks/disk-check.yml
similarity index 100%
rename from common/tasks/disk-check.yml
rename to roles/common/tasks/disk-check.yml
diff --git a/common/tasks/fail2ban.yml b/roles/common/tasks/fail2ban.yml
similarity index 100%
rename from common/tasks/fail2ban.yml
rename to roles/common/tasks/fail2ban.yml
diff --git a/common/tasks/main.yml b/roles/common/tasks/main.yml
similarity index 100%
rename from common/tasks/main.yml
rename to roles/common/tasks/main.yml
diff --git a/common/tasks/tools.yml b/roles/common/tasks/tools.yml
similarity index 100%
rename from common/tasks/tools.yml
rename to roles/common/tasks/tools.yml
diff --git a/common/tasks/ufw.yml b/roles/common/tasks/ufw.yml
similarity index 100%
rename from common/tasks/ufw.yml
rename to roles/common/tasks/ufw.yml
diff --git a/common/templates/etc/apticron/apticron.conf.j2 b/roles/common/templates/etc/apticron/apticron.conf.j2
similarity index 100%
rename from common/templates/etc/apticron/apticron.conf.j2
rename to roles/common/templates/etc/apticron/apticron.conf.j2
diff --git a/common/templates/etc/cron.hourly/check-disk-space.sh.j2 b/roles/common/templates/etc/cron.hourly/check-disk-space.sh.j2
similarity index 100%
rename from common/templates/etc/cron.hourly/check-disk-space.sh.j2
rename to roles/common/templates/etc/cron.hourly/check-disk-space.sh.j2
diff --git a/docker/meta/main.yml b/roles/docker/meta/main.yml
similarity index 100%
rename from docker/meta/main.yml
rename to roles/docker/meta/main.yml
diff --git a/docker/tasks/main.yml b/roles/docker/tasks/main.yml
similarity index 100%
rename from docker/tasks/main.yml
rename to roles/docker/tasks/main.yml
diff --git a/letsencrypt/meta/main.yml b/roles/letsencrypt/meta/main.yml
similarity index 100%
rename from letsencrypt/meta/main.yml
rename to roles/letsencrypt/meta/main.yml
diff --git a/letsencrypt/tasks/main.yml b/roles/letsencrypt/tasks/main.yml
similarity index 100%
rename from letsencrypt/tasks/main.yml
rename to roles/letsencrypt/tasks/main.yml