first cut at new makefile; file reorg, new depend