redid makefile and reorganized files