Changed preprocessing and moved mapreduce folder to root
Solved conflict in preprocessing.py