Makefile Updates

Updated and cleaned up the makefile.
Remove outdated project files