Re-arranged packages to make them nicer (and no one class packages).