Adding BANE-like estimation and some code cleanup

[AlecThomson]

Now fits the distribution from annulus around spectrum.

Also breaks up the slightly too large function with sub-functions, and some nice structs to handle the results.