Restructuring because Ansible doesn't compose