Moved calculation choices to Computation model. Also ZooAdapter now allows more than two data files.