Reorganized namespace structure