Changed package structure
Added encryption/Decryption support and unit tests