diff --git a/third_party/2/tornado/__init__.pyi b/third_party/2and3/tornado/__init__.pyi
similarity index 100%
rename from third_party/2/tornado/__init__.pyi
rename to third_party/2and3/tornado/__init__.pyi
diff --git a/third_party/2/tornado/concurrent.pyi b/third_party/2and3/tornado/concurrent.pyi
similarity index 100%
rename from third_party/2/tornado/concurrent.pyi
rename to third_party/2and3/tornado/concurrent.pyi
diff --git a/third_party/2/tornado/gen.pyi b/third_party/2and3/tornado/gen.pyi
similarity index 100%
rename from third_party/2/tornado/gen.pyi
rename to third_party/2and3/tornado/gen.pyi
diff --git a/third_party/2/tornado/httpclient.pyi b/third_party/2and3/tornado/httpclient.pyi
similarity index 100%
rename from third_party/2/tornado/httpclient.pyi
rename to third_party/2and3/tornado/httpclient.pyi
diff --git a/third_party/2/tornado/httpserver.pyi b/third_party/2and3/tornado/httpserver.pyi
similarity index 100%
rename from third_party/2/tornado/httpserver.pyi
rename to third_party/2and3/tornado/httpserver.pyi
diff --git a/third_party/2/tornado/httputil.pyi b/third_party/2and3/tornado/httputil.pyi
similarity index 100%
rename from third_party/2/tornado/httputil.pyi
rename to third_party/2and3/tornado/httputil.pyi
diff --git a/third_party/2/tornado/ioloop.pyi b/third_party/2and3/tornado/ioloop.pyi
similarity index 100%
rename from third_party/2/tornado/ioloop.pyi
rename to third_party/2and3/tornado/ioloop.pyi
diff --git a/third_party/2/tornado/locks.pyi b/third_party/2and3/tornado/locks.pyi
similarity index 100%
rename from third_party/2/tornado/locks.pyi
rename to third_party/2and3/tornado/locks.pyi
diff --git a/third_party/2/tornado/netutil.pyi b/third_party/2and3/tornado/netutil.pyi
similarity index 100%
rename from third_party/2/tornado/netutil.pyi
rename to third_party/2and3/tornado/netutil.pyi
diff --git a/third_party/2/tornado/process.pyi b/third_party/2and3/tornado/process.pyi
similarity index 100%
rename from third_party/2/tornado/process.pyi
rename to third_party/2and3/tornado/process.pyi
diff --git a/third_party/2/tornado/tcpserver.pyi b/third_party/2and3/tornado/tcpserver.pyi
similarity index 100%
rename from third_party/2/tornado/tcpserver.pyi
rename to third_party/2and3/tornado/tcpserver.pyi
diff --git a/third_party/2/tornado/testing.pyi b/third_party/2and3/tornado/testing.pyi
similarity index 100%
rename from third_party/2/tornado/testing.pyi
rename to third_party/2and3/tornado/testing.pyi
diff --git a/third_party/2/tornado/util.pyi b/third_party/2and3/tornado/util.pyi
similarity index 100%
rename from third_party/2/tornado/util.pyi
rename to third_party/2and3/tornado/util.pyi
diff --git a/third_party/2/tornado/web.pyi b/third_party/2and3/tornado/web.pyi
similarity index 95%
rename from third_party/2/tornado/web.pyi
rename to third_party/2and3/tornado/web.pyi
index c63f414d1..663b9cba7 100644
--- a/third_party/2/tornado/web.pyi
+++ b/third_party/2and3/tornado/web.pyi
@@ -1,4 +1,6 @@
-from typing import Any
+import sys
+
+from typing import Any, Callable, Optional
 from tornado import httputil
 
 MIN_SUPPORTED_SIGNED_VALUE_VERSION: Any
@@ -6,6 +8,12 @@ MAX_SUPPORTED_SIGNED_VALUE_VERSION: Any
 DEFAULT_SIGNED_VALUE_VERSION: Any
 DEFAULT_SIGNED_VALUE_MIN_VERSION: Any
 
+if sys.version_info[:2] >= (3, 5):
+    from typing import Awaitable
+    _MethodType = Callable[..., Optional[Awaitable[None]]]
+else:
+    _MethodType = Callable[..., Any]
+
 class RequestHandler:
     SUPPORTED_METHODS: Any
     application: Any
@@ -14,16 +22,16 @@ class RequestHandler:
     path_kwargs: Any
     ui: Any
     def __init__(self, application, request, **kwargs) -> None: ...
-    def initialize(self): ...
+    initialize: Callable[..., None] = ...
     @property
     def settings(self): ...
-    def head(self, *args, **kwargs): ...
-    def get(self, *args, **kwargs): ...
-    def post(self, *args, **kwargs): ...
-    def delete(self, *args, **kwargs): ...
-    def patch(self, *args, **kwargs): ...
-    def put(self, *args, **kwargs): ...
-    def options(self, *args, **kwargs): ...
+    head: _MethodType
+    get: _MethodType
+    post: _MethodType
+    delete: _MethodType
+    patch: _MethodType
+    put: _MethodType
+    options: _MethodType
     def prepare(self): ...
     def on_finish(self): ...
     def on_connection_close(self): ...