Moved convolution functions to package