moving crypto functionality to bundle of its own