Refactored code and structure to support a suite of tools in the same plugin.