Makefile organized & updated