Started splitting utilities based on cipher type