Reorganized namespace