diff --git a/stdlib/2.7/xml/sax/__init__.pyi b/stdlib/2.7/xml/sax/__init__.pyi
deleted file mode 100644
index 9e3d009d9..000000000
--- a/stdlib/2.7/xml/sax/__init__.pyi
+++ /dev/null
@@ -1,20 +0,0 @@
-# Stubs for xml.sax (Python 2.7)
-#
-# NOTE: This dynamically typed stub was automatically generated by stubgen.
-
-class SAXException(Exception):
-    def __init__(self, msg, exception=None): ...
-    def getMessage(self): ...
-    def getException(self): ...
-    def __getitem__(self, ix): ...
-
-class SAXParseException(SAXException):
-    def __init__(self, msg, exception, locator): ...
-    def getColumnNumber(self): ...
-    def getLineNumber(self): ...
-    def getPublicId(self): ...
-    def getSystemId(self): ...
-
-class SAXNotRecognizedException(SAXException): ...
-class SAXNotSupportedException(SAXException): ...
-class SAXReaderNotAvailable(SAXNotSupportedException): ...
diff --git a/stdlib/3/xml/sax/__init__.pyi b/stdlib/2and3/xml/__init__.pyi
similarity index 100%
rename from stdlib/3/xml/sax/__init__.pyi
rename to stdlib/2and3/xml/__init__.pyi
diff --git a/stdlib/2and3/xml/sax/__init__.pyi b/stdlib/2and3/xml/sax/__init__.pyi
new file mode 100644
index 000000000..8d93a24b2
--- /dev/null
+++ b/stdlib/2and3/xml/sax/__init__.pyi
@@ -0,0 +1,32 @@
+import xml.sax
+from xml.sax.xmlreader import InputSource
+from xml.sax.handler import ContentHandler, ErrorHandler
+
+class SAXException(Exception):
+    def __init__(self, msg, exception=None): ...
+    def getMessage(self): ...
+    def getException(self): ...
+    def __getitem__(self, ix): ...
+
+class SAXParseException(SAXException):
+    def __init__(self, msg, exception, locator): ...
+    def getColumnNumber(self): ...
+    def getLineNumber(self): ...
+    def getPublicId(self): ...
+    def getSystemId(self): ...
+
+class SAXNotRecognizedException(SAXException): ...
+class SAXNotSupportedException(SAXException): ...
+class SAXReaderNotAvailable(SAXNotSupportedException): ...
+
+default_parser_list = ...  # type: List[str]
+
+def make_parser(parser_list: List[str]) -> xml.sax.xmlreader.XMLReader: ...
+
+def parse(source: str, handler: xml.sax.handler.ContentHandler,
+          errorHandler: xml.sax.handler.ErrorHandler=...): ...
+
+def parseString(string: str, handler: xml.sax.handler.ContentHandler,
+                errorHandler: xml.sax.handler.ErrorHandler=...): ...
+
+def _create_parser(parser_name: str) -> xml.sax.xmlreader.XMLReader: ...
diff --git a/stdlib/2.7/xml/sax/handler.pyi b/stdlib/2and3/xml/sax/handler.pyi
similarity index 100%
rename from stdlib/2.7/xml/sax/handler.pyi
rename to stdlib/2and3/xml/sax/handler.pyi
diff --git a/stdlib/2.7/xml/sax/saxutils.pyi b/stdlib/2and3/xml/sax/saxutils.pyi
similarity index 100%
rename from stdlib/2.7/xml/sax/saxutils.pyi
rename to stdlib/2and3/xml/sax/saxutils.pyi
diff --git a/stdlib/2.7/xml/sax/xmlreader.pyi b/stdlib/2and3/xml/sax/xmlreader.pyi
similarity index 100%
rename from stdlib/2.7/xml/sax/xmlreader.pyi
rename to stdlib/2and3/xml/sax/xmlreader.pyi
diff --git a/stdlib/3/xml/__init__.pyi b/stdlib/3/xml/__init__.pyi
deleted file mode 100644
index e69de29bb..000000000