made some structural changes to Makefile