changed the name of Server class to FileServer, other misc. changes