Reorganization of packages and classes