Restructured tool tasks for new configuration format