Makefile Edits

little edits in makefile due to new organization of code