Reorganizing crypto package