Re-implemented convolution for new model directory structure