Refactor cli to better handle organization-id

* Unify the expected parameters for cli methods
* Give more flexibility to exists method
Merge pull request #664 from elyezer/cli-org-id-refactor

Refactor cli to better handle organization-id