Jacalvo/simplify webserver

I'm sure this is not yet ready to merge, just using the PR checker for fast and early detection of big issues :)