Move entity definitions to a separate namespace.