More work on multitenancy
Renamed company to clusterid
Renamed clusterId to projectId