namespaces refactored, class diagram edited