Convolve2d refactor (stage 1)