Yes - that seems like a better option here. There's a lot of code repeated in both of these modules (and between them and `sparse_deconvolution.py`). I'd rather have all of that in one module, so that we don't have to keep track of all these different implementations of basically the same thing. In the end, we'll want one code-base that knows what to do with whatever input you give it - whether it has a single b-value, multiple b-values, etc.