Move MageServlet to ServletContainer