Restructured the Toolbox.