Refactoring the modules namespacing