updated Scala source to match the change from com.ucombinator to org.ucombinator