Changed structure of the project