Project structure made more semantic