Did some refactoring to make it easier to leave out aws or openstack configs