Move the supervisor definitions somewhere they can be reused