initial attempt at cleaning up subdirectory handling. tools/Makefile is now being...