Implement refactored tool

Relies on https://github.com/glowdigitalmedia/imhotep/pull/2/files