Reorganized the packages, and cleaned up some unused classes and tests.