Reorganized server directory
Reorganized server directory
Updated server makefile and supervisord.conf