Re-organize "contrib" tools into correct location.