some namespace refactors.