Move namespaces into a separate module