using a Makefile approach now, reworked files a bit