New structure of the project with some improvements