Changed structure of the files, updated the makefile, and added a reducer test.