Moved hmac -> cipher, renamed cipher-> crypto
Moved hmac -> cipher, renamed cipher-> crypto