Update makefile
Update sourcefiles