nit: merge this with `org.apache.spark.{...}`