Project structure simplification.