updating diagrams, moving some files over