First commit
Refactored package structure. Added ServiceCatalog
format