Bundle update and refactor of httpserver.