Moved server stuff to server directory