rename demo files, update Makefile