Add version and refactor cli

***this breaks backwards compatibility with the existing cli args***