Final namespace refactoring, everything is in separate namespaces now. Starting the final pass..