Project structure fixed