Moved ciphers inside codecs
Merge remote-tracking branch 'ian/master' into ian
Some code cleanup and comments before connecting main parts of encoder.