Changed structure of Project