Start working on a new 'tidier' version of the webserver demo but keep the old one around so we don't confuse people with a broken one...