re-organize Tools section