Makefile
reorg to fit rustpkg
miscellany