Fix naming convention
Add Crypto class