Fixes n.m.entity base package.
Fixes in n.m.entity.  Still a rogue class in there.