Refactoring of location of Crypo methods and classes