Move webserver to subpackage