Refactored Crypto module a bit
Mo Refactahs