Moved treetap into tools