more Makefile and structure tweaks