Refactoring: moved Namespace to the data package