Merge pull request #1595 from greghaynes/feature/split-out-primitives-interfaces-ciphers

Start splitting out interfaces with ciphers