'entity' sub-package renamed to 'domain'