Switch CLI modules, refactor a bit
Update package.json
Tidy a lot of stuff