More refactoring of the name space