Restructuring cli.js
Finishing up version 0.4.1, see History