Add a key counter
Move some mapreduce jobs to their own dirs.