Some changes in structure of the project