Refactor to make it easier for our friends on Centos to add Ansible functionality