Refactor the CLI

:green_heart: 

/cc @opscode/release-engineers