Changed the CLI to be only one JAR