Edited makefile to accomodate files moved include, src