Move CLI code to top of CLI
Bump version