Major revision to project structure