Revised project structure