codec -> protocols reorganization
Merge remote-tracking branch 'ian/master'
Renames for sensitive file systems