Entity package names, small reorg