Add Baum dependency, cleanup models, remove Base model class