Namespace refactoring for static loading