reorganizing makefile
updating makefile