cleaned up directory structure. updated makefile, nginx.conf, and tests to reflect this change