Reorganize namespace use