move blobs out; touch up makefiles