move, rm files
update makefile
setup watch