Revised project structure.