continue refactor of crypto and file utils to simplify tooling