WebServer refactoring