better examples and makefile reorg