removing freemarker, also renaming Group to Tenant