Checkin; Move Models to Individual Files; s/SprtId/Sprtid