Change contact name to Scala Quick Start
import cleanup
import cleanup
move around types