Tools re-organize