Small changes in structure of the project