Edited Makefile and file tree