Move entity selectors to appropriate package.
Small changes.