Refactoring, ajust namespace.