Moved Base classes to model.impl package
Removed unused Provider superclasses