More namespace and organization rework.