Move support/tools/* back into utils