Diagram Updates.  Project reorganisation
Merge branch 'master' of https://github.com/PCannings/DWP