Better namespace organization

On the wave of renaming before the approaching release, I want to make a quick cosmetic change here