Reorganized the Crypt module