Change the implementation to support just a pair instead of the legacy, weird sequence of one pair.
Also move old namespaces to test-only tree for reference while I continue developing V2.