Re-named some packages to describe what they do, split out some classes from traits