Project structure improved