Restructures cli
Adds lodash