Separated baseline computation into its own block.
Renamed BaselineComputation
Renamed model