Tools restructure