Split Mapper and Reducer out
Update code