Merge Tools into Common
refactoring logic