Moved keygen to separate class, encryption and keystore will follow soon