Modularize tools
Merge pull request #133 from irskep/extensibility

Modularize tools