Restructured, updated Makefile