rename some classes and add new Ciphers