Updating class diagrams

Split out diagrams a bit more to make it easier to read