Refactor roles

Reordered all playbooks in different roles