First step to refactor Webserver to match MVC pattern