More re-org.  Separated out the interfaces from the domain model.