Move dbentity into entity package