Reorganize tooles