refeactored code base, removed init-tenant.xml and moved it in to carbon.xml