Changed structure of project (fix)