Split out namespacing