Reorganization of classes and packages.