* Refactoring structure of the CLI to be more maintainable long-term * Remove obvious comments & put back XML comments