Also move diagrams to their own folder - I have feeling that we're going to be acquiring a quite a number of them.....
