namespace reorganization