Restructured, modified Makefile