Fixed buildprocess

Moved makefile
Updated makefile to build two versions of server.
Created the two diffrent server implementation.