diff --git a/builtins/2.7/__builtin__.pyi b/stdlib/2.7/__builtin__.pyi
similarity index 100%
rename from builtins/2.7/__builtin__.pyi
rename to stdlib/2.7/__builtin__.pyi
diff --git a/builtins/2.7/_ast.pyi b/stdlib/2.7/_ast.pyi
similarity index 100%
rename from builtins/2.7/_ast.pyi
rename to stdlib/2.7/_ast.pyi
diff --git a/builtins/2.7/_codecs.pyi b/stdlib/2.7/_codecs.pyi
similarity index 100%
rename from builtins/2.7/_codecs.pyi
rename to stdlib/2.7/_codecs.pyi
diff --git a/builtins/2.7/_collections.pyi b/stdlib/2.7/_collections.pyi
similarity index 100%
rename from builtins/2.7/_collections.pyi
rename to stdlib/2.7/_collections.pyi
diff --git a/builtins/2.7/_functools.pyi b/stdlib/2.7/_functools.pyi
similarity index 100%
rename from builtins/2.7/_functools.pyi
rename to stdlib/2.7/_functools.pyi
diff --git a/builtins/2.7/_hotshot.pyi b/stdlib/2.7/_hotshot.pyi
similarity index 100%
rename from builtins/2.7/_hotshot.pyi
rename to stdlib/2.7/_hotshot.pyi
diff --git a/builtins/2.7/_io.pyi b/stdlib/2.7/_io.pyi
similarity index 100%
rename from builtins/2.7/_io.pyi
rename to stdlib/2.7/_io.pyi
diff --git a/builtins/2.7/_json.pyi b/stdlib/2.7/_json.pyi
similarity index 100%
rename from builtins/2.7/_json.pyi
rename to stdlib/2.7/_json.pyi
diff --git a/builtins/2.7/_locale.pyi b/stdlib/2.7/_locale.pyi
similarity index 100%
rename from builtins/2.7/_locale.pyi
rename to stdlib/2.7/_locale.pyi
diff --git a/builtins/2.7/_md5.pyi b/stdlib/2.7/_md5.pyi
similarity index 100%
rename from builtins/2.7/_md5.pyi
rename to stdlib/2.7/_md5.pyi
diff --git a/builtins/2.7/_random.pyi b/stdlib/2.7/_random.pyi
similarity index 100%
rename from builtins/2.7/_random.pyi
rename to stdlib/2.7/_random.pyi
diff --git a/builtins/2.7/_sha.pyi b/stdlib/2.7/_sha.pyi
similarity index 100%
rename from builtins/2.7/_sha.pyi
rename to stdlib/2.7/_sha.pyi
diff --git a/builtins/2.7/_sha256.pyi b/stdlib/2.7/_sha256.pyi
similarity index 100%
rename from builtins/2.7/_sha256.pyi
rename to stdlib/2.7/_sha256.pyi
diff --git a/builtins/2.7/_sha512.pyi b/stdlib/2.7/_sha512.pyi
similarity index 100%
rename from builtins/2.7/_sha512.pyi
rename to stdlib/2.7/_sha512.pyi
diff --git a/builtins/2.7/_socket.pyi b/stdlib/2.7/_socket.pyi
similarity index 100%
rename from builtins/2.7/_socket.pyi
rename to stdlib/2.7/_socket.pyi
diff --git a/builtins/2.7/_sre.pyi b/stdlib/2.7/_sre.pyi
similarity index 100%
rename from builtins/2.7/_sre.pyi
rename to stdlib/2.7/_sre.pyi
diff --git a/builtins/2.7/_struct.pyi b/stdlib/2.7/_struct.pyi
similarity index 100%
rename from builtins/2.7/_struct.pyi
rename to stdlib/2.7/_struct.pyi
diff --git a/builtins/2.7/_symtable.pyi b/stdlib/2.7/_symtable.pyi
similarity index 100%
rename from builtins/2.7/_symtable.pyi
rename to stdlib/2.7/_symtable.pyi
diff --git a/builtins/2.7/_warnings.pyi b/stdlib/2.7/_warnings.pyi
similarity index 100%
rename from builtins/2.7/_warnings.pyi
rename to stdlib/2.7/_warnings.pyi
diff --git a/builtins/2.7/_weakref.pyi b/stdlib/2.7/_weakref.pyi
similarity index 100%
rename from builtins/2.7/_weakref.pyi
rename to stdlib/2.7/_weakref.pyi
diff --git a/builtins/2.7/_weakrefset.pyi b/stdlib/2.7/_weakrefset.pyi
similarity index 100%
rename from builtins/2.7/_weakrefset.pyi
rename to stdlib/2.7/_weakrefset.pyi
diff --git a/builtins/2.7/array.pyi b/stdlib/2.7/array.pyi
similarity index 100%
rename from builtins/2.7/array.pyi
rename to stdlib/2.7/array.pyi
diff --git a/builtins/2.7/binascii.pyi b/stdlib/2.7/binascii.pyi
similarity index 100%
rename from builtins/2.7/binascii.pyi
rename to stdlib/2.7/binascii.pyi
diff --git a/builtins/2.7/builtins.pyi b/stdlib/2.7/builtins.pyi
similarity index 100%
rename from builtins/2.7/builtins.pyi
rename to stdlib/2.7/builtins.pyi
diff --git a/builtins/2.7/cPickle.pyi b/stdlib/2.7/cPickle.pyi
similarity index 100%
rename from builtins/2.7/cPickle.pyi
rename to stdlib/2.7/cPickle.pyi
diff --git a/builtins/2.7/cStringIO.pyi b/stdlib/2.7/cStringIO.pyi
similarity index 100%
rename from builtins/2.7/cStringIO.pyi
rename to stdlib/2.7/cStringIO.pyi
diff --git a/builtins/2.7/datetime.pyi b/stdlib/2.7/datetime.pyi
similarity index 100%
rename from builtins/2.7/datetime.pyi
rename to stdlib/2.7/datetime.pyi
diff --git a/builtins/2.7/errno.pyi b/stdlib/2.7/errno.pyi
similarity index 100%
rename from builtins/2.7/errno.pyi
rename to stdlib/2.7/errno.pyi
diff --git a/builtins/2.7/exceptions.pyi b/stdlib/2.7/exceptions.pyi
similarity index 100%
rename from builtins/2.7/exceptions.pyi
rename to stdlib/2.7/exceptions.pyi
diff --git a/builtins/2.7/fcntl.pyi b/stdlib/2.7/fcntl.pyi
similarity index 100%
rename from builtins/2.7/fcntl.pyi
rename to stdlib/2.7/fcntl.pyi
diff --git a/builtins/2.7/gc.pyi b/stdlib/2.7/gc.pyi
similarity index 100%
rename from builtins/2.7/gc.pyi
rename to stdlib/2.7/gc.pyi
diff --git a/builtins/2.7/grp.pyi b/stdlib/2.7/grp.pyi
similarity index 100%
rename from builtins/2.7/grp.pyi
rename to stdlib/2.7/grp.pyi
diff --git a/builtins/2.7/imp.pyi b/stdlib/2.7/imp.pyi
similarity index 100%
rename from builtins/2.7/imp.pyi
rename to stdlib/2.7/imp.pyi
diff --git a/builtins/2.7/itertools.pyi b/stdlib/2.7/itertools.pyi
similarity index 100%
rename from builtins/2.7/itertools.pyi
rename to stdlib/2.7/itertools.pyi
diff --git a/builtins/2.7/posix.pyi b/stdlib/2.7/posix.pyi
similarity index 100%
rename from builtins/2.7/posix.pyi
rename to stdlib/2.7/posix.pyi
diff --git a/builtins/2.7/pwd.pyi b/stdlib/2.7/pwd.pyi
similarity index 100%
rename from builtins/2.7/pwd.pyi
rename to stdlib/2.7/pwd.pyi
diff --git a/builtins/2.7/resource.pyi b/stdlib/2.7/resource.pyi
similarity index 100%
rename from builtins/2.7/resource.pyi
rename to stdlib/2.7/resource.pyi
diff --git a/builtins/2.7/select.pyi b/stdlib/2.7/select.pyi
similarity index 100%
rename from builtins/2.7/select.pyi
rename to stdlib/2.7/select.pyi
diff --git a/builtins/2.7/signal.pyi b/stdlib/2.7/signal.pyi
similarity index 100%
rename from builtins/2.7/signal.pyi
rename to stdlib/2.7/signal.pyi
diff --git a/builtins/2.7/spwd.pyi b/stdlib/2.7/spwd.pyi
similarity index 100%
rename from builtins/2.7/spwd.pyi
rename to stdlib/2.7/spwd.pyi
diff --git a/builtins/2.7/strop.pyi b/stdlib/2.7/strop.pyi
similarity index 100%
rename from builtins/2.7/strop.pyi
rename to stdlib/2.7/strop.pyi
diff --git a/builtins/2.7/sys.pyi b/stdlib/2.7/sys.pyi
similarity index 100%
rename from builtins/2.7/sys.pyi
rename to stdlib/2.7/sys.pyi
diff --git a/builtins/2.7/syslog.pyi b/stdlib/2.7/syslog.pyi
similarity index 100%
rename from builtins/2.7/syslog.pyi
rename to stdlib/2.7/syslog.pyi
diff --git a/builtins/2.7/thread.pyi b/stdlib/2.7/thread.pyi
similarity index 100%
rename from builtins/2.7/thread.pyi
rename to stdlib/2.7/thread.pyi
diff --git a/builtins/2.7/time.pyi b/stdlib/2.7/time.pyi
similarity index 100%
rename from builtins/2.7/time.pyi
rename to stdlib/2.7/time.pyi
diff --git a/builtins/2.7/unicodedata.pyi b/stdlib/2.7/unicodedata.pyi
similarity index 100%
rename from builtins/2.7/unicodedata.pyi
rename to stdlib/2.7/unicodedata.pyi
diff --git a/builtins/2.7/xxsubtype.pyi b/stdlib/2.7/xxsubtype.pyi
similarity index 100%
rename from builtins/2.7/xxsubtype.pyi
rename to stdlib/2.7/xxsubtype.pyi
diff --git a/builtins/2.7/zipimport.pyi b/stdlib/2.7/zipimport.pyi
similarity index 100%
rename from builtins/2.7/zipimport.pyi
rename to stdlib/2.7/zipimport.pyi
diff --git a/builtins/2.7/zlib.pyi b/stdlib/2.7/zlib.pyi
similarity index 100%
rename from builtins/2.7/zlib.pyi
rename to stdlib/2.7/zlib.pyi
diff --git a/builtins/2and3/_bisect.pyi b/stdlib/2and3/_bisect.pyi
similarity index 100%
rename from builtins/2and3/_bisect.pyi
rename to stdlib/2and3/_bisect.pyi
diff --git a/builtins/2and3/_heapq.pyi b/stdlib/2and3/_heapq.pyi
similarity index 100%
rename from builtins/2and3/_heapq.pyi
rename to stdlib/2and3/_heapq.pyi
diff --git a/builtins/2and3/cmath.pyi b/stdlib/2and3/cmath.pyi
similarity index 100%
rename from builtins/2and3/cmath.pyi
rename to stdlib/2and3/cmath.pyi
diff --git a/builtins/2and3/marshal.pyi b/stdlib/2and3/marshal.pyi
similarity index 100%
rename from builtins/2and3/marshal.pyi
rename to stdlib/2and3/marshal.pyi
diff --git a/builtins/2and3/math.pyi b/stdlib/2and3/math.pyi
similarity index 100%
rename from builtins/2and3/math.pyi
rename to stdlib/2and3/math.pyi
diff --git a/builtins/2and3/operator.pyi b/stdlib/2and3/operator.pyi
similarity index 100%
rename from builtins/2and3/operator.pyi
rename to stdlib/2and3/operator.pyi
diff --git a/builtins/3.4/_operator.pyi b/stdlib/3.4/_operator.pyi
similarity index 100%
rename from builtins/3.4/_operator.pyi
rename to stdlib/3.4/_operator.pyi
diff --git a/builtins/3.4/_stat.pyi b/stdlib/3.4/_stat.pyi
similarity index 100%
rename from builtins/3.4/_stat.pyi
rename to stdlib/3.4/_stat.pyi
diff --git a/builtins/3.4/_tracemalloc.pyi b/stdlib/3.4/_tracemalloc.pyi
similarity index 100%
rename from builtins/3.4/_tracemalloc.pyi
rename to stdlib/3.4/_tracemalloc.pyi
diff --git a/builtins/3/_codecs.pyi b/stdlib/3/_codecs.pyi
similarity index 100%
rename from builtins/3/_codecs.pyi
rename to stdlib/3/_codecs.pyi
diff --git a/builtins/3/_io.pyi b/stdlib/3/_io.pyi
similarity index 100%
rename from builtins/3/_io.pyi
rename to stdlib/3/_io.pyi
diff --git a/builtins/3/_json.pyi b/stdlib/3/_json.pyi
similarity index 100%
rename from builtins/3/_json.pyi
rename to stdlib/3/_json.pyi
diff --git a/builtins/3/_locale.pyi b/stdlib/3/_locale.pyi
similarity index 100%
rename from builtins/3/_locale.pyi
rename to stdlib/3/_locale.pyi
diff --git a/builtins/3/_random.pyi b/stdlib/3/_random.pyi
similarity index 100%
rename from builtins/3/_random.pyi
rename to stdlib/3/_random.pyi
diff --git a/builtins/3/_warnings.pyi b/stdlib/3/_warnings.pyi
similarity index 100%
rename from builtins/3/_warnings.pyi
rename to stdlib/3/_warnings.pyi
diff --git a/builtins/3/array.pyi b/stdlib/3/array.pyi
similarity index 100%
rename from builtins/3/array.pyi
rename to stdlib/3/array.pyi
diff --git a/builtins/3/atexit.pyi b/stdlib/3/atexit.pyi
similarity index 100%
rename from builtins/3/atexit.pyi
rename to stdlib/3/atexit.pyi
diff --git a/builtins/3/binascii.pyi b/stdlib/3/binascii.pyi
similarity index 100%
rename from builtins/3/binascii.pyi
rename to stdlib/3/binascii.pyi
diff --git a/builtins/3/builtins.pyi b/stdlib/3/builtins.pyi
similarity index 100%
rename from builtins/3/builtins.pyi
rename to stdlib/3/builtins.pyi
diff --git a/builtins/3/bz2.pyi b/stdlib/3/bz2.pyi
similarity index 100%
rename from builtins/3/bz2.pyi
rename to stdlib/3/bz2.pyi
diff --git a/builtins/3/datetime.pyi b/stdlib/3/datetime.pyi
similarity index 100%
rename from builtins/3/datetime.pyi
rename to stdlib/3/datetime.pyi
diff --git a/builtins/3/errno.pyi b/stdlib/3/errno.pyi
similarity index 100%
rename from builtins/3/errno.pyi
rename to stdlib/3/errno.pyi
diff --git a/builtins/3/fcntl.pyi b/stdlib/3/fcntl.pyi
similarity index 100%
rename from builtins/3/fcntl.pyi
rename to stdlib/3/fcntl.pyi
diff --git a/builtins/3/gc.pyi b/stdlib/3/gc.pyi
similarity index 100%
rename from builtins/3/gc.pyi
rename to stdlib/3/gc.pyi
diff --git a/builtins/3/grp.pyi b/stdlib/3/grp.pyi
similarity index 100%
rename from builtins/3/grp.pyi
rename to stdlib/3/grp.pyi
diff --git a/builtins/3/imp.pyi b/stdlib/3/imp.pyi
similarity index 100%
rename from builtins/3/imp.pyi
rename to stdlib/3/imp.pyi
diff --git a/builtins/3/itertools.pyi b/stdlib/3/itertools.pyi
similarity index 100%
rename from builtins/3/itertools.pyi
rename to stdlib/3/itertools.pyi
diff --git a/builtins/3/posix.pyi b/stdlib/3/posix.pyi
similarity index 100%
rename from builtins/3/posix.pyi
rename to stdlib/3/posix.pyi
diff --git a/builtins/3/pwd.pyi b/stdlib/3/pwd.pyi
similarity index 100%
rename from builtins/3/pwd.pyi
rename to stdlib/3/pwd.pyi
diff --git a/builtins/3/resource.pyi b/stdlib/3/resource.pyi
similarity index 100%
rename from builtins/3/resource.pyi
rename to stdlib/3/resource.pyi
diff --git a/builtins/3/select.pyi b/stdlib/3/select.pyi
similarity index 100%
rename from builtins/3/select.pyi
rename to stdlib/3/select.pyi
diff --git a/builtins/3/signal.pyi b/stdlib/3/signal.pyi
similarity index 100%
rename from builtins/3/signal.pyi
rename to stdlib/3/signal.pyi
diff --git a/builtins/3/sys.pyi b/stdlib/3/sys.pyi
similarity index 100%
rename from builtins/3/sys.pyi
rename to stdlib/3/sys.pyi
diff --git a/builtins/3/time.pyi b/stdlib/3/time.pyi
similarity index 100%
rename from builtins/3/time.pyi
rename to stdlib/3/time.pyi
diff --git a/builtins/3/unicodedata.pyi b/stdlib/3/unicodedata.pyi
similarity index 100%
rename from builtins/3/unicodedata.pyi
rename to stdlib/3/unicodedata.pyi
diff --git a/builtins/3/zlib.pyi b/stdlib/3/zlib.pyi
similarity index 100%
rename from builtins/3/zlib.pyi
rename to stdlib/3/zlib.pyi