Reorganization of the package