Implements feedback from James re the project structure