Refactoring of BayesianModels 1
Refactoring of BayesianModels 2