Update to Makefile, moved around files in project directory.