reorg of packages for Spark and MapReduce