Update makefile.
Move source files to their own directory. Update makefile accordingly.