Update makefile

Update the makefile to reflect the restructuring of files. I moved
stuff around.