Better command line tool (WIP)
WIP: Unify functionality in a single cmd line tool
Better cmd line interface
Removed legacy tool