Changes to http-webserver to match new structure