Moved server to server_core and repositioned code