diff --git a/stdlib/2.7/BaseHTTPServer.pyi b/stdlib/2/BaseHTTPServer.pyi similarity index 100% rename from stdlib/2.7/BaseHTTPServer.pyi rename to stdlib/2/BaseHTTPServer.pyi diff --git a/stdlib/2.7/ConfigParser.pyi b/stdlib/2/ConfigParser.pyi similarity index 100% rename from stdlib/2.7/ConfigParser.pyi rename to stdlib/2/ConfigParser.pyi diff --git a/stdlib/2.7/Cookie.pyi b/stdlib/2/Cookie.pyi similarity index 100% rename from stdlib/2.7/Cookie.pyi rename to stdlib/2/Cookie.pyi diff --git a/stdlib/2.7/HTMLParser.pyi b/stdlib/2/HTMLParser.pyi similarity index 100% rename from stdlib/2.7/HTMLParser.pyi rename to stdlib/2/HTMLParser.pyi diff --git a/stdlib/2.7/Queue.pyi b/stdlib/2/Queue.pyi similarity index 100% rename from stdlib/2.7/Queue.pyi rename to stdlib/2/Queue.pyi diff --git a/stdlib/2.7/SocketServer.pyi b/stdlib/2/SocketServer.pyi similarity index 100% rename from stdlib/2.7/SocketServer.pyi rename to stdlib/2/SocketServer.pyi diff --git a/stdlib/2.7/StringIO.pyi b/stdlib/2/StringIO.pyi similarity index 100% rename from stdlib/2.7/StringIO.pyi rename to stdlib/2/StringIO.pyi diff --git a/stdlib/2.7/UserDict.pyi b/stdlib/2/UserDict.pyi similarity index 100% rename from stdlib/2.7/UserDict.pyi rename to stdlib/2/UserDict.pyi diff --git a/stdlib/2.7/UserList.pyi b/stdlib/2/UserList.pyi similarity index 100% rename from stdlib/2.7/UserList.pyi rename to stdlib/2/UserList.pyi diff --git a/stdlib/2.7/UserString.pyi b/stdlib/2/UserString.pyi similarity index 100% rename from stdlib/2.7/UserString.pyi rename to stdlib/2/UserString.pyi diff --git a/stdlib/2.7/__builtin__.pyi b/stdlib/2/__builtin__.pyi similarity index 100% rename from stdlib/2.7/__builtin__.pyi rename to stdlib/2/__builtin__.pyi diff --git a/stdlib/2.7/__future__.pyi b/stdlib/2/__future__.pyi similarity index 100% rename from stdlib/2.7/__future__.pyi rename to stdlib/2/__future__.pyi diff --git a/stdlib/2.7/_ast.pyi b/stdlib/2/_ast.pyi similarity index 100% rename from stdlib/2.7/_ast.pyi rename to stdlib/2/_ast.pyi diff --git a/stdlib/2.7/_codecs.pyi b/stdlib/2/_codecs.pyi similarity index 100% rename from stdlib/2.7/_codecs.pyi rename to stdlib/2/_codecs.pyi diff --git a/stdlib/2.7/_collections.pyi b/stdlib/2/_collections.pyi similarity index 100% rename from stdlib/2.7/_collections.pyi rename to stdlib/2/_collections.pyi diff --git a/stdlib/2.7/_functools.pyi b/stdlib/2/_functools.pyi similarity index 100% rename from stdlib/2.7/_functools.pyi rename to stdlib/2/_functools.pyi diff --git a/stdlib/2.7/_hotshot.pyi b/stdlib/2/_hotshot.pyi similarity index 100% rename from stdlib/2.7/_hotshot.pyi rename to stdlib/2/_hotshot.pyi diff --git a/stdlib/2.7/_io.pyi b/stdlib/2/_io.pyi similarity index 100% rename from stdlib/2.7/_io.pyi rename to stdlib/2/_io.pyi diff --git a/stdlib/2.7/_json.pyi b/stdlib/2/_json.pyi similarity index 100% rename from stdlib/2.7/_json.pyi rename to stdlib/2/_json.pyi diff --git a/stdlib/2.7/_md5.pyi b/stdlib/2/_md5.pyi similarity index 100% rename from stdlib/2.7/_md5.pyi rename to stdlib/2/_md5.pyi diff --git a/stdlib/2.7/_random.pyi b/stdlib/2/_random.pyi similarity index 100% rename from stdlib/2.7/_random.pyi rename to stdlib/2/_random.pyi diff --git a/stdlib/2.7/_sha.pyi b/stdlib/2/_sha.pyi similarity index 100% rename from stdlib/2.7/_sha.pyi rename to stdlib/2/_sha.pyi diff --git a/stdlib/2.7/_sha256.pyi b/stdlib/2/_sha256.pyi similarity index 100% rename from stdlib/2.7/_sha256.pyi rename to stdlib/2/_sha256.pyi diff --git a/stdlib/2.7/_sha512.pyi b/stdlib/2/_sha512.pyi similarity index 100% rename from stdlib/2.7/_sha512.pyi rename to stdlib/2/_sha512.pyi diff --git a/stdlib/2.7/_socket.pyi b/stdlib/2/_socket.pyi similarity index 100% rename from stdlib/2.7/_socket.pyi rename to stdlib/2/_socket.pyi diff --git a/stdlib/2.7/_sre.pyi b/stdlib/2/_sre.pyi similarity index 100% rename from stdlib/2.7/_sre.pyi rename to stdlib/2/_sre.pyi diff --git a/stdlib/2.7/_struct.pyi b/stdlib/2/_struct.pyi similarity index 100% rename from stdlib/2.7/_struct.pyi rename to stdlib/2/_struct.pyi diff --git a/stdlib/2.7/_symtable.pyi b/stdlib/2/_symtable.pyi similarity index 100% rename from stdlib/2.7/_symtable.pyi rename to stdlib/2/_symtable.pyi diff --git a/stdlib/2.7/_warnings.pyi b/stdlib/2/_warnings.pyi similarity index 100% rename from stdlib/2.7/_warnings.pyi rename to stdlib/2/_warnings.pyi diff --git a/stdlib/2.7/_weakref.pyi b/stdlib/2/_weakref.pyi similarity index 100% rename from stdlib/2.7/_weakref.pyi rename to stdlib/2/_weakref.pyi diff --git a/stdlib/2.7/_weakrefset.pyi b/stdlib/2/_weakrefset.pyi similarity index 100% rename from stdlib/2.7/_weakrefset.pyi rename to stdlib/2/_weakrefset.pyi diff --git a/stdlib/2.7/abc.pyi b/stdlib/2/abc.pyi similarity index 100% rename from stdlib/2.7/abc.pyi rename to stdlib/2/abc.pyi diff --git a/stdlib/2.7/array.pyi b/stdlib/2/array.pyi similarity index 100% rename from stdlib/2.7/array.pyi rename to stdlib/2/array.pyi diff --git a/stdlib/2.7/ast.pyi b/stdlib/2/ast.pyi similarity index 100% rename from stdlib/2.7/ast.pyi rename to stdlib/2/ast.pyi diff --git a/stdlib/2.7/atexit.pyi b/stdlib/2/atexit.pyi similarity index 100% rename from stdlib/2.7/atexit.pyi rename to stdlib/2/atexit.pyi diff --git a/stdlib/2.7/base64.pyi b/stdlib/2/base64.pyi similarity index 100% rename from stdlib/2.7/base64.pyi rename to stdlib/2/base64.pyi diff --git a/stdlib/2.7/binascii.pyi b/stdlib/2/binascii.pyi similarity index 100% rename from stdlib/2.7/binascii.pyi rename to stdlib/2/binascii.pyi diff --git a/stdlib/2.7/builtins.pyi b/stdlib/2/builtins.pyi similarity index 100% rename from stdlib/2.7/builtins.pyi rename to stdlib/2/builtins.pyi diff --git a/stdlib/2.7/cPickle.pyi b/stdlib/2/cPickle.pyi similarity index 100% rename from stdlib/2.7/cPickle.pyi rename to stdlib/2/cPickle.pyi diff --git a/stdlib/2.7/cStringIO.pyi b/stdlib/2/cStringIO.pyi similarity index 100% rename from stdlib/2.7/cStringIO.pyi rename to stdlib/2/cStringIO.pyi diff --git a/stdlib/2.7/calendar.pyi b/stdlib/2/calendar.pyi similarity index 100% rename from stdlib/2.7/calendar.pyi rename to stdlib/2/calendar.pyi diff --git a/stdlib/2.7/codecs.pyi b/stdlib/2/codecs.pyi similarity index 100% rename from stdlib/2.7/codecs.pyi rename to stdlib/2/codecs.pyi diff --git a/stdlib/2.7/collections.pyi b/stdlib/2/collections.pyi similarity index 100% rename from stdlib/2.7/collections.pyi rename to stdlib/2/collections.pyi diff --git a/stdlib/2.7/compileall.pyi b/stdlib/2/compileall.pyi similarity index 100% rename from stdlib/2.7/compileall.pyi rename to stdlib/2/compileall.pyi diff --git a/stdlib/2.7/copy.pyi b/stdlib/2/copy.pyi similarity index 100% rename from stdlib/2.7/copy.pyi rename to stdlib/2/copy.pyi diff --git a/stdlib/2.7/csv.pyi b/stdlib/2/csv.pyi similarity index 100% rename from stdlib/2.7/csv.pyi rename to stdlib/2/csv.pyi diff --git a/stdlib/2.7/datetime.pyi b/stdlib/2/datetime.pyi similarity index 100% rename from stdlib/2.7/datetime.pyi rename to stdlib/2/datetime.pyi diff --git a/stdlib/2.7/decimal.pyi b/stdlib/2/decimal.pyi similarity index 100% rename from stdlib/2.7/decimal.pyi rename to stdlib/2/decimal.pyi diff --git a/stdlib/2.7/difflib.pyi b/stdlib/2/difflib.pyi similarity index 100% rename from stdlib/2.7/difflib.pyi rename to stdlib/2/difflib.pyi diff --git a/stdlib/2.7/distutils/__init__.pyi b/stdlib/2/distutils/__init__.pyi similarity index 100% rename from stdlib/2.7/distutils/__init__.pyi rename to stdlib/2/distutils/__init__.pyi diff --git a/stdlib/2.7/distutils/emxccompiler.pyi b/stdlib/2/distutils/emxccompiler.pyi similarity index 100% rename from stdlib/2.7/distutils/emxccompiler.pyi rename to stdlib/2/distutils/emxccompiler.pyi diff --git a/stdlib/2.7/doctest.pyi b/stdlib/2/doctest.pyi similarity index 100% rename from stdlib/2.7/doctest.pyi rename to stdlib/2/doctest.pyi diff --git a/stdlib/2.7/email/MIMEText.pyi b/stdlib/2/email/MIMEText.pyi similarity index 100% rename from stdlib/2.7/email/MIMEText.pyi rename to stdlib/2/email/MIMEText.pyi diff --git a/stdlib/2.7/email/__init__.pyi b/stdlib/2/email/__init__.pyi similarity index 100% rename from stdlib/2.7/email/__init__.pyi rename to stdlib/2/email/__init__.pyi diff --git a/stdlib/2.7/email/_parseaddr.pyi b/stdlib/2/email/_parseaddr.pyi similarity index 100% rename from stdlib/2.7/email/_parseaddr.pyi rename to stdlib/2/email/_parseaddr.pyi diff --git a/stdlib/2.7/email/mime/__init__.pyi b/stdlib/2/email/mime/__init__.pyi similarity index 100% rename from stdlib/2.7/email/mime/__init__.pyi rename to stdlib/2/email/mime/__init__.pyi diff --git a/stdlib/2.7/email/mime/base.pyi b/stdlib/2/email/mime/base.pyi similarity index 100% rename from stdlib/2.7/email/mime/base.pyi rename to stdlib/2/email/mime/base.pyi diff --git a/stdlib/2.7/email/mime/multipart.pyi b/stdlib/2/email/mime/multipart.pyi similarity index 100% rename from stdlib/2.7/email/mime/multipart.pyi rename to stdlib/2/email/mime/multipart.pyi diff --git a/stdlib/2.7/email/mime/nonmultipart.pyi b/stdlib/2/email/mime/nonmultipart.pyi similarity index 100% rename from stdlib/2.7/email/mime/nonmultipart.pyi rename to stdlib/2/email/mime/nonmultipart.pyi diff --git a/stdlib/2.7/email/mime/text.pyi b/stdlib/2/email/mime/text.pyi similarity index 100% rename from stdlib/2.7/email/mime/text.pyi rename to stdlib/2/email/mime/text.pyi diff --git a/stdlib/2.7/email/utils.pyi b/stdlib/2/email/utils.pyi similarity index 100% rename from stdlib/2.7/email/utils.pyi rename to stdlib/2/email/utils.pyi diff --git a/stdlib/2.7/encodings/__init__.pyi b/stdlib/2/encodings/__init__.pyi similarity index 100% rename from stdlib/2.7/encodings/__init__.pyi rename to stdlib/2/encodings/__init__.pyi diff --git a/stdlib/2.7/encodings/utf_8.pyi b/stdlib/2/encodings/utf_8.pyi similarity index 100% rename from stdlib/2.7/encodings/utf_8.pyi rename to stdlib/2/encodings/utf_8.pyi diff --git a/stdlib/2.7/exceptions.pyi b/stdlib/2/exceptions.pyi similarity index 100% rename from stdlib/2.7/exceptions.pyi rename to stdlib/2/exceptions.pyi diff --git a/stdlib/2.7/fcntl.pyi b/stdlib/2/fcntl.pyi similarity index 100% rename from stdlib/2.7/fcntl.pyi rename to stdlib/2/fcntl.pyi diff --git a/stdlib/2.7/fileinput.pyi b/stdlib/2/fileinput.pyi similarity index 100% rename from stdlib/2.7/fileinput.pyi rename to stdlib/2/fileinput.pyi diff --git a/stdlib/2.7/fnmatch.pyi b/stdlib/2/fnmatch.pyi similarity index 100% rename from stdlib/2.7/fnmatch.pyi rename to stdlib/2/fnmatch.pyi diff --git a/stdlib/2.7/functools.pyi b/stdlib/2/functools.pyi similarity index 100% rename from stdlib/2.7/functools.pyi rename to stdlib/2/functools.pyi diff --git a/stdlib/2.7/future_builtins.pyi b/stdlib/2/future_builtins.pyi similarity index 100% rename from stdlib/2.7/future_builtins.pyi rename to stdlib/2/future_builtins.pyi diff --git a/stdlib/2.7/gc.pyi b/stdlib/2/gc.pyi similarity index 100% rename from stdlib/2.7/gc.pyi rename to stdlib/2/gc.pyi diff --git a/stdlib/2.7/genericpath.pyi b/stdlib/2/genericpath.pyi similarity index 100% rename from stdlib/2.7/genericpath.pyi rename to stdlib/2/genericpath.pyi diff --git a/stdlib/2.7/getopt.pyi b/stdlib/2/getopt.pyi similarity index 100% rename from stdlib/2.7/getopt.pyi rename to stdlib/2/getopt.pyi diff --git a/stdlib/2.7/getpass.pyi b/stdlib/2/getpass.pyi similarity index 100% rename from stdlib/2.7/getpass.pyi rename to stdlib/2/getpass.pyi diff --git a/stdlib/2.7/gettext.pyi b/stdlib/2/gettext.pyi similarity index 100% rename from stdlib/2.7/gettext.pyi rename to stdlib/2/gettext.pyi diff --git a/stdlib/2.7/glob.pyi b/stdlib/2/glob.pyi similarity index 100% rename from stdlib/2.7/glob.pyi rename to stdlib/2/glob.pyi diff --git a/stdlib/2.7/grp.pyi b/stdlib/2/grp.pyi similarity index 100% rename from stdlib/2.7/grp.pyi rename to stdlib/2/grp.pyi diff --git a/stdlib/2.7/gzip.pyi b/stdlib/2/gzip.pyi similarity index 100% rename from stdlib/2.7/gzip.pyi rename to stdlib/2/gzip.pyi diff --git a/stdlib/2.7/hashlib.pyi b/stdlib/2/hashlib.pyi similarity index 100% rename from stdlib/2.7/hashlib.pyi rename to stdlib/2/hashlib.pyi diff --git a/stdlib/2.7/heapq.pyi b/stdlib/2/heapq.pyi similarity index 100% rename from stdlib/2.7/heapq.pyi rename to stdlib/2/heapq.pyi diff --git a/stdlib/2.7/htmlentitydefs.pyi b/stdlib/2/htmlentitydefs.pyi similarity index 100% rename from stdlib/2.7/htmlentitydefs.pyi rename to stdlib/2/htmlentitydefs.pyi diff --git a/stdlib/2.7/httplib.pyi b/stdlib/2/httplib.pyi similarity index 100% rename from stdlib/2.7/httplib.pyi rename to stdlib/2/httplib.pyi diff --git a/stdlib/2.7/imp.pyi b/stdlib/2/imp.pyi similarity index 100% rename from stdlib/2.7/imp.pyi rename to stdlib/2/imp.pyi diff --git a/stdlib/2.7/importlib.pyi b/stdlib/2/importlib.pyi similarity index 100% rename from stdlib/2.7/importlib.pyi rename to stdlib/2/importlib.pyi diff --git a/stdlib/2.7/inspect.pyi b/stdlib/2/inspect.pyi similarity index 100% rename from stdlib/2.7/inspect.pyi rename to stdlib/2/inspect.pyi diff --git a/stdlib/2.7/io.pyi b/stdlib/2/io.pyi similarity index 100% rename from stdlib/2.7/io.pyi rename to stdlib/2/io.pyi diff --git a/stdlib/2.7/itertools.pyi b/stdlib/2/itertools.pyi similarity index 100% rename from stdlib/2.7/itertools.pyi rename to stdlib/2/itertools.pyi diff --git a/stdlib/2.7/json.pyi b/stdlib/2/json.pyi similarity index 100% rename from stdlib/2.7/json.pyi rename to stdlib/2/json.pyi diff --git a/stdlib/2.7/linecache.pyi b/stdlib/2/linecache.pyi similarity index 100% rename from stdlib/2.7/linecache.pyi rename to stdlib/2/linecache.pyi diff --git a/stdlib/2.7/markupbase.pyi b/stdlib/2/markupbase.pyi similarity index 100% rename from stdlib/2.7/markupbase.pyi rename to stdlib/2/markupbase.pyi diff --git a/stdlib/2.7/md5.pyi b/stdlib/2/md5.pyi similarity index 100% rename from stdlib/2.7/md5.pyi rename to stdlib/2/md5.pyi diff --git a/stdlib/2.7/mimetools.pyi b/stdlib/2/mimetools.pyi similarity index 100% rename from stdlib/2.7/mimetools.pyi rename to stdlib/2/mimetools.pyi diff --git a/stdlib/2.7/multiprocessing/__init__.pyi b/stdlib/2/multiprocessing/__init__.pyi similarity index 100% rename from stdlib/2.7/multiprocessing/__init__.pyi rename to stdlib/2/multiprocessing/__init__.pyi diff --git a/stdlib/2.7/multiprocessing/process.pyi b/stdlib/2/multiprocessing/process.pyi similarity index 100% rename from stdlib/2.7/multiprocessing/process.pyi rename to stdlib/2/multiprocessing/process.pyi diff --git a/stdlib/2.7/multiprocessing/util.pyi b/stdlib/2/multiprocessing/util.pyi similarity index 100% rename from stdlib/2.7/multiprocessing/util.pyi rename to stdlib/2/multiprocessing/util.pyi diff --git a/stdlib/2.7/optparse.pyi b/stdlib/2/optparse.pyi similarity index 100% rename from stdlib/2.7/optparse.pyi rename to stdlib/2/optparse.pyi diff --git a/stdlib/2.7/os/__init__.pyi b/stdlib/2/os/__init__.pyi similarity index 100% rename from stdlib/2.7/os/__init__.pyi rename to stdlib/2/os/__init__.pyi diff --git a/stdlib/2.7/os/path.pyi b/stdlib/2/os/path.pyi similarity index 100% rename from stdlib/2.7/os/path.pyi rename to stdlib/2/os/path.pyi diff --git a/stdlib/2.7/pdb.pyi b/stdlib/2/pdb.pyi similarity index 100% rename from stdlib/2.7/pdb.pyi rename to stdlib/2/pdb.pyi diff --git a/stdlib/2.7/pickle.pyi b/stdlib/2/pickle.pyi similarity index 100% rename from stdlib/2.7/pickle.pyi rename to stdlib/2/pickle.pyi diff --git a/stdlib/2.7/pipes.pyi b/stdlib/2/pipes.pyi similarity index 100% rename from stdlib/2.7/pipes.pyi rename to stdlib/2/pipes.pyi diff --git a/stdlib/2.7/platform.pyi b/stdlib/2/platform.pyi similarity index 100% rename from stdlib/2.7/platform.pyi rename to stdlib/2/platform.pyi diff --git a/stdlib/2.7/posix.pyi b/stdlib/2/posix.pyi similarity index 100% rename from stdlib/2.7/posix.pyi rename to stdlib/2/posix.pyi diff --git a/stdlib/2.7/posixpath.pyi b/stdlib/2/posixpath.pyi similarity index 100% rename from stdlib/2.7/posixpath.pyi rename to stdlib/2/posixpath.pyi diff --git a/stdlib/2.7/pprint.pyi b/stdlib/2/pprint.pyi similarity index 100% rename from stdlib/2.7/pprint.pyi rename to stdlib/2/pprint.pyi diff --git a/stdlib/2.7/pwd.pyi b/stdlib/2/pwd.pyi similarity index 100% rename from stdlib/2.7/pwd.pyi rename to stdlib/2/pwd.pyi diff --git a/stdlib/2.7/quopri.pyi b/stdlib/2/quopri.pyi similarity index 100% rename from stdlib/2.7/quopri.pyi rename to stdlib/2/quopri.pyi diff --git a/stdlib/2.7/random.pyi b/stdlib/2/random.pyi similarity index 100% rename from stdlib/2.7/random.pyi rename to stdlib/2/random.pyi diff --git a/stdlib/2.7/re.pyi b/stdlib/2/re.pyi similarity index 100% rename from stdlib/2.7/re.pyi rename to stdlib/2/re.pyi diff --git a/stdlib/2.7/resource.pyi b/stdlib/2/resource.pyi similarity index 100% rename from stdlib/2.7/resource.pyi rename to stdlib/2/resource.pyi diff --git a/stdlib/2.7/rfc822.pyi b/stdlib/2/rfc822.pyi similarity index 100% rename from stdlib/2.7/rfc822.pyi rename to stdlib/2/rfc822.pyi diff --git a/stdlib/2.7/robotparser.pyi b/stdlib/2/robotparser.pyi similarity index 100% rename from stdlib/2.7/robotparser.pyi rename to stdlib/2/robotparser.pyi diff --git a/stdlib/2.7/runpy.pyi b/stdlib/2/runpy.pyi similarity index 100% rename from stdlib/2.7/runpy.pyi rename to stdlib/2/runpy.pyi diff --git a/stdlib/2.7/select.pyi b/stdlib/2/select.pyi similarity index 100% rename from stdlib/2.7/select.pyi rename to stdlib/2/select.pyi diff --git a/stdlib/2.7/sha.pyi b/stdlib/2/sha.pyi similarity index 100% rename from stdlib/2.7/sha.pyi rename to stdlib/2/sha.pyi diff --git a/stdlib/2.7/shelve.pyi b/stdlib/2/shelve.pyi similarity index 100% rename from stdlib/2.7/shelve.pyi rename to stdlib/2/shelve.pyi diff --git a/stdlib/2.7/shlex.pyi b/stdlib/2/shlex.pyi similarity index 100% rename from stdlib/2.7/shlex.pyi rename to stdlib/2/shlex.pyi diff --git a/stdlib/2.7/shutil.pyi b/stdlib/2/shutil.pyi similarity index 100% rename from stdlib/2.7/shutil.pyi rename to stdlib/2/shutil.pyi diff --git a/stdlib/2.7/signal.pyi b/stdlib/2/signal.pyi similarity index 100% rename from stdlib/2.7/signal.pyi rename to stdlib/2/signal.pyi diff --git a/stdlib/2.7/simplejson/__init__.pyi b/stdlib/2/simplejson/__init__.pyi similarity index 100% rename from stdlib/2.7/simplejson/__init__.pyi rename to stdlib/2/simplejson/__init__.pyi diff --git a/stdlib/2.7/simplejson/decoder.pyi b/stdlib/2/simplejson/decoder.pyi similarity index 100% rename from stdlib/2.7/simplejson/decoder.pyi rename to stdlib/2/simplejson/decoder.pyi diff --git a/stdlib/2.7/simplejson/encoder.pyi b/stdlib/2/simplejson/encoder.pyi similarity index 100% rename from stdlib/2.7/simplejson/encoder.pyi rename to stdlib/2/simplejson/encoder.pyi diff --git a/stdlib/2.7/simplejson/scanner.pyi b/stdlib/2/simplejson/scanner.pyi similarity index 100% rename from stdlib/2.7/simplejson/scanner.pyi rename to stdlib/2/simplejson/scanner.pyi diff --git a/stdlib/2.7/smtplib.pyi b/stdlib/2/smtplib.pyi similarity index 100% rename from stdlib/2.7/smtplib.pyi rename to stdlib/2/smtplib.pyi diff --git a/stdlib/2.7/socket.pyi b/stdlib/2/socket.pyi similarity index 100% rename from stdlib/2.7/socket.pyi rename to stdlib/2/socket.pyi diff --git a/stdlib/2.7/spwd.pyi b/stdlib/2/spwd.pyi similarity index 100% rename from stdlib/2.7/spwd.pyi rename to stdlib/2/spwd.pyi diff --git a/stdlib/2.7/sqlite3/__init__.pyi b/stdlib/2/sqlite3/__init__.pyi similarity index 100% rename from stdlib/2.7/sqlite3/__init__.pyi rename to stdlib/2/sqlite3/__init__.pyi diff --git a/stdlib/2.7/sqlite3/dbapi2.pyi b/stdlib/2/sqlite3/dbapi2.pyi similarity index 100% rename from stdlib/2.7/sqlite3/dbapi2.pyi rename to stdlib/2/sqlite3/dbapi2.pyi diff --git a/stdlib/2.7/ssl.pyi b/stdlib/2/ssl.pyi similarity index 100% rename from stdlib/2.7/ssl.pyi rename to stdlib/2/ssl.pyi diff --git a/stdlib/2.7/stat.pyi b/stdlib/2/stat.pyi similarity index 100% rename from stdlib/2.7/stat.pyi rename to stdlib/2/stat.pyi diff --git a/stdlib/2.7/string.pyi b/stdlib/2/string.pyi similarity index 100% rename from stdlib/2.7/string.pyi rename to stdlib/2/string.pyi diff --git a/stdlib/2.7/strop.pyi b/stdlib/2/strop.pyi similarity index 100% rename from stdlib/2.7/strop.pyi rename to stdlib/2/strop.pyi diff --git a/stdlib/2.7/struct.pyi b/stdlib/2/struct.pyi similarity index 100% rename from stdlib/2.7/struct.pyi rename to stdlib/2/struct.pyi diff --git a/stdlib/2.7/subprocess.pyi b/stdlib/2/subprocess.pyi similarity index 100% rename from stdlib/2.7/subprocess.pyi rename to stdlib/2/subprocess.pyi diff --git a/stdlib/2.7/sys.pyi b/stdlib/2/sys.pyi similarity index 100% rename from stdlib/2.7/sys.pyi rename to stdlib/2/sys.pyi diff --git a/stdlib/2.7/syslog.pyi b/stdlib/2/syslog.pyi similarity index 100% rename from stdlib/2.7/syslog.pyi rename to stdlib/2/syslog.pyi diff --git a/stdlib/2.7/tempfile.pyi b/stdlib/2/tempfile.pyi similarity index 100% rename from stdlib/2.7/tempfile.pyi rename to stdlib/2/tempfile.pyi diff --git a/stdlib/2.7/textwrap.pyi b/stdlib/2/textwrap.pyi similarity index 100% rename from stdlib/2.7/textwrap.pyi rename to stdlib/2/textwrap.pyi diff --git a/stdlib/2.7/thread.pyi b/stdlib/2/thread.pyi similarity index 100% rename from stdlib/2.7/thread.pyi rename to stdlib/2/thread.pyi diff --git a/stdlib/2.7/time.pyi b/stdlib/2/time.pyi similarity index 100% rename from stdlib/2.7/time.pyi rename to stdlib/2/time.pyi diff --git a/stdlib/2.7/token.pyi b/stdlib/2/token.pyi similarity index 100% rename from stdlib/2.7/token.pyi rename to stdlib/2/token.pyi diff --git a/stdlib/2.7/tokenize.pyi b/stdlib/2/tokenize.pyi similarity index 100% rename from stdlib/2.7/tokenize.pyi rename to stdlib/2/tokenize.pyi diff --git a/stdlib/2.7/types.pyi b/stdlib/2/types.pyi similarity index 100% rename from stdlib/2.7/types.pyi rename to stdlib/2/types.pyi diff --git a/stdlib/2.7/typing.pyi b/stdlib/2/typing.pyi similarity index 100% rename from stdlib/2.7/typing.pyi rename to stdlib/2/typing.pyi diff --git a/stdlib/2.7/unicodedata.pyi b/stdlib/2/unicodedata.pyi similarity index 100% rename from stdlib/2.7/unicodedata.pyi rename to stdlib/2/unicodedata.pyi diff --git a/stdlib/2.7/unittest.pyi b/stdlib/2/unittest.pyi similarity index 100% rename from stdlib/2.7/unittest.pyi rename to stdlib/2/unittest.pyi diff --git a/stdlib/2.7/urllib.pyi b/stdlib/2/urllib.pyi similarity index 100% rename from stdlib/2.7/urllib.pyi rename to stdlib/2/urllib.pyi diff --git a/stdlib/2.7/urllib2.pyi b/stdlib/2/urllib2.pyi similarity index 100% rename from stdlib/2.7/urllib2.pyi rename to stdlib/2/urllib2.pyi diff --git a/stdlib/2.7/urlparse.pyi b/stdlib/2/urlparse.pyi similarity index 100% rename from stdlib/2.7/urlparse.pyi rename to stdlib/2/urlparse.pyi diff --git a/stdlib/2.7/uuid.pyi b/stdlib/2/uuid.pyi similarity index 100% rename from stdlib/2.7/uuid.pyi rename to stdlib/2/uuid.pyi diff --git a/stdlib/2.7/weakref.pyi b/stdlib/2/weakref.pyi similarity index 100% rename from stdlib/2.7/weakref.pyi rename to stdlib/2/weakref.pyi diff --git a/stdlib/2.7/wsgiref/__init__.pyi b/stdlib/2/wsgiref/__init__.pyi similarity index 100% rename from stdlib/2.7/wsgiref/__init__.pyi rename to stdlib/2/wsgiref/__init__.pyi diff --git a/stdlib/2.7/wsgiref/validate.pyi b/stdlib/2/wsgiref/validate.pyi similarity index 100% rename from stdlib/2.7/wsgiref/validate.pyi rename to stdlib/2/wsgiref/validate.pyi diff --git a/stdlib/2.7/xml/__init__.pyi b/stdlib/2/xml/__init__.pyi similarity index 100% rename from stdlib/2.7/xml/__init__.pyi rename to stdlib/2/xml/__init__.pyi diff --git a/stdlib/2.7/xml/etree/ElementInclude.pyi b/stdlib/2/xml/etree/ElementInclude.pyi similarity index 100% rename from stdlib/2.7/xml/etree/ElementInclude.pyi rename to stdlib/2/xml/etree/ElementInclude.pyi diff --git a/stdlib/2.7/xml/etree/ElementPath.pyi b/stdlib/2/xml/etree/ElementPath.pyi similarity index 100% rename from stdlib/2.7/xml/etree/ElementPath.pyi rename to stdlib/2/xml/etree/ElementPath.pyi diff --git a/stdlib/2.7/xml/etree/ElementTree.pyi b/stdlib/2/xml/etree/ElementTree.pyi similarity index 100% rename from stdlib/2.7/xml/etree/ElementTree.pyi rename to stdlib/2/xml/etree/ElementTree.pyi diff --git a/stdlib/2.7/xml/etree/__init__.pyi b/stdlib/2/xml/etree/__init__.pyi similarity index 100% rename from stdlib/2.7/xml/etree/__init__.pyi rename to stdlib/2/xml/etree/__init__.pyi diff --git a/stdlib/2.7/xml/etree/cElementTree.pyi b/stdlib/2/xml/etree/cElementTree.pyi similarity index 100% rename from stdlib/2.7/xml/etree/cElementTree.pyi rename to stdlib/2/xml/etree/cElementTree.pyi diff --git a/stdlib/2.7/xxsubtype.pyi b/stdlib/2/xxsubtype.pyi similarity index 100% rename from stdlib/2.7/xxsubtype.pyi rename to stdlib/2/xxsubtype.pyi diff --git a/stdlib/2.7/zlib.pyi b/stdlib/2/zlib.pyi similarity index 100% rename from stdlib/2.7/zlib.pyi rename to stdlib/2/zlib.pyi diff --git a/third_party/2.7/Crypto/Cipher/AES.pyi b/third_party/2/Crypto/Cipher/AES.pyi similarity index 100% rename from third_party/2.7/Crypto/Cipher/AES.pyi rename to third_party/2/Crypto/Cipher/AES.pyi diff --git a/third_party/2.7/Crypto/Cipher/__init__.pyi b/third_party/2/Crypto/Cipher/__init__.pyi similarity index 100% rename from third_party/2.7/Crypto/Cipher/__init__.pyi rename to third_party/2/Crypto/Cipher/__init__.pyi diff --git a/third_party/2.7/Crypto/Random/__init__.pyi b/third_party/2/Crypto/Random/__init__.pyi similarity index 100% rename from third_party/2.7/Crypto/Random/__init__.pyi rename to third_party/2/Crypto/Random/__init__.pyi diff --git a/third_party/2.7/Crypto/Random/random.pyi b/third_party/2/Crypto/Random/random.pyi similarity index 100% rename from third_party/2.7/Crypto/Random/random.pyi rename to third_party/2/Crypto/Random/random.pyi diff --git a/third_party/2.7/Crypto/__init__.pyi b/third_party/2/Crypto/__init__.pyi similarity index 100% rename from third_party/2.7/Crypto/__init__.pyi rename to third_party/2/Crypto/__init__.pyi diff --git a/third_party/2.7/OpenSSL/__init__.pyi b/third_party/2/OpenSSL/__init__.pyi similarity index 100% rename from third_party/2.7/OpenSSL/__init__.pyi rename to third_party/2/OpenSSL/__init__.pyi diff --git a/third_party/2.7/OpenSSL/crypto.pyi b/third_party/2/OpenSSL/crypto.pyi similarity index 100% rename from third_party/2.7/OpenSSL/crypto.pyi rename to third_party/2/OpenSSL/crypto.pyi diff --git a/third_party/2.7/boto/__init__.pyi b/third_party/2/boto/__init__.pyi similarity index 100% rename from third_party/2.7/boto/__init__.pyi rename to third_party/2/boto/__init__.pyi diff --git a/third_party/2.7/boto/connection.pyi b/third_party/2/boto/connection.pyi similarity index 100% rename from third_party/2.7/boto/connection.pyi rename to third_party/2/boto/connection.pyi diff --git a/third_party/2.7/boto/ec2/__init__.pyi b/third_party/2/boto/ec2/__init__.pyi similarity index 100% rename from third_party/2.7/boto/ec2/__init__.pyi rename to third_party/2/boto/ec2/__init__.pyi diff --git a/third_party/2.7/boto/ec2/elb/__init__.pyi b/third_party/2/boto/ec2/elb/__init__.pyi similarity index 100% rename from third_party/2.7/boto/ec2/elb/__init__.pyi rename to third_party/2/boto/ec2/elb/__init__.pyi diff --git a/third_party/2.7/boto/exception.pyi b/third_party/2/boto/exception.pyi similarity index 100% rename from third_party/2.7/boto/exception.pyi rename to third_party/2/boto/exception.pyi diff --git a/third_party/2.7/concurrent/__init__.pyi b/third_party/2/concurrent/__init__.pyi similarity index 100% rename from third_party/2.7/concurrent/__init__.pyi rename to third_party/2/concurrent/__init__.pyi diff --git a/third_party/2.7/concurrent/futures/__init__.pyi b/third_party/2/concurrent/futures/__init__.pyi similarity index 100% rename from third_party/2.7/concurrent/futures/__init__.pyi rename to third_party/2/concurrent/futures/__init__.pyi diff --git a/third_party/2.7/croniter.pyi b/third_party/2/croniter.pyi similarity index 100% rename from third_party/2.7/croniter.pyi rename to third_party/2/croniter.pyi diff --git a/third_party/2.7/dateutil/__init__.pyi b/third_party/2/dateutil/__init__.pyi similarity index 100% rename from third_party/2.7/dateutil/__init__.pyi rename to third_party/2/dateutil/__init__.pyi diff --git a/third_party/2.7/dateutil/parser.pyi b/third_party/2/dateutil/parser.pyi similarity index 100% rename from third_party/2.7/dateutil/parser.pyi rename to third_party/2/dateutil/parser.pyi diff --git a/third_party/2.7/dateutil/relativedelta.pyi b/third_party/2/dateutil/relativedelta.pyi similarity index 100% rename from third_party/2.7/dateutil/relativedelta.pyi rename to third_party/2/dateutil/relativedelta.pyi diff --git a/third_party/2.7/enum.pyi b/third_party/2/enum.pyi similarity index 100% rename from third_party/2.7/enum.pyi rename to third_party/2/enum.pyi diff --git a/third_party/2.7/fb303/FacebookService.pyi b/third_party/2/fb303/FacebookService.pyi similarity index 100% rename from third_party/2.7/fb303/FacebookService.pyi rename to third_party/2/fb303/FacebookService.pyi diff --git a/third_party/2.7/fb303/__init__.pyi b/third_party/2/fb303/__init__.pyi similarity index 100% rename from third_party/2.7/fb303/__init__.pyi rename to third_party/2/fb303/__init__.pyi diff --git a/third_party/2.7/gflags.pyi b/third_party/2/gflags.pyi similarity index 100% rename from third_party/2.7/gflags.pyi rename to third_party/2/gflags.pyi diff --git a/third_party/2.7/google/__init__.pyi b/third_party/2/google/__init__.pyi similarity index 100% rename from third_party/2.7/google/__init__.pyi rename to third_party/2/google/__init__.pyi diff --git a/third_party/2.7/google/protobuf/__init__.pyi b/third_party/2/google/protobuf/__init__.pyi similarity index 100% rename from third_party/2.7/google/protobuf/__init__.pyi rename to third_party/2/google/protobuf/__init__.pyi diff --git a/third_party/2.7/google/protobuf/descriptor.pyi b/third_party/2/google/protobuf/descriptor.pyi similarity index 100% rename from third_party/2.7/google/protobuf/descriptor.pyi rename to third_party/2/google/protobuf/descriptor.pyi diff --git a/third_party/2.7/google/protobuf/descriptor_pb2.pyi b/third_party/2/google/protobuf/descriptor_pb2.pyi similarity index 100% rename from third_party/2.7/google/protobuf/descriptor_pb2.pyi rename to third_party/2/google/protobuf/descriptor_pb2.pyi diff --git a/third_party/2.7/google/protobuf/internal/__init__.pyi b/third_party/2/google/protobuf/internal/__init__.pyi similarity index 100% rename from third_party/2.7/google/protobuf/internal/__init__.pyi rename to third_party/2/google/protobuf/internal/__init__.pyi diff --git a/third_party/2.7/google/protobuf/internal/decoder.pyi b/third_party/2/google/protobuf/internal/decoder.pyi similarity index 100% rename from third_party/2.7/google/protobuf/internal/decoder.pyi rename to third_party/2/google/protobuf/internal/decoder.pyi diff --git a/third_party/2.7/google/protobuf/internal/encoder.pyi b/third_party/2/google/protobuf/internal/encoder.pyi similarity index 100% rename from third_party/2.7/google/protobuf/internal/encoder.pyi rename to third_party/2/google/protobuf/internal/encoder.pyi diff --git a/third_party/2.7/google/protobuf/internal/enum_type_wrapper.pyi b/third_party/2/google/protobuf/internal/enum_type_wrapper.pyi similarity index 100% rename from third_party/2.7/google/protobuf/internal/enum_type_wrapper.pyi rename to third_party/2/google/protobuf/internal/enum_type_wrapper.pyi diff --git a/third_party/2.7/google/protobuf/internal/wire_format.pyi b/third_party/2/google/protobuf/internal/wire_format.pyi similarity index 100% rename from third_party/2.7/google/protobuf/internal/wire_format.pyi rename to third_party/2/google/protobuf/internal/wire_format.pyi diff --git a/third_party/2.7/google/protobuf/message.pyi b/third_party/2/google/protobuf/message.pyi similarity index 100% rename from third_party/2.7/google/protobuf/message.pyi rename to third_party/2/google/protobuf/message.pyi diff --git a/third_party/2.7/google/protobuf/reflection.pyi b/third_party/2/google/protobuf/reflection.pyi similarity index 100% rename from third_party/2.7/google/protobuf/reflection.pyi rename to third_party/2/google/protobuf/reflection.pyi diff --git a/third_party/2.7/itsdangerous.pyi b/third_party/2/itsdangerous.pyi similarity index 100% rename from third_party/2.7/itsdangerous.pyi rename to third_party/2/itsdangerous.pyi diff --git a/third_party/2.7/kazoo/__init__.pyi b/third_party/2/kazoo/__init__.pyi similarity index 100% rename from third_party/2.7/kazoo/__init__.pyi rename to third_party/2/kazoo/__init__.pyi diff --git a/third_party/2.7/kazoo/client.pyi b/third_party/2/kazoo/client.pyi similarity index 100% rename from third_party/2.7/kazoo/client.pyi rename to third_party/2/kazoo/client.pyi diff --git a/third_party/2.7/kazoo/exceptions.pyi b/third_party/2/kazoo/exceptions.pyi similarity index 100% rename from third_party/2.7/kazoo/exceptions.pyi rename to third_party/2/kazoo/exceptions.pyi diff --git a/third_party/2.7/kazoo/recipe/__init__.pyi b/third_party/2/kazoo/recipe/__init__.pyi similarity index 100% rename from third_party/2.7/kazoo/recipe/__init__.pyi rename to third_party/2/kazoo/recipe/__init__.pyi diff --git a/third_party/2.7/kazoo/recipe/watchers.pyi b/third_party/2/kazoo/recipe/watchers.pyi similarity index 100% rename from third_party/2.7/kazoo/recipe/watchers.pyi rename to third_party/2/kazoo/recipe/watchers.pyi diff --git a/third_party/2.7/pycurl.pyi b/third_party/2/pycurl.pyi similarity index 100% rename from third_party/2.7/pycurl.pyi rename to third_party/2/pycurl.pyi diff --git a/third_party/2.7/pymssql.pyi b/third_party/2/pymssql.pyi similarity index 100% rename from third_party/2.7/pymssql.pyi rename to third_party/2/pymssql.pyi diff --git a/third_party/2.7/redis/__init__.pyi b/third_party/2/redis/__init__.pyi similarity index 100% rename from third_party/2.7/redis/__init__.pyi rename to third_party/2/redis/__init__.pyi diff --git a/third_party/2.7/redis/client.pyi b/third_party/2/redis/client.pyi similarity index 100% rename from third_party/2.7/redis/client.pyi rename to third_party/2/redis/client.pyi diff --git a/third_party/2.7/redis/connection.pyi b/third_party/2/redis/connection.pyi similarity index 100% rename from third_party/2.7/redis/connection.pyi rename to third_party/2/redis/connection.pyi diff --git a/third_party/2.7/redis/exceptions.pyi b/third_party/2/redis/exceptions.pyi similarity index 100% rename from third_party/2.7/redis/exceptions.pyi rename to third_party/2/redis/exceptions.pyi diff --git a/third_party/2.7/redis/utils.pyi b/third_party/2/redis/utils.pyi similarity index 100% rename from third_party/2.7/redis/utils.pyi rename to third_party/2/redis/utils.pyi diff --git a/third_party/2.7/requests/__init__.pyi b/third_party/2/requests/__init__.pyi similarity index 100% rename from third_party/2.7/requests/__init__.pyi rename to third_party/2/requests/__init__.pyi diff --git a/third_party/2.7/requests/adapters.pyi b/third_party/2/requests/adapters.pyi similarity index 100% rename from third_party/2.7/requests/adapters.pyi rename to third_party/2/requests/adapters.pyi diff --git a/third_party/2.7/requests/api.pyi b/third_party/2/requests/api.pyi similarity index 100% rename from third_party/2.7/requests/api.pyi rename to third_party/2/requests/api.pyi diff --git a/third_party/2.7/requests/auth.pyi b/third_party/2/requests/auth.pyi similarity index 100% rename from third_party/2.7/requests/auth.pyi rename to third_party/2/requests/auth.pyi diff --git a/third_party/2.7/requests/compat.pyi b/third_party/2/requests/compat.pyi similarity index 100% rename from third_party/2.7/requests/compat.pyi rename to third_party/2/requests/compat.pyi diff --git a/third_party/2.7/requests/cookies.pyi b/third_party/2/requests/cookies.pyi similarity index 100% rename from third_party/2.7/requests/cookies.pyi rename to third_party/2/requests/cookies.pyi diff --git a/third_party/2.7/requests/exceptions.pyi b/third_party/2/requests/exceptions.pyi similarity index 100% rename from third_party/2.7/requests/exceptions.pyi rename to third_party/2/requests/exceptions.pyi diff --git a/third_party/2.7/requests/hooks.pyi b/third_party/2/requests/hooks.pyi similarity index 100% rename from third_party/2.7/requests/hooks.pyi rename to third_party/2/requests/hooks.pyi diff --git a/third_party/2.7/requests/models.pyi b/third_party/2/requests/models.pyi similarity index 100% rename from third_party/2.7/requests/models.pyi rename to third_party/2/requests/models.pyi diff --git a/third_party/2.7/requests/packages/__init__.pyi b/third_party/2/requests/packages/__init__.pyi similarity index 100% rename from third_party/2.7/requests/packages/__init__.pyi rename to third_party/2/requests/packages/__init__.pyi diff --git a/third_party/2.7/requests/packages/urllib3/__init__.pyi b/third_party/2/requests/packages/urllib3/__init__.pyi similarity index 100% rename from third_party/2.7/requests/packages/urllib3/__init__.pyi rename to third_party/2/requests/packages/urllib3/__init__.pyi diff --git a/third_party/2.7/requests/packages/urllib3/_collections.pyi b/third_party/2/requests/packages/urllib3/_collections.pyi similarity index 100% rename from third_party/2.7/requests/packages/urllib3/_collections.pyi rename to third_party/2/requests/packages/urllib3/_collections.pyi diff --git a/third_party/2.7/requests/packages/urllib3/connection.pyi b/third_party/2/requests/packages/urllib3/connection.pyi similarity index 100% rename from third_party/2.7/requests/packages/urllib3/connection.pyi rename to third_party/2/requests/packages/urllib3/connection.pyi diff --git a/third_party/2.7/requests/packages/urllib3/connectionpool.pyi b/third_party/2/requests/packages/urllib3/connectionpool.pyi similarity index 100% rename from third_party/2.7/requests/packages/urllib3/connectionpool.pyi rename to third_party/2/requests/packages/urllib3/connectionpool.pyi diff --git a/third_party/2.7/requests/packages/urllib3/contrib/__init__.pyi b/third_party/2/requests/packages/urllib3/contrib/__init__.pyi similarity index 100% rename from third_party/2.7/requests/packages/urllib3/contrib/__init__.pyi rename to third_party/2/requests/packages/urllib3/contrib/__init__.pyi diff --git a/third_party/2.7/requests/packages/urllib3/exceptions.pyi b/third_party/2/requests/packages/urllib3/exceptions.pyi similarity index 100% rename from third_party/2.7/requests/packages/urllib3/exceptions.pyi rename to third_party/2/requests/packages/urllib3/exceptions.pyi diff --git a/third_party/2.7/requests/packages/urllib3/fields.pyi b/third_party/2/requests/packages/urllib3/fields.pyi similarity index 100% rename from third_party/2.7/requests/packages/urllib3/fields.pyi rename to third_party/2/requests/packages/urllib3/fields.pyi diff --git a/third_party/2.7/requests/packages/urllib3/filepost.pyi b/third_party/2/requests/packages/urllib3/filepost.pyi similarity index 100% rename from third_party/2.7/requests/packages/urllib3/filepost.pyi rename to third_party/2/requests/packages/urllib3/filepost.pyi diff --git a/third_party/2.7/requests/packages/urllib3/packages/__init__.pyi b/third_party/2/requests/packages/urllib3/packages/__init__.pyi similarity index 100% rename from third_party/2.7/requests/packages/urllib3/packages/__init__.pyi rename to third_party/2/requests/packages/urllib3/packages/__init__.pyi diff --git a/third_party/2.7/requests/packages/urllib3/packages/ssl_match_hostname/__init__.pyi b/third_party/2/requests/packages/urllib3/packages/ssl_match_hostname/__init__.pyi similarity index 100% rename from third_party/2.7/requests/packages/urllib3/packages/ssl_match_hostname/__init__.pyi rename to third_party/2/requests/packages/urllib3/packages/ssl_match_hostname/__init__.pyi diff --git a/third_party/2.7/requests/packages/urllib3/packages/ssl_match_hostname/_implementation.pyi b/third_party/2/requests/packages/urllib3/packages/ssl_match_hostname/_implementation.pyi similarity index 100% rename from third_party/2.7/requests/packages/urllib3/packages/ssl_match_hostname/_implementation.pyi rename to third_party/2/requests/packages/urllib3/packages/ssl_match_hostname/_implementation.pyi diff --git a/third_party/2.7/requests/packages/urllib3/poolmanager.pyi b/third_party/2/requests/packages/urllib3/poolmanager.pyi similarity index 100% rename from third_party/2.7/requests/packages/urllib3/poolmanager.pyi rename to third_party/2/requests/packages/urllib3/poolmanager.pyi diff --git a/third_party/2.7/requests/packages/urllib3/request.pyi b/third_party/2/requests/packages/urllib3/request.pyi similarity index 100% rename from third_party/2.7/requests/packages/urllib3/request.pyi rename to third_party/2/requests/packages/urllib3/request.pyi diff --git a/third_party/2.7/requests/packages/urllib3/response.pyi b/third_party/2/requests/packages/urllib3/response.pyi similarity index 100% rename from third_party/2.7/requests/packages/urllib3/response.pyi rename to third_party/2/requests/packages/urllib3/response.pyi diff --git a/third_party/2.7/requests/packages/urllib3/util/__init__.pyi b/third_party/2/requests/packages/urllib3/util/__init__.pyi similarity index 100% rename from third_party/2.7/requests/packages/urllib3/util/__init__.pyi rename to third_party/2/requests/packages/urllib3/util/__init__.pyi diff --git a/third_party/2.7/requests/packages/urllib3/util/connection.pyi b/third_party/2/requests/packages/urllib3/util/connection.pyi similarity index 100% rename from third_party/2.7/requests/packages/urllib3/util/connection.pyi rename to third_party/2/requests/packages/urllib3/util/connection.pyi diff --git a/third_party/2.7/requests/packages/urllib3/util/request.pyi b/third_party/2/requests/packages/urllib3/util/request.pyi similarity index 100% rename from third_party/2.7/requests/packages/urllib3/util/request.pyi rename to third_party/2/requests/packages/urllib3/util/request.pyi diff --git a/third_party/2.7/requests/packages/urllib3/util/response.pyi b/third_party/2/requests/packages/urllib3/util/response.pyi similarity index 100% rename from third_party/2.7/requests/packages/urllib3/util/response.pyi rename to third_party/2/requests/packages/urllib3/util/response.pyi diff --git a/third_party/2.7/requests/packages/urllib3/util/retry.pyi b/third_party/2/requests/packages/urllib3/util/retry.pyi similarity index 100% rename from third_party/2.7/requests/packages/urllib3/util/retry.pyi rename to third_party/2/requests/packages/urllib3/util/retry.pyi diff --git a/third_party/2.7/requests/packages/urllib3/util/timeout.pyi b/third_party/2/requests/packages/urllib3/util/timeout.pyi similarity index 100% rename from third_party/2.7/requests/packages/urllib3/util/timeout.pyi rename to third_party/2/requests/packages/urllib3/util/timeout.pyi diff --git a/third_party/2.7/requests/packages/urllib3/util/url.pyi b/third_party/2/requests/packages/urllib3/util/url.pyi similarity index 100% rename from third_party/2.7/requests/packages/urllib3/util/url.pyi rename to third_party/2/requests/packages/urllib3/util/url.pyi diff --git a/third_party/2.7/requests/sessions.pyi b/third_party/2/requests/sessions.pyi similarity index 100% rename from third_party/2.7/requests/sessions.pyi rename to third_party/2/requests/sessions.pyi diff --git a/third_party/2.7/requests/status_codes.pyi b/third_party/2/requests/status_codes.pyi similarity index 100% rename from third_party/2.7/requests/status_codes.pyi rename to third_party/2/requests/status_codes.pyi diff --git a/third_party/2.7/requests/structures.pyi b/third_party/2/requests/structures.pyi similarity index 100% rename from third_party/2.7/requests/structures.pyi rename to third_party/2/requests/structures.pyi diff --git a/third_party/2.7/requests/utils.pyi b/third_party/2/requests/utils.pyi similarity index 100% rename from third_party/2.7/requests/utils.pyi rename to third_party/2/requests/utils.pyi diff --git a/third_party/2.7/routes/__init__.pyi b/third_party/2/routes/__init__.pyi similarity index 100% rename from third_party/2.7/routes/__init__.pyi rename to third_party/2/routes/__init__.pyi diff --git a/third_party/2.7/routes/mapper.pyi b/third_party/2/routes/mapper.pyi similarity index 100% rename from third_party/2.7/routes/mapper.pyi rename to third_party/2/routes/mapper.pyi diff --git a/third_party/2.7/routes/util.pyi b/third_party/2/routes/util.pyi similarity index 100% rename from third_party/2.7/routes/util.pyi rename to third_party/2/routes/util.pyi diff --git a/third_party/2.7/scribe/__init__.pyi b/third_party/2/scribe/__init__.pyi similarity index 100% rename from third_party/2.7/scribe/__init__.pyi rename to third_party/2/scribe/__init__.pyi diff --git a/third_party/2.7/scribe/scribe.pyi b/third_party/2/scribe/scribe.pyi similarity index 100% rename from third_party/2.7/scribe/scribe.pyi rename to third_party/2/scribe/scribe.pyi diff --git a/third_party/2.7/scribe/ttypes.pyi b/third_party/2/scribe/ttypes.pyi similarity index 100% rename from third_party/2.7/scribe/ttypes.pyi rename to third_party/2/scribe/ttypes.pyi diff --git a/third_party/2.7/selenium/webdriver/remote/webdriver.pyi b/third_party/2/selenium/webdriver/remote/webdriver.pyi similarity index 100% rename from third_party/2.7/selenium/webdriver/remote/webdriver.pyi rename to third_party/2/selenium/webdriver/remote/webdriver.pyi diff --git a/third_party/2.7/selenium/webdriver/remote/webelement.pyi b/third_party/2/selenium/webdriver/remote/webelement.pyi similarity index 100% rename from third_party/2.7/selenium/webdriver/remote/webelement.pyi rename to third_party/2/selenium/webdriver/remote/webelement.pyi diff --git a/third_party/2.7/six/__init__.pyi b/third_party/2/six/__init__.pyi similarity index 100% rename from third_party/2.7/six/__init__.pyi rename to third_party/2/six/__init__.pyi diff --git a/third_party/2.7/six/moves/__init__.pyi b/third_party/2/six/moves/__init__.pyi similarity index 100% rename from third_party/2.7/six/moves/__init__.pyi rename to third_party/2/six/moves/__init__.pyi diff --git a/third_party/2.7/six/moves/cPickle.pyi b/third_party/2/six/moves/cPickle.pyi similarity index 100% rename from third_party/2.7/six/moves/cPickle.pyi rename to third_party/2/six/moves/cPickle.pyi diff --git a/third_party/2.7/six/moves/urllib/__init__.pyi b/third_party/2/six/moves/urllib/__init__.pyi similarity index 100% rename from third_party/2.7/six/moves/urllib/__init__.pyi rename to third_party/2/six/moves/urllib/__init__.pyi diff --git a/third_party/2.7/six/moves/urllib/error.pyi b/third_party/2/six/moves/urllib/error.pyi similarity index 100% rename from third_party/2.7/six/moves/urllib/error.pyi rename to third_party/2/six/moves/urllib/error.pyi diff --git a/third_party/2.7/six/moves/urllib/parse.pyi b/third_party/2/six/moves/urllib/parse.pyi similarity index 100% rename from third_party/2.7/six/moves/urllib/parse.pyi rename to third_party/2/six/moves/urllib/parse.pyi diff --git a/third_party/2.7/six/moves/urllib/request.pyi b/third_party/2/six/moves/urllib/request.pyi similarity index 100% rename from third_party/2.7/six/moves/urllib/request.pyi rename to third_party/2/six/moves/urllib/request.pyi diff --git a/third_party/2.7/six/moves/urllib/response.pyi b/third_party/2/six/moves/urllib/response.pyi similarity index 100% rename from third_party/2.7/six/moves/urllib/response.pyi rename to third_party/2/six/moves/urllib/response.pyi diff --git a/third_party/2.7/six/moves/urllib/robotparser.pyi b/third_party/2/six/moves/urllib/robotparser.pyi similarity index 100% rename from third_party/2.7/six/moves/urllib/robotparser.pyi rename to third_party/2/six/moves/urllib/robotparser.pyi diff --git a/third_party/2.7/six/moves/urllib_error.pyi b/third_party/2/six/moves/urllib_error.pyi similarity index 100% rename from third_party/2.7/six/moves/urllib_error.pyi rename to third_party/2/six/moves/urllib_error.pyi diff --git a/third_party/2.7/six/moves/urllib_parse.pyi b/third_party/2/six/moves/urllib_parse.pyi similarity index 100% rename from third_party/2.7/six/moves/urllib_parse.pyi rename to third_party/2/six/moves/urllib_parse.pyi diff --git a/third_party/2.7/six/moves/urllib_request.pyi b/third_party/2/six/moves/urllib_request.pyi similarity index 100% rename from third_party/2.7/six/moves/urllib_request.pyi rename to third_party/2/six/moves/urllib_request.pyi diff --git a/third_party/2.7/six/moves/urllib_response.pyi b/third_party/2/six/moves/urllib_response.pyi similarity index 100% rename from third_party/2.7/six/moves/urllib_response.pyi rename to third_party/2/six/moves/urllib_response.pyi diff --git a/third_party/2.7/six/moves/urllib_robotparser.pyi b/third_party/2/six/moves/urllib_robotparser.pyi similarity index 100% rename from third_party/2.7/six/moves/urllib_robotparser.pyi rename to third_party/2/six/moves/urllib_robotparser.pyi diff --git a/third_party/2.7/sqlalchemy/__init__.pyi b/third_party/2/sqlalchemy/__init__.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/__init__.pyi rename to third_party/2/sqlalchemy/__init__.pyi diff --git a/third_party/2.7/sqlalchemy/databases/__init__.pyi b/third_party/2/sqlalchemy/databases/__init__.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/databases/__init__.pyi rename to third_party/2/sqlalchemy/databases/__init__.pyi diff --git a/third_party/2.7/sqlalchemy/databases/mysql.pyi b/third_party/2/sqlalchemy/databases/mysql.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/databases/mysql.pyi rename to third_party/2/sqlalchemy/databases/mysql.pyi diff --git a/third_party/2.7/sqlalchemy/dialects/__init__.pyi b/third_party/2/sqlalchemy/dialects/__init__.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/dialects/__init__.pyi rename to third_party/2/sqlalchemy/dialects/__init__.pyi diff --git a/third_party/2.7/sqlalchemy/dialects/mysql/__init__.pyi b/third_party/2/sqlalchemy/dialects/mysql/__init__.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/dialects/mysql/__init__.pyi rename to third_party/2/sqlalchemy/dialects/mysql/__init__.pyi diff --git a/third_party/2.7/sqlalchemy/dialects/mysql/base.pyi b/third_party/2/sqlalchemy/dialects/mysql/base.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/dialects/mysql/base.pyi rename to third_party/2/sqlalchemy/dialects/mysql/base.pyi diff --git a/third_party/2.7/sqlalchemy/engine/__init__.pyi b/third_party/2/sqlalchemy/engine/__init__.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/engine/__init__.pyi rename to third_party/2/sqlalchemy/engine/__init__.pyi diff --git a/third_party/2.7/sqlalchemy/engine/base.pyi b/third_party/2/sqlalchemy/engine/base.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/engine/base.pyi rename to third_party/2/sqlalchemy/engine/base.pyi diff --git a/third_party/2.7/sqlalchemy/engine/strategies.pyi b/third_party/2/sqlalchemy/engine/strategies.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/engine/strategies.pyi rename to third_party/2/sqlalchemy/engine/strategies.pyi diff --git a/third_party/2.7/sqlalchemy/engine/url.pyi b/third_party/2/sqlalchemy/engine/url.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/engine/url.pyi rename to third_party/2/sqlalchemy/engine/url.pyi diff --git a/third_party/2.7/sqlalchemy/exc.pyi b/third_party/2/sqlalchemy/exc.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/exc.pyi rename to third_party/2/sqlalchemy/exc.pyi diff --git a/third_party/2.7/sqlalchemy/inspection.pyi b/third_party/2/sqlalchemy/inspection.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/inspection.pyi rename to third_party/2/sqlalchemy/inspection.pyi diff --git a/third_party/2.7/sqlalchemy/log.pyi b/third_party/2/sqlalchemy/log.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/log.pyi rename to third_party/2/sqlalchemy/log.pyi diff --git a/third_party/2.7/sqlalchemy/orm/__init__.pyi b/third_party/2/sqlalchemy/orm/__init__.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/orm/__init__.pyi rename to third_party/2/sqlalchemy/orm/__init__.pyi diff --git a/third_party/2.7/sqlalchemy/orm/session.pyi b/third_party/2/sqlalchemy/orm/session.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/orm/session.pyi rename to third_party/2/sqlalchemy/orm/session.pyi diff --git a/third_party/2.7/sqlalchemy/pool.pyi b/third_party/2/sqlalchemy/pool.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/pool.pyi rename to third_party/2/sqlalchemy/pool.pyi diff --git a/third_party/2.7/sqlalchemy/schema.pyi b/third_party/2/sqlalchemy/schema.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/schema.pyi rename to third_party/2/sqlalchemy/schema.pyi diff --git a/third_party/2.7/sqlalchemy/sql/__init__.pyi b/third_party/2/sqlalchemy/sql/__init__.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/sql/__init__.pyi rename to third_party/2/sqlalchemy/sql/__init__.pyi diff --git a/third_party/2.7/sqlalchemy/sql/annotation.pyi b/third_party/2/sqlalchemy/sql/annotation.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/sql/annotation.pyi rename to third_party/2/sqlalchemy/sql/annotation.pyi diff --git a/third_party/2.7/sqlalchemy/sql/base.pyi b/third_party/2/sqlalchemy/sql/base.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/sql/base.pyi rename to third_party/2/sqlalchemy/sql/base.pyi diff --git a/third_party/2.7/sqlalchemy/sql/ddl.pyi b/third_party/2/sqlalchemy/sql/ddl.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/sql/ddl.pyi rename to third_party/2/sqlalchemy/sql/ddl.pyi diff --git a/third_party/2.7/sqlalchemy/sql/dml.pyi b/third_party/2/sqlalchemy/sql/dml.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/sql/dml.pyi rename to third_party/2/sqlalchemy/sql/dml.pyi diff --git a/third_party/2.7/sqlalchemy/sql/elements.pyi b/third_party/2/sqlalchemy/sql/elements.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/sql/elements.pyi rename to third_party/2/sqlalchemy/sql/elements.pyi diff --git a/third_party/2.7/sqlalchemy/sql/expression.pyi b/third_party/2/sqlalchemy/sql/expression.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/sql/expression.pyi rename to third_party/2/sqlalchemy/sql/expression.pyi diff --git a/third_party/2.7/sqlalchemy/sql/functions.pyi b/third_party/2/sqlalchemy/sql/functions.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/sql/functions.pyi rename to third_party/2/sqlalchemy/sql/functions.pyi diff --git a/third_party/2.7/sqlalchemy/sql/naming.pyi b/third_party/2/sqlalchemy/sql/naming.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/sql/naming.pyi rename to third_party/2/sqlalchemy/sql/naming.pyi diff --git a/third_party/2.7/sqlalchemy/sql/operators.pyi b/third_party/2/sqlalchemy/sql/operators.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/sql/operators.pyi rename to third_party/2/sqlalchemy/sql/operators.pyi diff --git a/third_party/2.7/sqlalchemy/sql/schema.pyi b/third_party/2/sqlalchemy/sql/schema.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/sql/schema.pyi rename to third_party/2/sqlalchemy/sql/schema.pyi diff --git a/third_party/2.7/sqlalchemy/sql/selectable.pyi b/third_party/2/sqlalchemy/sql/selectable.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/sql/selectable.pyi rename to third_party/2/sqlalchemy/sql/selectable.pyi diff --git a/third_party/2.7/sqlalchemy/sql/sqltypes.pyi b/third_party/2/sqlalchemy/sql/sqltypes.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/sql/sqltypes.pyi rename to third_party/2/sqlalchemy/sql/sqltypes.pyi diff --git a/third_party/2.7/sqlalchemy/sql/type_api.pyi b/third_party/2/sqlalchemy/sql/type_api.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/sql/type_api.pyi rename to third_party/2/sqlalchemy/sql/type_api.pyi diff --git a/third_party/2.7/sqlalchemy/sql/visitors.pyi b/third_party/2/sqlalchemy/sql/visitors.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/sql/visitors.pyi rename to third_party/2/sqlalchemy/sql/visitors.pyi diff --git a/third_party/2.7/sqlalchemy/types.pyi b/third_party/2/sqlalchemy/types.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/types.pyi rename to third_party/2/sqlalchemy/types.pyi diff --git a/third_party/2.7/sqlalchemy/util/__init__.pyi b/third_party/2/sqlalchemy/util/__init__.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/util/__init__.pyi rename to third_party/2/sqlalchemy/util/__init__.pyi diff --git a/third_party/2.7/sqlalchemy/util/_collections.pyi b/third_party/2/sqlalchemy/util/_collections.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/util/_collections.pyi rename to third_party/2/sqlalchemy/util/_collections.pyi diff --git a/third_party/2.7/sqlalchemy/util/compat.pyi b/third_party/2/sqlalchemy/util/compat.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/util/compat.pyi rename to third_party/2/sqlalchemy/util/compat.pyi diff --git a/third_party/2.7/sqlalchemy/util/deprecations.pyi b/third_party/2/sqlalchemy/util/deprecations.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/util/deprecations.pyi rename to third_party/2/sqlalchemy/util/deprecations.pyi diff --git a/third_party/2.7/sqlalchemy/util/langhelpers.pyi b/third_party/2/sqlalchemy/util/langhelpers.pyi similarity index 100% rename from third_party/2.7/sqlalchemy/util/langhelpers.pyi rename to third_party/2/sqlalchemy/util/langhelpers.pyi diff --git a/third_party/2.7/thrift/Thrift.pyi b/third_party/2/thrift/Thrift.pyi similarity index 100% rename from third_party/2.7/thrift/Thrift.pyi rename to third_party/2/thrift/Thrift.pyi diff --git a/third_party/2.7/thrift/__init__.pyi b/third_party/2/thrift/__init__.pyi similarity index 100% rename from third_party/2.7/thrift/__init__.pyi rename to third_party/2/thrift/__init__.pyi diff --git a/third_party/2.7/thrift/protocol/TBinaryProtocol.pyi b/third_party/2/thrift/protocol/TBinaryProtocol.pyi similarity index 100% rename from third_party/2.7/thrift/protocol/TBinaryProtocol.pyi rename to third_party/2/thrift/protocol/TBinaryProtocol.pyi diff --git a/third_party/2.7/thrift/protocol/TProtocol.pyi b/third_party/2/thrift/protocol/TProtocol.pyi similarity index 100% rename from third_party/2.7/thrift/protocol/TProtocol.pyi rename to third_party/2/thrift/protocol/TProtocol.pyi diff --git a/third_party/2.7/thrift/protocol/__init__.pyi b/third_party/2/thrift/protocol/__init__.pyi similarity index 100% rename from third_party/2.7/thrift/protocol/__init__.pyi rename to third_party/2/thrift/protocol/__init__.pyi diff --git a/third_party/2.7/thrift/transport/TSocket.pyi b/third_party/2/thrift/transport/TSocket.pyi similarity index 100% rename from third_party/2.7/thrift/transport/TSocket.pyi rename to third_party/2/thrift/transport/TSocket.pyi diff --git a/third_party/2.7/thrift/transport/TTransport.pyi b/third_party/2/thrift/transport/TTransport.pyi similarity index 100% rename from third_party/2.7/thrift/transport/TTransport.pyi rename to third_party/2/thrift/transport/TTransport.pyi diff --git a/third_party/2.7/thrift/transport/__init__.pyi b/third_party/2/thrift/transport/__init__.pyi similarity index 100% rename from third_party/2.7/thrift/transport/__init__.pyi rename to third_party/2/thrift/transport/__init__.pyi diff --git a/third_party/2.7/tornado/__init__.pyi b/third_party/2/tornado/__init__.pyi similarity index 100% rename from third_party/2.7/tornado/__init__.pyi rename to third_party/2/tornado/__init__.pyi diff --git a/third_party/2.7/tornado/concurrent.pyi b/third_party/2/tornado/concurrent.pyi similarity index 100% rename from third_party/2.7/tornado/concurrent.pyi rename to third_party/2/tornado/concurrent.pyi diff --git a/third_party/2.7/tornado/gen.pyi b/third_party/2/tornado/gen.pyi similarity index 100% rename from third_party/2.7/tornado/gen.pyi rename to third_party/2/tornado/gen.pyi diff --git a/third_party/2.7/tornado/httpclient.pyi b/third_party/2/tornado/httpclient.pyi similarity index 100% rename from third_party/2.7/tornado/httpclient.pyi rename to third_party/2/tornado/httpclient.pyi diff --git a/third_party/2.7/tornado/httpserver.pyi b/third_party/2/tornado/httpserver.pyi similarity index 100% rename from third_party/2.7/tornado/httpserver.pyi rename to third_party/2/tornado/httpserver.pyi diff --git a/third_party/2.7/tornado/httputil.pyi b/third_party/2/tornado/httputil.pyi similarity index 100% rename from third_party/2.7/tornado/httputil.pyi rename to third_party/2/tornado/httputil.pyi diff --git a/third_party/2.7/tornado/ioloop.pyi b/third_party/2/tornado/ioloop.pyi similarity index 100% rename from third_party/2.7/tornado/ioloop.pyi rename to third_party/2/tornado/ioloop.pyi diff --git a/third_party/2.7/tornado/locks.pyi b/third_party/2/tornado/locks.pyi similarity index 100% rename from third_party/2.7/tornado/locks.pyi rename to third_party/2/tornado/locks.pyi diff --git a/third_party/2.7/tornado/netutil.pyi b/third_party/2/tornado/netutil.pyi similarity index 100% rename from third_party/2.7/tornado/netutil.pyi rename to third_party/2/tornado/netutil.pyi diff --git a/third_party/2.7/tornado/tcpserver.pyi b/third_party/2/tornado/tcpserver.pyi similarity index 100% rename from third_party/2.7/tornado/tcpserver.pyi rename to third_party/2/tornado/tcpserver.pyi diff --git a/third_party/2.7/tornado/testing.pyi b/third_party/2/tornado/testing.pyi similarity index 100% rename from third_party/2.7/tornado/testing.pyi rename to third_party/2/tornado/testing.pyi diff --git a/third_party/2.7/tornado/util.pyi b/third_party/2/tornado/util.pyi similarity index 100% rename from third_party/2.7/tornado/util.pyi rename to third_party/2/tornado/util.pyi diff --git a/third_party/2.7/tornado/web.pyi b/third_party/2/tornado/web.pyi similarity index 100% rename from third_party/2.7/tornado/web.pyi rename to third_party/2/tornado/web.pyi diff --git a/third_party/2.7/yaml/__init__.pyi b/third_party/2/yaml/__init__.pyi similarity index 100% rename from third_party/2.7/yaml/__init__.pyi rename to third_party/2/yaml/__init__.pyi diff --git a/third_party/2.7/yaml/composer.pyi b/third_party/2/yaml/composer.pyi similarity index 100% rename from third_party/2.7/yaml/composer.pyi rename to third_party/2/yaml/composer.pyi diff --git a/third_party/2.7/yaml/constructor.pyi b/third_party/2/yaml/constructor.pyi similarity index 100% rename from third_party/2.7/yaml/constructor.pyi rename to third_party/2/yaml/constructor.pyi diff --git a/third_party/2.7/yaml/dumper.pyi b/third_party/2/yaml/dumper.pyi similarity index 100% rename from third_party/2.7/yaml/dumper.pyi rename to third_party/2/yaml/dumper.pyi diff --git a/third_party/2.7/yaml/emitter.pyi b/third_party/2/yaml/emitter.pyi similarity index 100% rename from third_party/2.7/yaml/emitter.pyi rename to third_party/2/yaml/emitter.pyi diff --git a/third_party/2.7/yaml/error.pyi b/third_party/2/yaml/error.pyi similarity index 100% rename from third_party/2.7/yaml/error.pyi rename to third_party/2/yaml/error.pyi diff --git a/third_party/2.7/yaml/events.pyi b/third_party/2/yaml/events.pyi similarity index 100% rename from third_party/2.7/yaml/events.pyi rename to third_party/2/yaml/events.pyi diff --git a/third_party/2.7/yaml/loader.pyi b/third_party/2/yaml/loader.pyi similarity index 100% rename from third_party/2.7/yaml/loader.pyi rename to third_party/2/yaml/loader.pyi diff --git a/third_party/2.7/yaml/nodes.pyi b/third_party/2/yaml/nodes.pyi similarity index 100% rename from third_party/2.7/yaml/nodes.pyi rename to third_party/2/yaml/nodes.pyi diff --git a/third_party/2.7/yaml/parser.pyi b/third_party/2/yaml/parser.pyi similarity index 100% rename from third_party/2.7/yaml/parser.pyi rename to third_party/2/yaml/parser.pyi diff --git a/third_party/2.7/yaml/reader.pyi b/third_party/2/yaml/reader.pyi similarity index 100% rename from third_party/2.7/yaml/reader.pyi rename to third_party/2/yaml/reader.pyi diff --git a/third_party/2.7/yaml/representer.pyi b/third_party/2/yaml/representer.pyi similarity index 100% rename from third_party/2.7/yaml/representer.pyi rename to third_party/2/yaml/representer.pyi diff --git a/third_party/2.7/yaml/resolver.pyi b/third_party/2/yaml/resolver.pyi similarity index 100% rename from third_party/2.7/yaml/resolver.pyi rename to third_party/2/yaml/resolver.pyi diff --git a/third_party/2.7/yaml/scanner.pyi b/third_party/2/yaml/scanner.pyi similarity index 100% rename from third_party/2.7/yaml/scanner.pyi rename to third_party/2/yaml/scanner.pyi diff --git a/third_party/2.7/yaml/serializer.pyi b/third_party/2/yaml/serializer.pyi similarity index 100% rename from third_party/2.7/yaml/serializer.pyi rename to third_party/2/yaml/serializer.pyi diff --git a/third_party/2.7/yaml/tokens.pyi b/third_party/2/yaml/tokens.pyi similarity index 100% rename from third_party/2.7/yaml/tokens.pyi rename to third_party/2/yaml/tokens.pyi