Split off CLI, and updated license headers