[WebServer] Reorganization