Moved Base classes to model.impl package