refactor spark workloads, progress on tpch