Namespace refactroing