Refactor of the cli class

Actually fixing the .gitignore because I forgot to pin lib/ to sol.