Moved tool to new structure