enable flavour tool only for WJets
removed dupe
proper subdir
merged from master