Merge "Add tools to subdirs"