Refactor: move things over to webserver module