The great namespace refactor