Refactored CLI commands.
Merge pull request #6 from hybridgroup/215-refactor-cli-cmds

Refactored CLI commands.