Commandlets code structure cleanup.
Fizes to Zen Garden tenant creation
Issues #136, #135,
Improvements for Issue #7