Rearrange namespaced stuff.