Moved some packages, added some new classes

Reorged some packages in prep for final package setup. Added a bunch of
stuff.
nearly complete and ready for testing