Some restructuring here and there of namespace hierarchies.