rework gen-config/tools targets