Modifying some of the package names, and cleaning a few things up.
Added some new domain classes.