Added Makefile and decoupled the current server commands from the current code