Refactor the CLI

:construction: 

/cc @opscode/release-engineers