Modularize tools