messing with namespaces and refactoring