Moved CLI to its own file