Refactor and prune main.yml to reflect additional roles and hosts