moved server code into /server