Refactor, namespaces