Reorganized likelihood classes.
Added new unit tests for histogram/likelihood.