Adjusted the structure of the packages and added the class for the
Selection phase.