Reoder mounting

Try to fix swagger, which does not like about same servlet in two
different paths