reorg of Spark and MapReduce programs