Refactor CLI

Also, remove the default organization.