Encryption

Merged encryption module