New org cli tests
organized imports and added base init in org.py
Merge pull request #194 from sthirugn/finalorg

New org cli tests