Updated class diagrams
Tidied up namespaces
Further class diagram updates