Refactored some code and added more encryption code.

Also removed string encodings from conversion to/from byte array.