Merge pull request #226 from reaperhulk/blockcipher-rename

Reorganize Block Cipher