diff --git a/role-samba4-ad-member/LICENSE b/roles/role-samba4-ad-member/LICENSE
similarity index 100%
rename from role-samba4-ad-member/LICENSE
rename to roles/role-samba4-ad-member/LICENSE
diff --git a/role-samba4-ad-member/README.md b/roles/role-samba4-ad-member/README.md
similarity index 100%
rename from role-samba4-ad-member/README.md
rename to roles/role-samba4-ad-member/README.md
diff --git a/role-samba4-ad-member/defaults/main.yml b/roles/role-samba4-ad-member/defaults/main.yml
similarity index 100%
rename from role-samba4-ad-member/defaults/main.yml
rename to roles/role-samba4-ad-member/defaults/main.yml
diff --git a/role-samba4-ad-member/handlers/main.yml b/roles/role-samba4-ad-member/handlers/main.yml
similarity index 100%
rename from role-samba4-ad-member/handlers/main.yml
rename to roles/role-samba4-ad-member/handlers/main.yml
diff --git a/role-samba4-ad-member/meta/main.yml b/roles/role-samba4-ad-member/meta/main.yml
similarity index 100%
rename from role-samba4-ad-member/meta/main.yml
rename to roles/role-samba4-ad-member/meta/main.yml
diff --git a/role-samba4-ad-member/tasks/main.yml b/roles/role-samba4-ad-member/tasks/main.yml
similarity index 100%
rename from role-samba4-ad-member/tasks/main.yml
rename to roles/role-samba4-ad-member/tasks/main.yml
diff --git a/role-samba4-ad-member/tasks/ubt-1604-amd64.yml b/roles/role-samba4-ad-member/tasks/ubt-1604-amd64.yml
similarity index 100%
rename from role-samba4-ad-member/tasks/ubt-1604-amd64.yml
rename to roles/role-samba4-ad-member/tasks/ubt-1604-amd64.yml
diff --git a/role-samba4-ad-member/tasks/ubt-1804-amd64.yml b/roles/role-samba4-ad-member/tasks/ubt-1804-amd64.yml
similarity index 100%
rename from role-samba4-ad-member/tasks/ubt-1804-amd64.yml
rename to roles/role-samba4-ad-member/tasks/ubt-1804-amd64.yml
diff --git a/role-samba4-ad-member/tasks/ubt-2004-amd64.yml b/roles/role-samba4-ad-member/tasks/ubt-2004-amd64.yml
similarity index 100%
rename from role-samba4-ad-member/tasks/ubt-2004-amd64.yml
rename to roles/role-samba4-ad-member/tasks/ubt-2004-amd64.yml
diff --git a/role-samba4-ad-member/templates/domain-admins.j2 b/roles/role-samba4-ad-member/templates/domain-admins.j2
similarity index 100%
rename from role-samba4-ad-member/templates/domain-admins.j2
rename to roles/role-samba4-ad-member/templates/domain-admins.j2
diff --git a/role-samba4-ad-member/templates/pam_winbind.conf.j2 b/roles/role-samba4-ad-member/templates/pam_winbind.conf.j2
similarity index 100%
rename from role-samba4-ad-member/templates/pam_winbind.conf.j2
rename to roles/role-samba4-ad-member/templates/pam_winbind.conf.j2
diff --git a/role-samba4-ad-member/templates/resolved.conf.j2 b/roles/role-samba4-ad-member/templates/resolved.conf.j2
similarity index 100%
rename from role-samba4-ad-member/templates/resolved.conf.j2
rename to roles/role-samba4-ad-member/templates/resolved.conf.j2
diff --git a/role-samba4-ad-member/templates/smb.conf.j2 b/roles/role-samba4-ad-member/templates/smb.conf.j2
similarity index 100%
rename from role-samba4-ad-member/templates/smb.conf.j2
rename to roles/role-samba4-ad-member/templates/smb.conf.j2
diff --git a/role-samba4-primary-ad-dc/LICENSE b/roles/role-samba4-primary-ad-dc/LICENSE
similarity index 100%
rename from role-samba4-primary-ad-dc/LICENSE
rename to roles/role-samba4-primary-ad-dc/LICENSE
diff --git a/role-samba4-primary-ad-dc/README.md b/roles/role-samba4-primary-ad-dc/README.md
similarity index 100%
rename from role-samba4-primary-ad-dc/README.md
rename to roles/role-samba4-primary-ad-dc/README.md
diff --git a/role-samba4-primary-ad-dc/defaults/main.yml b/roles/role-samba4-primary-ad-dc/defaults/main.yml
similarity index 100%
rename from role-samba4-primary-ad-dc/defaults/main.yml
rename to roles/role-samba4-primary-ad-dc/defaults/main.yml
diff --git a/role-samba4-primary-ad-dc/handlers/main.yml b/roles/role-samba4-primary-ad-dc/handlers/main.yml
similarity index 100%
rename from role-samba4-primary-ad-dc/handlers/main.yml
rename to roles/role-samba4-primary-ad-dc/handlers/main.yml
diff --git a/role-samba4-primary-ad-dc/meta/main.yml b/roles/role-samba4-primary-ad-dc/meta/main.yml
similarity index 100%
rename from role-samba4-primary-ad-dc/meta/main.yml
rename to roles/role-samba4-primary-ad-dc/meta/main.yml
diff --git a/role-samba4-primary-ad-dc/tasks/main.yml b/roles/role-samba4-primary-ad-dc/tasks/main.yml
similarity index 100%
rename from role-samba4-primary-ad-dc/tasks/main.yml
rename to roles/role-samba4-primary-ad-dc/tasks/main.yml
diff --git a/role-samba4-primary-ad-dc/tasks/ubt-1804-adc.yml b/roles/role-samba4-primary-ad-dc/tasks/ubt-1804-adc.yml
similarity index 100%
rename from role-samba4-primary-ad-dc/tasks/ubt-1804-adc.yml
rename to roles/role-samba4-primary-ad-dc/tasks/ubt-1804-adc.yml
diff --git a/role-samba4-primary-ad-dc/tasks/ubuntu-1604-amd64.yml b/roles/role-samba4-primary-ad-dc/tasks/ubuntu-1604-amd64.yml
similarity index 100%
rename from role-samba4-primary-ad-dc/tasks/ubuntu-1604-amd64.yml
rename to roles/role-samba4-primary-ad-dc/tasks/ubuntu-1604-amd64.yml
diff --git a/role-samba4-primary-ad-dc/tasks/ubuntu-1804-amd64-login.yml b/roles/role-samba4-primary-ad-dc/tasks/ubuntu-1804-amd64-login.yml
similarity index 100%
rename from role-samba4-primary-ad-dc/tasks/ubuntu-1804-amd64-login.yml
rename to roles/role-samba4-primary-ad-dc/tasks/ubuntu-1804-amd64-login.yml
diff --git a/role-samba4-primary-ad-dc/tasks/ubuntu-1804-amd64.yml b/roles/role-samba4-primary-ad-dc/tasks/ubuntu-1804-amd64.yml
similarity index 100%
rename from role-samba4-primary-ad-dc/tasks/ubuntu-1804-amd64.yml
rename to roles/role-samba4-primary-ad-dc/tasks/ubuntu-1804-amd64.yml
diff --git a/role-samba4-primary-ad-dc/tasks/ubuntu-2004-amd64.yml b/roles/role-samba4-primary-ad-dc/tasks/ubuntu-2004-amd64.yml
similarity index 100%
rename from role-samba4-primary-ad-dc/tasks/ubuntu-2004-amd64.yml
rename to roles/role-samba4-primary-ad-dc/tasks/ubuntu-2004-amd64.yml
diff --git a/role-samba4-primary-ad-dc/templates/adc/smb.conf.j2 b/roles/role-samba4-primary-ad-dc/templates/adc/smb.conf.j2
similarity index 100%
rename from role-samba4-primary-ad-dc/templates/adc/smb.conf.j2
rename to roles/role-samba4-primary-ad-dc/templates/adc/smb.conf.j2
diff --git a/role-samba4-primary-ad-dc/templates/domain-admins.j2 b/roles/role-samba4-primary-ad-dc/templates/domain-admins.j2
similarity index 100%
rename from role-samba4-primary-ad-dc/templates/domain-admins.j2
rename to roles/role-samba4-primary-ad-dc/templates/domain-admins.j2
diff --git a/role-samba4-primary-ad-dc/templates/nsswitch.conf.j2 b/roles/role-samba4-primary-ad-dc/templates/nsswitch.conf.j2
similarity index 100%
rename from role-samba4-primary-ad-dc/templates/nsswitch.conf.j2
rename to roles/role-samba4-primary-ad-dc/templates/nsswitch.conf.j2
diff --git a/role-samba4-primary-ad-dc/templates/pam_winbind.conf.j2 b/roles/role-samba4-primary-ad-dc/templates/pam_winbind.conf.j2
similarity index 100%
rename from role-samba4-primary-ad-dc/templates/pam_winbind.conf.j2
rename to roles/role-samba4-primary-ad-dc/templates/pam_winbind.conf.j2