Reorganising into toolboxees