Small rearrangement of project structure