make clean
don't watch git dir
move files around
fix margins
fewer globals
fewer globals
move file
simpler