Renaming spark imports (spark => org.apache.spark)