add subfolder for each tool, add cleaner