Rearranging the namespace