modified structure of the project in order to delete the duplication of the packages