Modularizing the tools