Clarified project structure