Reorganization of class names and namespaces