Moving towards role-based playbooks
Moved some stuff into yaim roles