Refactor basebuild in prep to add Centos image