reorganized makefiles
merged local branch. rearranged makefiles