Start refactor of ciphers