fix namespaces on refactoring files