Added namespaces and classes to hierarchy.