Packaging update

Classes are now reorganized in better ordered packages.