Add conf, and mv nginx.conf into it
update Makefile