Start MapReduce refactoring