Remaned MapReduce classes and other refactorings.