Reorganise into separate playbooks to make config-run simpler