Reorganize advanced tools a bit.