minor Makefile tweaks, restructured dir