Spark workflows re-organized