Unifying all the encryption and decryption into one file
Merge conflicts