Continued to refactor relationship between protocols, ns, and core