Little renaming
First pieces of cli tool