Cleaning up include's
Adding initializer for libsodium