Reorganization of the package and improvement of the selection routines