Fixed bugs in project structure.