diff --git a/test.support/metadata.txt b/micropython/test.support/metadata.txt
similarity index 100%
rename from test.support/metadata.txt
rename to micropython/test.support/metadata.txt
diff --git a/test.support/setup.py b/micropython/test.support/setup.py
similarity index 100%
rename from test.support/setup.py
rename to micropython/test.support/setup.py
diff --git a/test.support/test/support.py b/micropython/test.support/test/support.py
similarity index 100%
rename from test.support/test/support.py
rename to micropython/test.support/test/support.py
diff --git a/uaiohttpclient/README b/micropython/uaiohttpclient/README
similarity index 100%
rename from uaiohttpclient/README
rename to micropython/uaiohttpclient/README
diff --git a/uaiohttpclient/example.py b/micropython/uaiohttpclient/example.py
similarity index 100%
rename from uaiohttpclient/example.py
rename to micropython/uaiohttpclient/example.py
diff --git a/uaiohttpclient/metadata.txt b/micropython/uaiohttpclient/metadata.txt
similarity index 100%
rename from uaiohttpclient/metadata.txt
rename to micropython/uaiohttpclient/metadata.txt
diff --git a/uaiohttpclient/setup.py b/micropython/uaiohttpclient/setup.py
similarity index 100%
rename from uaiohttpclient/setup.py
rename to micropython/uaiohttpclient/setup.py
diff --git a/uaiohttpclient/uaiohttpclient.py b/micropython/uaiohttpclient/uaiohttpclient.py
similarity index 100%
rename from uaiohttpclient/uaiohttpclient.py
rename to micropython/uaiohttpclient/uaiohttpclient.py
diff --git a/uasyncio.core/example_call_soon.py b/micropython/uasyncio.core/example_call_soon.py
similarity index 100%
rename from uasyncio.core/example_call_soon.py
rename to micropython/uasyncio.core/example_call_soon.py
diff --git a/uasyncio.core/metadata.txt b/micropython/uasyncio.core/metadata.txt
similarity index 100%
rename from uasyncio.core/metadata.txt
rename to micropython/uasyncio.core/metadata.txt
diff --git a/uasyncio.core/setup.py b/micropython/uasyncio.core/setup.py
similarity index 100%
rename from uasyncio.core/setup.py
rename to micropython/uasyncio.core/setup.py
diff --git a/uasyncio.core/test_cancel.py b/micropython/uasyncio.core/test_cancel.py
similarity index 100%
rename from uasyncio.core/test_cancel.py
rename to micropython/uasyncio.core/test_cancel.py
diff --git a/uasyncio.core/test_cb_args.py b/micropython/uasyncio.core/test_cb_args.py
similarity index 100%
rename from uasyncio.core/test_cb_args.py
rename to micropython/uasyncio.core/test_cb_args.py
diff --git a/uasyncio.core/test_fair_schedule.py b/micropython/uasyncio.core/test_fair_schedule.py
similarity index 100%
rename from uasyncio.core/test_fair_schedule.py
rename to micropython/uasyncio.core/test_fair_schedule.py
diff --git a/uasyncio.core/test_full_wait.py b/micropython/uasyncio.core/test_full_wait.py
similarity index 100%
rename from uasyncio.core/test_full_wait.py
rename to micropython/uasyncio.core/test_full_wait.py
diff --git a/uasyncio.core/test_wait_for.py b/micropython/uasyncio.core/test_wait_for.py
similarity index 100%
rename from uasyncio.core/test_wait_for.py
rename to micropython/uasyncio.core/test_wait_for.py
diff --git a/uasyncio.core/uasyncio/core.py b/micropython/uasyncio.core/uasyncio/core.py
similarity index 100%
rename from uasyncio.core/uasyncio/core.py
rename to micropython/uasyncio.core/uasyncio/core.py
diff --git a/uasyncio.queues/metadata.txt b/micropython/uasyncio.queues/metadata.txt
similarity index 100%
rename from uasyncio.queues/metadata.txt
rename to micropython/uasyncio.queues/metadata.txt
diff --git a/uasyncio.queues/setup.py b/micropython/uasyncio.queues/setup.py
similarity index 100%
rename from uasyncio.queues/setup.py
rename to micropython/uasyncio.queues/setup.py
diff --git a/uasyncio.queues/tests/test.py b/micropython/uasyncio.queues/tests/test.py
similarity index 100%
rename from uasyncio.queues/tests/test.py
rename to micropython/uasyncio.queues/tests/test.py
diff --git a/uasyncio.queues/uasyncio/queues.py b/micropython/uasyncio.queues/uasyncio/queues.py
similarity index 100%
rename from uasyncio.queues/uasyncio/queues.py
rename to micropython/uasyncio.queues/uasyncio/queues.py
diff --git a/uasyncio.synchro/example_lock.py b/micropython/uasyncio.synchro/example_lock.py
similarity index 100%
rename from uasyncio.synchro/example_lock.py
rename to micropython/uasyncio.synchro/example_lock.py
diff --git a/uasyncio.synchro/metadata.txt b/micropython/uasyncio.synchro/metadata.txt
similarity index 100%
rename from uasyncio.synchro/metadata.txt
rename to micropython/uasyncio.synchro/metadata.txt
diff --git a/uasyncio.synchro/setup.py b/micropython/uasyncio.synchro/setup.py
similarity index 100%
rename from uasyncio.synchro/setup.py
rename to micropython/uasyncio.synchro/setup.py
diff --git a/uasyncio.synchro/uasyncio/synchro.py b/micropython/uasyncio.synchro/uasyncio/synchro.py
similarity index 100%
rename from uasyncio.synchro/uasyncio/synchro.py
rename to micropython/uasyncio.synchro/uasyncio/synchro.py
diff --git a/uasyncio.udp/example_dns_junk.py b/micropython/uasyncio.udp/example_dns_junk.py
similarity index 100%
rename from uasyncio.udp/example_dns_junk.py
rename to micropython/uasyncio.udp/example_dns_junk.py
diff --git a/uasyncio.udp/metadata.txt b/micropython/uasyncio.udp/metadata.txt
similarity index 100%
rename from uasyncio.udp/metadata.txt
rename to micropython/uasyncio.udp/metadata.txt
diff --git a/uasyncio.udp/setup.py b/micropython/uasyncio.udp/setup.py
similarity index 100%
rename from uasyncio.udp/setup.py
rename to micropython/uasyncio.udp/setup.py
diff --git a/uasyncio.udp/uasyncio/udp.py b/micropython/uasyncio.udp/uasyncio/udp.py
similarity index 100%
rename from uasyncio.udp/uasyncio/udp.py
rename to micropython/uasyncio.udp/uasyncio/udp.py
diff --git a/uasyncio.websocket.server/example_websock.py b/micropython/uasyncio.websocket.server/example_websock.py
similarity index 100%
rename from uasyncio.websocket.server/example_websock.py
rename to micropython/uasyncio.websocket.server/example_websock.py
diff --git a/uasyncio.websocket.server/metadata.txt b/micropython/uasyncio.websocket.server/metadata.txt
similarity index 100%
rename from uasyncio.websocket.server/metadata.txt
rename to micropython/uasyncio.websocket.server/metadata.txt
diff --git a/uasyncio.websocket.server/setup.py b/micropython/uasyncio.websocket.server/setup.py
similarity index 100%
rename from uasyncio.websocket.server/setup.py
rename to micropython/uasyncio.websocket.server/setup.py
diff --git a/uasyncio.websocket.server/uasyncio/websocket/server.py b/micropython/uasyncio.websocket.server/uasyncio/websocket/server.py
similarity index 100%
rename from uasyncio.websocket.server/uasyncio/websocket/server.py
rename to micropython/uasyncio.websocket.server/uasyncio/websocket/server.py
diff --git a/uasyncio/README.rst b/micropython/uasyncio/README.rst
similarity index 100%
rename from uasyncio/README.rst
rename to micropython/uasyncio/README.rst
diff --git a/uasyncio/README.test b/micropython/uasyncio/README.test
similarity index 100%
rename from uasyncio/README.test
rename to micropython/uasyncio/README.test
diff --git a/uasyncio/benchmark/boom_uasyncio.py b/micropython/uasyncio/benchmark/boom_uasyncio.py
similarity index 100%
rename from uasyncio/benchmark/boom_uasyncio.py
rename to micropython/uasyncio/benchmark/boom_uasyncio.py
diff --git a/uasyncio/benchmark/test-ab-medium.sh b/micropython/uasyncio/benchmark/test-ab-medium.sh
similarity index 100%
rename from uasyncio/benchmark/test-ab-medium.sh
rename to micropython/uasyncio/benchmark/test-ab-medium.sh
diff --git a/uasyncio/benchmark/test-boom-heavy.sh b/micropython/uasyncio/benchmark/test-boom-heavy.sh
similarity index 100%
rename from uasyncio/benchmark/test-boom-heavy.sh
rename to micropython/uasyncio/benchmark/test-boom-heavy.sh
diff --git a/uasyncio/benchmark/test_http_server_heavy.py b/micropython/uasyncio/benchmark/test_http_server_heavy.py
similarity index 100%
rename from uasyncio/benchmark/test_http_server_heavy.py
rename to micropython/uasyncio/benchmark/test_http_server_heavy.py
diff --git a/uasyncio/benchmark/test_http_server_light.py b/micropython/uasyncio/benchmark/test_http_server_light.py
similarity index 100%
rename from uasyncio/benchmark/test_http_server_light.py
rename to micropython/uasyncio/benchmark/test_http_server_light.py
diff --git a/uasyncio/benchmark/test_http_server_medium.py b/micropython/uasyncio/benchmark/test_http_server_medium.py
similarity index 100%
rename from uasyncio/benchmark/test_http_server_medium.py
rename to micropython/uasyncio/benchmark/test_http_server_medium.py
diff --git a/uasyncio/example_http_client.py b/micropython/uasyncio/example_http_client.py
similarity index 100%
rename from uasyncio/example_http_client.py
rename to micropython/uasyncio/example_http_client.py
diff --git a/uasyncio/example_http_server.py b/micropython/uasyncio/example_http_server.py
similarity index 100%
rename from uasyncio/example_http_server.py
rename to micropython/uasyncio/example_http_server.py
diff --git a/uasyncio/metadata.txt b/micropython/uasyncio/metadata.txt
similarity index 100%
rename from uasyncio/metadata.txt
rename to micropython/uasyncio/metadata.txt
diff --git a/uasyncio/setup.py b/micropython/uasyncio/setup.py
similarity index 100%
rename from uasyncio/setup.py
rename to micropython/uasyncio/setup.py
diff --git a/uasyncio/test_echo.py b/micropython/uasyncio/test_echo.py
similarity index 100%
rename from uasyncio/test_echo.py
rename to micropython/uasyncio/test_echo.py
diff --git a/uasyncio/test_io_starve.py b/micropython/uasyncio/test_io_starve.py
similarity index 100%
rename from uasyncio/test_io_starve.py
rename to micropython/uasyncio/test_io_starve.py
diff --git a/uasyncio/test_readexactly.py b/micropython/uasyncio/test_readexactly.py
similarity index 100%
rename from uasyncio/test_readexactly.py
rename to micropython/uasyncio/test_readexactly.py
diff --git a/uasyncio/test_readline.py b/micropython/uasyncio/test_readline.py
similarity index 100%
rename from uasyncio/test_readline.py
rename to micropython/uasyncio/test_readline.py
diff --git a/uasyncio/uasyncio/__init__.py b/micropython/uasyncio/uasyncio/__init__.py
similarity index 100%
rename from uasyncio/uasyncio/__init__.py
rename to micropython/uasyncio/uasyncio/__init__.py
diff --git a/ucontextlib/metadata.txt b/micropython/ucontextlib/metadata.txt
similarity index 100%
rename from ucontextlib/metadata.txt
rename to micropython/ucontextlib/metadata.txt
diff --git a/ucontextlib/setup.py b/micropython/ucontextlib/setup.py
similarity index 100%
rename from ucontextlib/setup.py
rename to micropython/ucontextlib/setup.py
diff --git a/ucontextlib/tests.py b/micropython/ucontextlib/tests.py
similarity index 100%
rename from ucontextlib/tests.py
rename to micropython/ucontextlib/tests.py
diff --git a/ucontextlib/ucontextlib.py b/micropython/ucontextlib/ucontextlib.py
similarity index 100%
rename from ucontextlib/ucontextlib.py
rename to micropython/ucontextlib/ucontextlib.py
diff --git a/udnspkt/example_resolve.py b/micropython/udnspkt/example_resolve.py
similarity index 100%
rename from udnspkt/example_resolve.py
rename to micropython/udnspkt/example_resolve.py
diff --git a/udnspkt/metadata.txt b/micropython/udnspkt/metadata.txt
similarity index 100%
rename from udnspkt/metadata.txt
rename to micropython/udnspkt/metadata.txt
diff --git a/udnspkt/setup.py b/micropython/udnspkt/setup.py
similarity index 100%
rename from udnspkt/setup.py
rename to micropython/udnspkt/setup.py
diff --git a/udnspkt/udnspkt.py b/micropython/udnspkt/udnspkt.py
similarity index 100%
rename from udnspkt/udnspkt.py
rename to micropython/udnspkt/udnspkt.py
diff --git a/umqtt.robust/README.rst b/micropython/umqtt.robust/README.rst
similarity index 100%
rename from umqtt.robust/README.rst
rename to micropython/umqtt.robust/README.rst
diff --git a/umqtt.robust/example_sub_robust.py b/micropython/umqtt.robust/example_sub_robust.py
similarity index 100%
rename from umqtt.robust/example_sub_robust.py
rename to micropython/umqtt.robust/example_sub_robust.py
diff --git a/umqtt.robust/metadata.txt b/micropython/umqtt.robust/metadata.txt
similarity index 100%
rename from umqtt.robust/metadata.txt
rename to micropython/umqtt.robust/metadata.txt
diff --git a/umqtt.robust/setup.py b/micropython/umqtt.robust/setup.py
similarity index 100%
rename from umqtt.robust/setup.py
rename to micropython/umqtt.robust/setup.py
diff --git a/umqtt.robust/umqtt/robust.py b/micropython/umqtt.robust/umqtt/robust.py
similarity index 100%
rename from umqtt.robust/umqtt/robust.py
rename to micropython/umqtt.robust/umqtt/robust.py
diff --git a/umqtt.simple/README.rst b/micropython/umqtt.simple/README.rst
similarity index 100%
rename from umqtt.simple/README.rst
rename to micropython/umqtt.simple/README.rst
diff --git a/umqtt.simple/example_pub.py b/micropython/umqtt.simple/example_pub.py
similarity index 100%
rename from umqtt.simple/example_pub.py
rename to micropython/umqtt.simple/example_pub.py
diff --git a/umqtt.simple/example_pub_button.py b/micropython/umqtt.simple/example_pub_button.py
similarity index 100%
rename from umqtt.simple/example_pub_button.py
rename to micropython/umqtt.simple/example_pub_button.py
diff --git a/umqtt.simple/example_sub.py b/micropython/umqtt.simple/example_sub.py
similarity index 100%
rename from umqtt.simple/example_sub.py
rename to micropython/umqtt.simple/example_sub.py
diff --git a/umqtt.simple/example_sub_led.py b/micropython/umqtt.simple/example_sub_led.py
similarity index 100%
rename from umqtt.simple/example_sub_led.py
rename to micropython/umqtt.simple/example_sub_led.py
diff --git a/umqtt.simple/metadata.txt b/micropython/umqtt.simple/metadata.txt
similarity index 100%
rename from umqtt.simple/metadata.txt
rename to micropython/umqtt.simple/metadata.txt
diff --git a/umqtt.simple/setup.py b/micropython/umqtt.simple/setup.py
similarity index 100%
rename from umqtt.simple/setup.py
rename to micropython/umqtt.simple/setup.py
diff --git a/umqtt.simple/umqtt/simple.py b/micropython/umqtt.simple/umqtt/simple.py
similarity index 100%
rename from umqtt.simple/umqtt/simple.py
rename to micropython/umqtt.simple/umqtt/simple.py
diff --git a/upip/Makefile b/micropython/upip/Makefile
similarity index 100%
rename from upip/Makefile
rename to micropython/upip/Makefile
diff --git a/upip/bootstrap_upip.sh b/micropython/upip/bootstrap_upip.sh
similarity index 100%
rename from upip/bootstrap_upip.sh
rename to micropython/upip/bootstrap_upip.sh
diff --git a/upip/metadata.txt b/micropython/upip/metadata.txt
similarity index 100%
rename from upip/metadata.txt
rename to micropython/upip/metadata.txt
diff --git a/upip/setup.py b/micropython/upip/setup.py
similarity index 100%
rename from upip/setup.py
rename to micropython/upip/setup.py
diff --git a/upip/upip.py b/micropython/upip/upip.py
similarity index 100%
rename from upip/upip.py
rename to micropython/upip/upip.py
diff --git a/upip/upip_utarfile.py b/micropython/upip/upip_utarfile.py
similarity index 100%
rename from upip/upip_utarfile.py
rename to micropython/upip/upip_utarfile.py
diff --git a/upysh/metadata.txt b/micropython/upysh/metadata.txt
similarity index 100%
rename from upysh/metadata.txt
rename to micropython/upysh/metadata.txt
diff --git a/upysh/setup.py b/micropython/upysh/setup.py
similarity index 100%
rename from upysh/setup.py
rename to micropython/upysh/setup.py
diff --git a/upysh/upysh.py b/micropython/upysh/upysh.py
similarity index 100%
rename from upysh/upysh.py
rename to micropython/upysh/upysh.py
diff --git a/urequests/example_xively.py b/micropython/urequests/example_xively.py
similarity index 100%
rename from urequests/example_xively.py
rename to micropython/urequests/example_xively.py
diff --git a/urequests/metadata.txt b/micropython/urequests/metadata.txt
similarity index 100%
rename from urequests/metadata.txt
rename to micropython/urequests/metadata.txt
diff --git a/urequests/setup.py b/micropython/urequests/setup.py
similarity index 100%
rename from urequests/setup.py
rename to micropython/urequests/setup.py
diff --git a/urequests/urequests.py b/micropython/urequests/urequests.py
similarity index 100%
rename from urequests/urequests.py
rename to micropython/urequests/urequests.py
diff --git a/urllib.urequest/metadata.txt b/micropython/urllib.urequest/metadata.txt
similarity index 100%
rename from urllib.urequest/metadata.txt
rename to micropython/urllib.urequest/metadata.txt
diff --git a/urllib.urequest/setup.py b/micropython/urllib.urequest/setup.py
similarity index 100%
rename from urllib.urequest/setup.py
rename to micropython/urllib.urequest/setup.py
diff --git a/urllib.urequest/urllib/urequest.py b/micropython/urllib.urequest/urllib/urequest.py
similarity index 100%
rename from urllib.urequest/urllib/urequest.py
rename to micropython/urllib.urequest/urllib/urequest.py
diff --git a/utarfile/example-extract.py b/micropython/utarfile/example-extract.py
similarity index 100%
rename from utarfile/example-extract.py
rename to micropython/utarfile/example-extract.py
diff --git a/utarfile/metadata.txt b/micropython/utarfile/metadata.txt
similarity index 100%
rename from utarfile/metadata.txt
rename to micropython/utarfile/metadata.txt
diff --git a/utarfile/setup.py b/micropython/utarfile/setup.py
similarity index 100%
rename from utarfile/setup.py
rename to micropython/utarfile/setup.py
diff --git a/utarfile/utarfile.py b/micropython/utarfile/utarfile.py
similarity index 100%
rename from utarfile/utarfile.py
rename to micropython/utarfile/utarfile.py
diff --git a/xmltok/metadata.txt b/micropython/xmltok/metadata.txt
similarity index 100%
rename from xmltok/metadata.txt
rename to micropython/xmltok/metadata.txt
diff --git a/xmltok/setup.py b/micropython/xmltok/setup.py
similarity index 100%
rename from xmltok/setup.py
rename to micropython/xmltok/setup.py
diff --git a/xmltok/test.xml b/micropython/xmltok/test.xml
similarity index 100%
rename from xmltok/test.xml
rename to micropython/xmltok/test.xml
diff --git a/xmltok/test_xmltok.py b/micropython/xmltok/test_xmltok.py
similarity index 100%
rename from xmltok/test_xmltok.py
rename to micropython/xmltok/test_xmltok.py
diff --git a/xmltok/xmltok.py b/micropython/xmltok/xmltok.py
similarity index 100%
rename from xmltok/xmltok.py
rename to micropython/xmltok/xmltok.py
diff --git a/__future__/__future__.py b/python-stdlib/__future__/__future__.py
similarity index 100%
rename from __future__/__future__.py
rename to python-stdlib/__future__/__future__.py
diff --git a/__future__/metadata.txt b/python-stdlib/__future__/metadata.txt
similarity index 100%
rename from __future__/metadata.txt
rename to python-stdlib/__future__/metadata.txt
diff --git a/__future__/setup.py b/python-stdlib/__future__/setup.py
similarity index 100%
rename from __future__/setup.py
rename to python-stdlib/__future__/setup.py
diff --git a/_markupbase/_markupbase.py b/python-stdlib/_markupbase/_markupbase.py
similarity index 100%
rename from _markupbase/_markupbase.py
rename to python-stdlib/_markupbase/_markupbase.py
diff --git a/_markupbase/metadata.txt b/python-stdlib/_markupbase/metadata.txt
similarity index 100%
rename from _markupbase/metadata.txt
rename to python-stdlib/_markupbase/metadata.txt
diff --git a/_markupbase/setup.py b/python-stdlib/_markupbase/setup.py
similarity index 100%
rename from _markupbase/setup.py
rename to python-stdlib/_markupbase/setup.py
diff --git a/abc/abc.py b/python-stdlib/abc/abc.py
similarity index 100%
rename from abc/abc.py
rename to python-stdlib/abc/abc.py
diff --git a/abc/metadata.txt b/python-stdlib/abc/metadata.txt
similarity index 100%
rename from abc/metadata.txt
rename to python-stdlib/abc/metadata.txt
diff --git a/abc/setup.py b/python-stdlib/abc/setup.py
similarity index 100%
rename from abc/setup.py
rename to python-stdlib/abc/setup.py
diff --git a/argparse/argparse.py b/python-stdlib/argparse/argparse.py
similarity index 100%
rename from argparse/argparse.py
rename to python-stdlib/argparse/argparse.py
diff --git a/argparse/metadata.txt b/python-stdlib/argparse/metadata.txt
similarity index 100%
rename from argparse/metadata.txt
rename to python-stdlib/argparse/metadata.txt
diff --git a/argparse/setup.py b/python-stdlib/argparse/setup.py
similarity index 100%
rename from argparse/setup.py
rename to python-stdlib/argparse/setup.py
diff --git a/argparse/test_argparse.py b/python-stdlib/argparse/test_argparse.py
similarity index 100%
rename from argparse/test_argparse.py
rename to python-stdlib/argparse/test_argparse.py
diff --git a/base64/base64.py b/python-stdlib/base64/base64.py
similarity index 100%
rename from base64/base64.py
rename to python-stdlib/base64/base64.py
diff --git a/base64/metadata.txt b/python-stdlib/base64/metadata.txt
similarity index 100%
rename from base64/metadata.txt
rename to python-stdlib/base64/metadata.txt
diff --git a/base64/setup.py b/python-stdlib/base64/setup.py
similarity index 100%
rename from base64/setup.py
rename to python-stdlib/base64/setup.py
diff --git a/base64/test_base64.py b/python-stdlib/base64/test_base64.py
similarity index 100%
rename from base64/test_base64.py
rename to python-stdlib/base64/test_base64.py
diff --git a/binascii/binascii.py b/python-stdlib/binascii/binascii.py
similarity index 100%
rename from binascii/binascii.py
rename to python-stdlib/binascii/binascii.py
diff --git a/binascii/metadata.txt b/python-stdlib/binascii/metadata.txt
similarity index 100%
rename from binascii/metadata.txt
rename to python-stdlib/binascii/metadata.txt
diff --git a/binascii/setup.py b/python-stdlib/binascii/setup.py
similarity index 100%
rename from binascii/setup.py
rename to python-stdlib/binascii/setup.py
diff --git a/binascii/test_binascii.py b/python-stdlib/binascii/test_binascii.py
similarity index 100%
rename from binascii/test_binascii.py
rename to python-stdlib/binascii/test_binascii.py
diff --git a/bisect/bisect.py b/python-stdlib/bisect/bisect.py
similarity index 100%
rename from bisect/bisect.py
rename to python-stdlib/bisect/bisect.py
diff --git a/bisect/setup.py b/python-stdlib/bisect/setup.py
similarity index 100%
rename from bisect/setup.py
rename to python-stdlib/bisect/setup.py
diff --git a/cgi/cgi.py b/python-stdlib/cgi/cgi.py
similarity index 100%
rename from cgi/cgi.py
rename to python-stdlib/cgi/cgi.py
diff --git a/cgi/metadata.txt b/python-stdlib/cgi/metadata.txt
similarity index 100%
rename from cgi/metadata.txt
rename to python-stdlib/cgi/metadata.txt
diff --git a/cgi/setup.py b/python-stdlib/cgi/setup.py
similarity index 100%
rename from cgi/setup.py
rename to python-stdlib/cgi/setup.py
diff --git a/cmd/cmd.py b/python-stdlib/cmd/cmd.py
similarity index 100%
rename from cmd/cmd.py
rename to python-stdlib/cmd/cmd.py
diff --git a/cmd/metadata.txt b/python-stdlib/cmd/metadata.txt
similarity index 100%
rename from cmd/metadata.txt
rename to python-stdlib/cmd/metadata.txt
diff --git a/cmd/setup.py b/python-stdlib/cmd/setup.py
similarity index 100%
rename from cmd/setup.py
rename to python-stdlib/cmd/setup.py
diff --git a/collections.defaultdict/collections/defaultdict.py b/python-stdlib/collections.defaultdict/collections/defaultdict.py
similarity index 100%
rename from collections.defaultdict/collections/defaultdict.py
rename to python-stdlib/collections.defaultdict/collections/defaultdict.py
diff --git a/collections.defaultdict/metadata.txt b/python-stdlib/collections.defaultdict/metadata.txt
similarity index 100%
rename from collections.defaultdict/metadata.txt
rename to python-stdlib/collections.defaultdict/metadata.txt
diff --git a/collections.defaultdict/setup.py b/python-stdlib/collections.defaultdict/setup.py
similarity index 100%
rename from collections.defaultdict/setup.py
rename to python-stdlib/collections.defaultdict/setup.py
diff --git a/collections.defaultdict/test_defaultdict.py b/python-stdlib/collections.defaultdict/test_defaultdict.py
similarity index 100%
rename from collections.defaultdict/test_defaultdict.py
rename to python-stdlib/collections.defaultdict/test_defaultdict.py
diff --git a/collections.deque/collections/deque.py b/python-stdlib/collections.deque/collections/deque.py
similarity index 100%
rename from collections.deque/collections/deque.py
rename to python-stdlib/collections.deque/collections/deque.py
diff --git a/collections.deque/metadata.txt b/python-stdlib/collections.deque/metadata.txt
similarity index 100%
rename from collections.deque/metadata.txt
rename to python-stdlib/collections.deque/metadata.txt
diff --git a/collections.deque/setup.py b/python-stdlib/collections.deque/setup.py
similarity index 100%
rename from collections.deque/setup.py
rename to python-stdlib/collections.deque/setup.py
diff --git a/collections/collections/__init__.py b/python-stdlib/collections/collections/__init__.py
similarity index 100%
rename from collections/collections/__init__.py
rename to python-stdlib/collections/collections/__init__.py
diff --git a/collections/metadata.txt b/python-stdlib/collections/metadata.txt
similarity index 100%
rename from collections/metadata.txt
rename to python-stdlib/collections/metadata.txt
diff --git a/collections/setup.py b/python-stdlib/collections/setup.py
similarity index 100%
rename from collections/setup.py
rename to python-stdlib/collections/setup.py
diff --git a/contextlib/contextlib.py b/python-stdlib/contextlib/contextlib.py
similarity index 100%
rename from contextlib/contextlib.py
rename to python-stdlib/contextlib/contextlib.py
diff --git a/contextlib/metadata.txt b/python-stdlib/contextlib/metadata.txt
similarity index 100%
rename from contextlib/metadata.txt
rename to python-stdlib/contextlib/metadata.txt
diff --git a/contextlib/setup.py b/python-stdlib/contextlib/setup.py
similarity index 100%
rename from contextlib/setup.py
rename to python-stdlib/contextlib/setup.py
diff --git a/contextlib/tests.py b/python-stdlib/contextlib/tests.py
similarity index 100%
rename from contextlib/tests.py
rename to python-stdlib/contextlib/tests.py
diff --git a/copy/copy.py b/python-stdlib/copy/copy.py
similarity index 100%
rename from copy/copy.py
rename to python-stdlib/copy/copy.py
diff --git a/copy/metadata.txt b/python-stdlib/copy/metadata.txt
similarity index 100%
rename from copy/metadata.txt
rename to python-stdlib/copy/metadata.txt
diff --git a/copy/setup.py b/python-stdlib/copy/setup.py
similarity index 100%
rename from copy/setup.py
rename to python-stdlib/copy/setup.py
diff --git a/curses.ascii/curses/ascii.py b/python-stdlib/curses.ascii/curses/ascii.py
similarity index 100%
rename from curses.ascii/curses/ascii.py
rename to python-stdlib/curses.ascii/curses/ascii.py
diff --git a/curses.ascii/metadata.txt b/python-stdlib/curses.ascii/metadata.txt
similarity index 100%
rename from curses.ascii/metadata.txt
rename to python-stdlib/curses.ascii/metadata.txt
diff --git a/curses.ascii/setup.py b/python-stdlib/curses.ascii/setup.py
similarity index 100%
rename from curses.ascii/setup.py
rename to python-stdlib/curses.ascii/setup.py
diff --git a/email.charset/email/charset.py b/python-stdlib/email.charset/email/charset.py
similarity index 100%
rename from email.charset/email/charset.py
rename to python-stdlib/email.charset/email/charset.py
diff --git a/email.charset/metadata.txt b/python-stdlib/email.charset/metadata.txt
similarity index 100%
rename from email.charset/metadata.txt
rename to python-stdlib/email.charset/metadata.txt
diff --git a/email.charset/setup.py b/python-stdlib/email.charset/setup.py
similarity index 100%
rename from email.charset/setup.py
rename to python-stdlib/email.charset/setup.py
diff --git a/email.encoders/email/base64mime.py b/python-stdlib/email.encoders/email/base64mime.py
similarity index 100%
rename from email.encoders/email/base64mime.py
rename to python-stdlib/email.encoders/email/base64mime.py
diff --git a/email.encoders/email/encoders.py b/python-stdlib/email.encoders/email/encoders.py
similarity index 100%
rename from email.encoders/email/encoders.py
rename to python-stdlib/email.encoders/email/encoders.py
diff --git a/email.encoders/email/quoprimime.py b/python-stdlib/email.encoders/email/quoprimime.py
similarity index 100%
rename from email.encoders/email/quoprimime.py
rename to python-stdlib/email.encoders/email/quoprimime.py
diff --git a/email.encoders/metadata.txt b/python-stdlib/email.encoders/metadata.txt
similarity index 100%
rename from email.encoders/metadata.txt
rename to python-stdlib/email.encoders/metadata.txt
diff --git a/email.encoders/setup.py b/python-stdlib/email.encoders/setup.py
similarity index 100%
rename from email.encoders/setup.py
rename to python-stdlib/email.encoders/setup.py
diff --git a/email.errors/email/errors.py b/python-stdlib/email.errors/email/errors.py
similarity index 100%
rename from email.errors/email/errors.py
rename to python-stdlib/email.errors/email/errors.py
diff --git a/email.errors/metadata.txt b/python-stdlib/email.errors/metadata.txt
similarity index 100%
rename from email.errors/metadata.txt
rename to python-stdlib/email.errors/metadata.txt
diff --git a/email.errors/setup.py b/python-stdlib/email.errors/setup.py
similarity index 100%
rename from email.errors/setup.py
rename to python-stdlib/email.errors/setup.py
diff --git a/email.feedparser/email/feedparser.py b/python-stdlib/email.feedparser/email/feedparser.py
similarity index 100%
rename from email.feedparser/email/feedparser.py
rename to python-stdlib/email.feedparser/email/feedparser.py
diff --git a/email.feedparser/metadata.txt b/python-stdlib/email.feedparser/metadata.txt
similarity index 100%
rename from email.feedparser/metadata.txt
rename to python-stdlib/email.feedparser/metadata.txt
diff --git a/email.feedparser/setup.py b/python-stdlib/email.feedparser/setup.py
similarity index 100%
rename from email.feedparser/setup.py
rename to python-stdlib/email.feedparser/setup.py
diff --git a/email.header/email/header.py b/python-stdlib/email.header/email/header.py
similarity index 100%
rename from email.header/email/header.py
rename to python-stdlib/email.header/email/header.py
diff --git a/email.header/metadata.txt b/python-stdlib/email.header/metadata.txt
similarity index 100%
rename from email.header/metadata.txt
rename to python-stdlib/email.header/metadata.txt
diff --git a/email.header/setup.py b/python-stdlib/email.header/setup.py
similarity index 100%
rename from email.header/setup.py
rename to python-stdlib/email.header/setup.py
diff --git a/email.internal/email/_encoded_words.py b/python-stdlib/email.internal/email/_encoded_words.py
similarity index 100%
rename from email.internal/email/_encoded_words.py
rename to python-stdlib/email.internal/email/_encoded_words.py
diff --git a/email.internal/email/_parseaddr.py b/python-stdlib/email.internal/email/_parseaddr.py
similarity index 100%
rename from email.internal/email/_parseaddr.py
rename to python-stdlib/email.internal/email/_parseaddr.py
diff --git a/email.internal/email/_policybase.py b/python-stdlib/email.internal/email/_policybase.py
similarity index 100%
rename from email.internal/email/_policybase.py
rename to python-stdlib/email.internal/email/_policybase.py
diff --git a/email.internal/metadata.txt b/python-stdlib/email.internal/metadata.txt
similarity index 100%
rename from email.internal/metadata.txt
rename to python-stdlib/email.internal/metadata.txt
diff --git a/email.internal/setup.py b/python-stdlib/email.internal/setup.py
similarity index 100%
rename from email.internal/setup.py
rename to python-stdlib/email.internal/setup.py
diff --git a/email.message/email/iterators.py b/python-stdlib/email.message/email/iterators.py
similarity index 100%
rename from email.message/email/iterators.py
rename to python-stdlib/email.message/email/iterators.py
diff --git a/email.message/email/message.py b/python-stdlib/email.message/email/message.py
similarity index 100%
rename from email.message/email/message.py
rename to python-stdlib/email.message/email/message.py
diff --git a/email.message/metadata.txt b/python-stdlib/email.message/metadata.txt
similarity index 100%
rename from email.message/metadata.txt
rename to python-stdlib/email.message/metadata.txt
diff --git a/email.message/setup.py b/python-stdlib/email.message/setup.py
similarity index 100%
rename from email.message/setup.py
rename to python-stdlib/email.message/setup.py
diff --git a/email.parser/email/parser.py b/python-stdlib/email.parser/email/parser.py
similarity index 100%
rename from email.parser/email/parser.py
rename to python-stdlib/email.parser/email/parser.py
diff --git a/email.parser/metadata.txt b/python-stdlib/email.parser/metadata.txt
similarity index 100%
rename from email.parser/metadata.txt
rename to python-stdlib/email.parser/metadata.txt
diff --git a/email.parser/setup.py b/python-stdlib/email.parser/setup.py
similarity index 100%
rename from email.parser/setup.py
rename to python-stdlib/email.parser/setup.py
diff --git a/email.utils/email/utils.py b/python-stdlib/email.utils/email/utils.py
similarity index 100%
rename from email.utils/email/utils.py
rename to python-stdlib/email.utils/email/utils.py
diff --git a/email.utils/metadata.txt b/python-stdlib/email.utils/metadata.txt
similarity index 100%
rename from email.utils/metadata.txt
rename to python-stdlib/email.utils/metadata.txt
diff --git a/email.utils/setup.py b/python-stdlib/email.utils/setup.py
similarity index 100%
rename from email.utils/setup.py
rename to python-stdlib/email.utils/setup.py
diff --git a/errno/errno.py b/python-stdlib/errno/errno.py
similarity index 100%
rename from errno/errno.py
rename to python-stdlib/errno/errno.py
diff --git a/errno/metadata.txt b/python-stdlib/errno/metadata.txt
similarity index 100%
rename from errno/metadata.txt
rename to python-stdlib/errno/metadata.txt
diff --git a/errno/setup.py b/python-stdlib/errno/setup.py
similarity index 100%
rename from errno/setup.py
rename to python-stdlib/errno/setup.py
diff --git a/fnmatch/fnmatch.py b/python-stdlib/fnmatch/fnmatch.py
similarity index 100%
rename from fnmatch/fnmatch.py
rename to python-stdlib/fnmatch/fnmatch.py
diff --git a/fnmatch/metadata.txt b/python-stdlib/fnmatch/metadata.txt
similarity index 100%
rename from fnmatch/metadata.txt
rename to python-stdlib/fnmatch/metadata.txt
diff --git a/fnmatch/setup.py b/python-stdlib/fnmatch/setup.py
similarity index 100%
rename from fnmatch/setup.py
rename to python-stdlib/fnmatch/setup.py
diff --git a/fnmatch/test_fnmatch.py b/python-stdlib/fnmatch/test_fnmatch.py
similarity index 100%
rename from fnmatch/test_fnmatch.py
rename to python-stdlib/fnmatch/test_fnmatch.py
diff --git a/functools/functools.py b/python-stdlib/functools/functools.py
similarity index 100%
rename from functools/functools.py
rename to python-stdlib/functools/functools.py
diff --git a/functools/metadata.txt b/python-stdlib/functools/metadata.txt
similarity index 100%
rename from functools/metadata.txt
rename to python-stdlib/functools/metadata.txt
diff --git a/functools/setup.py b/python-stdlib/functools/setup.py
similarity index 100%
rename from functools/setup.py
rename to python-stdlib/functools/setup.py
diff --git a/functools/test_partial.py b/python-stdlib/functools/test_partial.py
similarity index 100%
rename from functools/test_partial.py
rename to python-stdlib/functools/test_partial.py
diff --git a/functools/test_reduce.py b/python-stdlib/functools/test_reduce.py
similarity index 100%
rename from functools/test_reduce.py
rename to python-stdlib/functools/test_reduce.py
diff --git a/getopt/getopt.py b/python-stdlib/getopt/getopt.py
similarity index 100%
rename from getopt/getopt.py
rename to python-stdlib/getopt/getopt.py
diff --git a/getopt/metadata.txt b/python-stdlib/getopt/metadata.txt
similarity index 100%
rename from getopt/metadata.txt
rename to python-stdlib/getopt/metadata.txt
diff --git a/getopt/setup.py b/python-stdlib/getopt/setup.py
similarity index 100%
rename from getopt/setup.py
rename to python-stdlib/getopt/setup.py
diff --git a/glob/glob.py b/python-stdlib/glob/glob.py
similarity index 100%
rename from glob/glob.py
rename to python-stdlib/glob/glob.py
diff --git a/glob/metadata.txt b/python-stdlib/glob/metadata.txt
similarity index 100%
rename from glob/metadata.txt
rename to python-stdlib/glob/metadata.txt
diff --git a/glob/setup.py b/python-stdlib/glob/setup.py
similarity index 100%
rename from glob/setup.py
rename to python-stdlib/glob/setup.py
diff --git a/glob/test_glob.py b/python-stdlib/glob/test_glob.py
similarity index 100%
rename from glob/test_glob.py
rename to python-stdlib/glob/test_glob.py
diff --git a/gzip/gzip.py b/python-stdlib/gzip/gzip.py
similarity index 100%
rename from gzip/gzip.py
rename to python-stdlib/gzip/gzip.py
diff --git a/gzip/metadata.txt b/python-stdlib/gzip/metadata.txt
similarity index 100%
rename from gzip/metadata.txt
rename to python-stdlib/gzip/metadata.txt
diff --git a/gzip/setup.py b/python-stdlib/gzip/setup.py
similarity index 100%
rename from gzip/setup.py
rename to python-stdlib/gzip/setup.py
diff --git a/hashlib/hashlib/__init__.py b/python-stdlib/hashlib/hashlib/__init__.py
similarity index 100%
rename from hashlib/hashlib/__init__.py
rename to python-stdlib/hashlib/hashlib/__init__.py
diff --git a/hashlib/hashlib/_sha224.py b/python-stdlib/hashlib/hashlib/_sha224.py
similarity index 100%
rename from hashlib/hashlib/_sha224.py
rename to python-stdlib/hashlib/hashlib/_sha224.py
diff --git a/hashlib/hashlib/_sha256.py b/python-stdlib/hashlib/hashlib/_sha256.py
similarity index 100%
rename from hashlib/hashlib/_sha256.py
rename to python-stdlib/hashlib/hashlib/_sha256.py
diff --git a/hashlib/hashlib/_sha384.py b/python-stdlib/hashlib/hashlib/_sha384.py
similarity index 100%
rename from hashlib/hashlib/_sha384.py
rename to python-stdlib/hashlib/hashlib/_sha384.py
diff --git a/hashlib/hashlib/_sha512.py b/python-stdlib/hashlib/hashlib/_sha512.py
similarity index 100%
rename from hashlib/hashlib/_sha512.py
rename to python-stdlib/hashlib/hashlib/_sha512.py
diff --git a/hashlib/metadata.txt b/python-stdlib/hashlib/metadata.txt
similarity index 100%
rename from hashlib/metadata.txt
rename to python-stdlib/hashlib/metadata.txt
diff --git a/hashlib/setup.py b/python-stdlib/hashlib/setup.py
similarity index 100%
rename from hashlib/setup.py
rename to python-stdlib/hashlib/setup.py
diff --git a/hashlib/test_hashlib.py b/python-stdlib/hashlib/test_hashlib.py
similarity index 100%
rename from hashlib/test_hashlib.py
rename to python-stdlib/hashlib/test_hashlib.py
diff --git a/heapq/heapq.py b/python-stdlib/heapq/heapq.py
similarity index 100%
rename from heapq/heapq.py
rename to python-stdlib/heapq/heapq.py
diff --git a/heapq/metadata.txt b/python-stdlib/heapq/metadata.txt
similarity index 100%
rename from heapq/metadata.txt
rename to python-stdlib/heapq/metadata.txt
diff --git a/heapq/setup.py b/python-stdlib/heapq/setup.py
similarity index 100%
rename from heapq/setup.py
rename to python-stdlib/heapq/setup.py
diff --git a/heapq/test_heapq.py b/python-stdlib/heapq/test_heapq.py
similarity index 100%
rename from heapq/test_heapq.py
rename to python-stdlib/heapq/test_heapq.py
diff --git a/hmac/hmac.py b/python-stdlib/hmac/hmac.py
similarity index 100%
rename from hmac/hmac.py
rename to python-stdlib/hmac/hmac.py
diff --git a/hmac/metadata.txt b/python-stdlib/hmac/metadata.txt
similarity index 100%
rename from hmac/metadata.txt
rename to python-stdlib/hmac/metadata.txt
diff --git a/hmac/setup.py b/python-stdlib/hmac/setup.py
similarity index 100%
rename from hmac/setup.py
rename to python-stdlib/hmac/setup.py
diff --git a/hmac/test_hmac.py b/python-stdlib/hmac/test_hmac.py
similarity index 100%
rename from hmac/test_hmac.py
rename to python-stdlib/hmac/test_hmac.py
diff --git a/html.entities/html/entities.py b/python-stdlib/html.entities/html/entities.py
similarity index 100%
rename from html.entities/html/entities.py
rename to python-stdlib/html.entities/html/entities.py
diff --git a/html.entities/metadata.txt b/python-stdlib/html.entities/metadata.txt
similarity index 100%
rename from html.entities/metadata.txt
rename to python-stdlib/html.entities/metadata.txt
diff --git a/html.entities/setup.py b/python-stdlib/html.entities/setup.py
similarity index 100%
rename from html.entities/setup.py
rename to python-stdlib/html.entities/setup.py
diff --git a/html.parser/html/parser.py b/python-stdlib/html.parser/html/parser.py
similarity index 100%
rename from html.parser/html/parser.py
rename to python-stdlib/html.parser/html/parser.py
diff --git a/html.parser/metadata.txt b/python-stdlib/html.parser/metadata.txt
similarity index 100%
rename from html.parser/metadata.txt
rename to python-stdlib/html.parser/metadata.txt
diff --git a/html.parser/setup.py b/python-stdlib/html.parser/setup.py
similarity index 100%
rename from html.parser/setup.py
rename to python-stdlib/html.parser/setup.py
diff --git a/html/html/__init__.py b/python-stdlib/html/html/__init__.py
similarity index 100%
rename from html/html/__init__.py
rename to python-stdlib/html/html/__init__.py
diff --git a/html/metadata.txt b/python-stdlib/html/metadata.txt
similarity index 100%
rename from html/metadata.txt
rename to python-stdlib/html/metadata.txt
diff --git a/html/setup.py b/python-stdlib/html/setup.py
similarity index 100%
rename from html/setup.py
rename to python-stdlib/html/setup.py
diff --git a/http.client/example_client.py b/python-stdlib/http.client/example_client.py
similarity index 100%
rename from http.client/example_client.py
rename to python-stdlib/http.client/example_client.py
diff --git a/http.client/http/client.py b/python-stdlib/http.client/http/client.py
similarity index 100%
rename from http.client/http/client.py
rename to python-stdlib/http.client/http/client.py
diff --git a/http.client/metadata.txt b/python-stdlib/http.client/metadata.txt
similarity index 100%
rename from http.client/metadata.txt
rename to python-stdlib/http.client/metadata.txt
diff --git a/http.client/setup.py b/python-stdlib/http.client/setup.py
similarity index 100%
rename from http.client/setup.py
rename to python-stdlib/http.client/setup.py
diff --git a/inspect/inspect.py b/python-stdlib/inspect/inspect.py
similarity index 100%
rename from inspect/inspect.py
rename to python-stdlib/inspect/inspect.py
diff --git a/inspect/metadata.txt b/python-stdlib/inspect/metadata.txt
similarity index 100%
rename from inspect/metadata.txt
rename to python-stdlib/inspect/metadata.txt
diff --git a/inspect/setup.py b/python-stdlib/inspect/setup.py
similarity index 100%
rename from inspect/setup.py
rename to python-stdlib/inspect/setup.py
diff --git a/io/io.py b/python-stdlib/io/io.py
similarity index 100%
rename from io/io.py
rename to python-stdlib/io/io.py
diff --git a/io/metadata.txt b/python-stdlib/io/metadata.txt
similarity index 100%
rename from io/metadata.txt
rename to python-stdlib/io/metadata.txt
diff --git a/io/setup.py b/python-stdlib/io/setup.py
similarity index 100%
rename from io/setup.py
rename to python-stdlib/io/setup.py
diff --git a/itertools/itertools.py b/python-stdlib/itertools/itertools.py
similarity index 100%
rename from itertools/itertools.py
rename to python-stdlib/itertools/itertools.py
diff --git a/itertools/metadata.txt b/python-stdlib/itertools/metadata.txt
similarity index 100%
rename from itertools/metadata.txt
rename to python-stdlib/itertools/metadata.txt
diff --git a/itertools/setup.py b/python-stdlib/itertools/setup.py
similarity index 100%
rename from itertools/setup.py
rename to python-stdlib/itertools/setup.py
diff --git a/itertools/test_itertools.py b/python-stdlib/itertools/test_itertools.py
similarity index 100%
rename from itertools/test_itertools.py
rename to python-stdlib/itertools/test_itertools.py
diff --git a/json/json/__init__.py b/python-stdlib/json/json/__init__.py
similarity index 100%
rename from json/json/__init__.py
rename to python-stdlib/json/json/__init__.py
diff --git a/json/json/decoder.py b/python-stdlib/json/json/decoder.py
similarity index 100%
rename from json/json/decoder.py
rename to python-stdlib/json/json/decoder.py
diff --git a/json/json/encoder.py b/python-stdlib/json/json/encoder.py
similarity index 100%
rename from json/json/encoder.py
rename to python-stdlib/json/json/encoder.py
diff --git a/json/json/scanner.py b/python-stdlib/json/json/scanner.py
similarity index 100%
rename from json/json/scanner.py
rename to python-stdlib/json/json/scanner.py
diff --git a/json/json/tool.py b/python-stdlib/json/json/tool.py
similarity index 100%
rename from json/json/tool.py
rename to python-stdlib/json/json/tool.py
diff --git a/json/setup.py b/python-stdlib/json/setup.py
similarity index 100%
rename from json/setup.py
rename to python-stdlib/json/setup.py
diff --git a/json/test_json.py b/python-stdlib/json/test_json.py
similarity index 100%
rename from json/test_json.py
rename to python-stdlib/json/test_json.py
diff --git a/keyword/keyword.py b/python-stdlib/keyword/keyword.py
similarity index 100%
rename from keyword/keyword.py
rename to python-stdlib/keyword/keyword.py
diff --git a/locale/locale.py b/python-stdlib/locale/locale.py
similarity index 100%
rename from locale/locale.py
rename to python-stdlib/locale/locale.py
diff --git a/locale/metadata.txt b/python-stdlib/locale/metadata.txt
similarity index 100%
rename from locale/metadata.txt
rename to python-stdlib/locale/metadata.txt
diff --git a/locale/setup.py b/python-stdlib/locale/setup.py
similarity index 100%
rename from locale/setup.py
rename to python-stdlib/locale/setup.py
diff --git a/logging/example_logging.py b/python-stdlib/logging/example_logging.py
similarity index 100%
rename from logging/example_logging.py
rename to python-stdlib/logging/example_logging.py
diff --git a/logging/logging.py b/python-stdlib/logging/logging.py
similarity index 100%
rename from logging/logging.py
rename to python-stdlib/logging/logging.py
diff --git a/logging/metadata.txt b/python-stdlib/logging/metadata.txt
similarity index 100%
rename from logging/metadata.txt
rename to python-stdlib/logging/metadata.txt
diff --git a/logging/setup.py b/python-stdlib/logging/setup.py
similarity index 100%
rename from logging/setup.py
rename to python-stdlib/logging/setup.py
diff --git a/operator/metadata.txt b/python-stdlib/operator/metadata.txt
similarity index 100%
rename from operator/metadata.txt
rename to python-stdlib/operator/metadata.txt
diff --git a/operator/operator.py b/python-stdlib/operator/operator.py
similarity index 100%
rename from operator/operator.py
rename to python-stdlib/operator/operator.py
diff --git a/operator/setup.py b/python-stdlib/operator/setup.py
similarity index 100%
rename from operator/setup.py
rename to python-stdlib/operator/setup.py
diff --git a/operator/test_operator.py b/python-stdlib/operator/test_operator.py
similarity index 100%
rename from operator/test_operator.py
rename to python-stdlib/operator/test_operator.py
diff --git a/os.path/metadata.txt b/python-stdlib/os.path/metadata.txt
similarity index 100%
rename from os.path/metadata.txt
rename to python-stdlib/os.path/metadata.txt
diff --git a/os.path/os/path.py b/python-stdlib/os.path/os/path.py
similarity index 100%
rename from os.path/os/path.py
rename to python-stdlib/os.path/os/path.py
diff --git a/os.path/setup.py b/python-stdlib/os.path/setup.py
similarity index 100%
rename from os.path/setup.py
rename to python-stdlib/os.path/setup.py
diff --git a/os.path/test_path.py b/python-stdlib/os.path/test_path.py
similarity index 100%
rename from os.path/test_path.py
rename to python-stdlib/os.path/test_path.py
diff --git a/python-stdlib/os/metadata.txt b/python-stdlib/os/metadata.txt
new file mode 100644
index 00000000..9db40027
--- /dev/null
+++ b/python-stdlib/os/metadata.txt
@@ -0,0 +1,4 @@
+srctype = micropython-lib
+type = package
+version = 0.6
+author = Paul Sokolovsky
diff --git a/python-stdlib/os/os/__init__.py b/python-stdlib/os/os/__init__.py
new file mode 100644
index 00000000..c3df8b0a
--- /dev/null
+++ b/python-stdlib/os/os/__init__.py
@@ -0,0 +1 @@
+from uos import *
diff --git a/python-stdlib/os/setup.py b/python-stdlib/os/setup.py
new file mode 100644
index 00000000..d9e5146f
--- /dev/null
+++ b/python-stdlib/os/setup.py
@@ -0,0 +1,20 @@
+import sys
+# Remove current dir from sys.path, otherwise setuptools will peek up our
+# module instead of system's.
+sys.path.pop(0)
+from setuptools import setup
+sys.path.append("..")
+import sdist_upip
+
+setup(name='micropython-os',
+      version='0.6',
+      description='os module for MicroPython',
+      long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
+      url='https://github.com/micropython/micropython-lib',
+      author='Paul Sokolovsky',
+      author_email='micro-python@googlegroups.com',
+      maintainer='micropython-lib Developers',
+      maintainer_email='micro-python@googlegroups.com',
+      license='MIT',
+      cmdclass={'sdist': sdist_upip.sdist},
+      packages=['os'])
diff --git a/pickle/metadata.txt b/python-stdlib/pickle/metadata.txt
similarity index 100%
rename from pickle/metadata.txt
rename to python-stdlib/pickle/metadata.txt
diff --git a/pickle/pickle.py b/python-stdlib/pickle/pickle.py
similarity index 100%
rename from pickle/pickle.py
rename to python-stdlib/pickle/pickle.py
diff --git a/pickle/setup.py b/python-stdlib/pickle/setup.py
similarity index 100%
rename from pickle/setup.py
rename to python-stdlib/pickle/setup.py
diff --git a/pickle/test_pickle.py b/python-stdlib/pickle/test_pickle.py
similarity index 100%
rename from pickle/test_pickle.py
rename to python-stdlib/pickle/test_pickle.py
diff --git a/pkg_resources/metadata.txt b/python-stdlib/pkg_resources/metadata.txt
similarity index 100%
rename from pkg_resources/metadata.txt
rename to python-stdlib/pkg_resources/metadata.txt
diff --git a/pkg_resources/pkg_resources.py b/python-stdlib/pkg_resources/pkg_resources.py
similarity index 100%
rename from pkg_resources/pkg_resources.py
rename to python-stdlib/pkg_resources/pkg_resources.py
diff --git a/pkg_resources/setup.py b/python-stdlib/pkg_resources/setup.py
similarity index 100%
rename from pkg_resources/setup.py
rename to python-stdlib/pkg_resources/setup.py
diff --git a/pkgutil/metadata.txt b/python-stdlib/pkgutil/metadata.txt
similarity index 100%
rename from pkgutil/metadata.txt
rename to python-stdlib/pkgutil/metadata.txt
diff --git a/pkgutil/pkgutil.py b/python-stdlib/pkgutil/pkgutil.py
similarity index 100%
rename from pkgutil/pkgutil.py
rename to python-stdlib/pkgutil/pkgutil.py
diff --git a/pkgutil/setup.py b/python-stdlib/pkgutil/setup.py
similarity index 100%
rename from pkgutil/setup.py
rename to python-stdlib/pkgutil/setup.py
diff --git a/pprint/metadata.txt b/python-stdlib/pprint/metadata.txt
similarity index 100%
rename from pprint/metadata.txt
rename to python-stdlib/pprint/metadata.txt
diff --git a/pprint/pprint.py b/python-stdlib/pprint/pprint.py
similarity index 100%
rename from pprint/pprint.py
rename to python-stdlib/pprint/pprint.py
diff --git a/pprint/setup.py b/python-stdlib/pprint/setup.py
similarity index 100%
rename from pprint/setup.py
rename to python-stdlib/pprint/setup.py
diff --git a/pystone/metadata.txt b/python-stdlib/pystone/metadata.txt
similarity index 100%
rename from pystone/metadata.txt
rename to python-stdlib/pystone/metadata.txt
diff --git a/pystone/pystone.py b/python-stdlib/pystone/pystone.py
similarity index 100%
rename from pystone/pystone.py
rename to python-stdlib/pystone/pystone.py
diff --git a/pystone/setup.py b/python-stdlib/pystone/setup.py
similarity index 100%
rename from pystone/setup.py
rename to python-stdlib/pystone/setup.py
diff --git a/pystone_lowmem/metadata.txt b/python-stdlib/pystone_lowmem/metadata.txt
similarity index 100%
rename from pystone_lowmem/metadata.txt
rename to python-stdlib/pystone_lowmem/metadata.txt
diff --git a/pystone_lowmem/pystone_lowmem.py b/python-stdlib/pystone_lowmem/pystone_lowmem.py
similarity index 100%
rename from pystone_lowmem/pystone_lowmem.py
rename to python-stdlib/pystone_lowmem/pystone_lowmem.py
diff --git a/pystone_lowmem/setup.py b/python-stdlib/pystone_lowmem/setup.py
similarity index 100%
rename from pystone_lowmem/setup.py
rename to python-stdlib/pystone_lowmem/setup.py
diff --git a/quopri/metadata.txt b/python-stdlib/quopri/metadata.txt
similarity index 100%
rename from quopri/metadata.txt
rename to python-stdlib/quopri/metadata.txt
diff --git a/quopri/quopri.py b/python-stdlib/quopri/quopri.py
similarity index 100%
rename from quopri/quopri.py
rename to python-stdlib/quopri/quopri.py
diff --git a/quopri/setup.py b/python-stdlib/quopri/setup.py
similarity index 100%
rename from quopri/setup.py
rename to python-stdlib/quopri/setup.py
diff --git a/quopri/test_quopri.py b/python-stdlib/quopri/test_quopri.py
similarity index 100%
rename from quopri/test_quopri.py
rename to python-stdlib/quopri/test_quopri.py
diff --git a/random/metadata.txt b/python-stdlib/random/metadata.txt
similarity index 100%
rename from random/metadata.txt
rename to python-stdlib/random/metadata.txt
diff --git a/random/random.py b/python-stdlib/random/random.py
similarity index 100%
rename from random/random.py
rename to python-stdlib/random/random.py
diff --git a/random/setup.py b/python-stdlib/random/setup.py
similarity index 100%
rename from random/setup.py
rename to python-stdlib/random/setup.py
diff --git a/random/test_randrange.py b/python-stdlib/random/test_randrange.py
similarity index 100%
rename from random/test_randrange.py
rename to python-stdlib/random/test_randrange.py
diff --git a/shutil/metadata.txt b/python-stdlib/shutil/metadata.txt
similarity index 100%
rename from shutil/metadata.txt
rename to python-stdlib/shutil/metadata.txt
diff --git a/shutil/setup.py b/python-stdlib/shutil/setup.py
similarity index 100%
rename from shutil/setup.py
rename to python-stdlib/shutil/setup.py
diff --git a/shutil/shutil.py b/python-stdlib/shutil/shutil.py
similarity index 100%
rename from shutil/shutil.py
rename to python-stdlib/shutil/shutil.py
diff --git a/socket/metadata.txt b/python-stdlib/socket/metadata.txt
similarity index 100%
rename from socket/metadata.txt
rename to python-stdlib/socket/metadata.txt
diff --git a/socket/setup.py b/python-stdlib/socket/setup.py
similarity index 100%
rename from socket/setup.py
rename to python-stdlib/socket/setup.py
diff --git a/socket/socket.py b/python-stdlib/socket/socket.py
similarity index 100%
rename from socket/socket.py
rename to python-stdlib/socket/socket.py
diff --git a/ssl/metadata.txt b/python-stdlib/ssl/metadata.txt
similarity index 100%
rename from ssl/metadata.txt
rename to python-stdlib/ssl/metadata.txt
diff --git a/ssl/setup.py b/python-stdlib/ssl/setup.py
similarity index 100%
rename from ssl/setup.py
rename to python-stdlib/ssl/setup.py
diff --git a/ssl/ssl.py b/python-stdlib/ssl/ssl.py
similarity index 100%
rename from ssl/ssl.py
rename to python-stdlib/ssl/ssl.py
diff --git a/stat/metadata.txt b/python-stdlib/stat/metadata.txt
similarity index 100%
rename from stat/metadata.txt
rename to python-stdlib/stat/metadata.txt
diff --git a/stat/setup.py b/python-stdlib/stat/setup.py
similarity index 100%
rename from stat/setup.py
rename to python-stdlib/stat/setup.py
diff --git a/stat/stat.py b/python-stdlib/stat/stat.py
similarity index 100%
rename from stat/stat.py
rename to python-stdlib/stat/stat.py
diff --git a/string/metadata.txt b/python-stdlib/string/metadata.txt
similarity index 100%
rename from string/metadata.txt
rename to python-stdlib/string/metadata.txt
diff --git a/string/setup.py b/python-stdlib/string/setup.py
similarity index 100%
rename from string/setup.py
rename to python-stdlib/string/setup.py
diff --git a/string/string.py b/python-stdlib/string/string.py
similarity index 100%
rename from string/string.py
rename to python-stdlib/string/string.py
diff --git a/string/test_translate.py b/python-stdlib/string/test_translate.py
similarity index 100%
rename from string/test_translate.py
rename to python-stdlib/string/test_translate.py
diff --git a/struct/metadata.txt b/python-stdlib/struct/metadata.txt
similarity index 100%
rename from struct/metadata.txt
rename to python-stdlib/struct/metadata.txt
diff --git a/struct/setup.py b/python-stdlib/struct/setup.py
similarity index 100%
rename from struct/setup.py
rename to python-stdlib/struct/setup.py
diff --git a/struct/struct.py b/python-stdlib/struct/struct.py
similarity index 100%
rename from struct/struct.py
rename to python-stdlib/struct/struct.py
diff --git a/test.pystone/metadata.txt b/python-stdlib/test.pystone/metadata.txt
similarity index 100%
rename from test.pystone/metadata.txt
rename to python-stdlib/test.pystone/metadata.txt
diff --git a/test.pystone/setup.py b/python-stdlib/test.pystone/setup.py
similarity index 100%
rename from test.pystone/setup.py
rename to python-stdlib/test.pystone/setup.py
diff --git a/test.pystone/test/pystone.py b/python-stdlib/test.pystone/test/pystone.py
similarity index 100%
rename from test.pystone/test/pystone.py
rename to python-stdlib/test.pystone/test/pystone.py
diff --git a/textwrap/metadata.txt b/python-stdlib/textwrap/metadata.txt
similarity index 100%
rename from textwrap/metadata.txt
rename to python-stdlib/textwrap/metadata.txt
diff --git a/textwrap/setup.py b/python-stdlib/textwrap/setup.py
similarity index 100%
rename from textwrap/setup.py
rename to python-stdlib/textwrap/setup.py
diff --git a/textwrap/textwrap.py b/python-stdlib/textwrap/textwrap.py
similarity index 100%
rename from textwrap/textwrap.py
rename to python-stdlib/textwrap/textwrap.py
diff --git a/threading/metadata.txt b/python-stdlib/threading/metadata.txt
similarity index 100%
rename from threading/metadata.txt
rename to python-stdlib/threading/metadata.txt
diff --git a/threading/setup.py b/python-stdlib/threading/setup.py
similarity index 100%
rename from threading/setup.py
rename to python-stdlib/threading/setup.py
diff --git a/threading/threading.py b/python-stdlib/threading/threading.py
similarity index 100%
rename from threading/threading.py
rename to python-stdlib/threading/threading.py
diff --git a/timeit/metadata.txt b/python-stdlib/timeit/metadata.txt
similarity index 100%
rename from timeit/metadata.txt
rename to python-stdlib/timeit/metadata.txt
diff --git a/timeit/setup.py b/python-stdlib/timeit/setup.py
similarity index 100%
rename from timeit/setup.py
rename to python-stdlib/timeit/setup.py
diff --git a/timeit/timeit.py b/python-stdlib/timeit/timeit.py
similarity index 100%
rename from timeit/timeit.py
rename to python-stdlib/timeit/timeit.py
diff --git a/traceback/metadata.txt b/python-stdlib/traceback/metadata.txt
similarity index 100%
rename from traceback/metadata.txt
rename to python-stdlib/traceback/metadata.txt
diff --git a/traceback/setup.py b/python-stdlib/traceback/setup.py
similarity index 100%
rename from traceback/setup.py
rename to python-stdlib/traceback/setup.py
diff --git a/traceback/traceback.py b/python-stdlib/traceback/traceback.py
similarity index 100%
rename from traceback/traceback.py
rename to python-stdlib/traceback/traceback.py
diff --git a/types/setup.py b/python-stdlib/types/setup.py
similarity index 100%
rename from types/setup.py
rename to python-stdlib/types/setup.py
diff --git a/types/types.py b/python-stdlib/types/types.py
similarity index 100%
rename from types/types.py
rename to python-stdlib/types/types.py
diff --git a/unittest/metadata.txt b/python-stdlib/unittest/metadata.txt
similarity index 100%
rename from unittest/metadata.txt
rename to python-stdlib/unittest/metadata.txt
diff --git a/unittest/setup.py b/python-stdlib/unittest/setup.py
similarity index 100%
rename from unittest/setup.py
rename to python-stdlib/unittest/setup.py
diff --git a/unittest/test_unittest.py b/python-stdlib/unittest/test_unittest.py
similarity index 100%
rename from unittest/test_unittest.py
rename to python-stdlib/unittest/test_unittest.py
diff --git a/unittest/unittest.py b/python-stdlib/unittest/unittest.py
similarity index 100%
rename from unittest/unittest.py
rename to python-stdlib/unittest/unittest.py
diff --git a/urllib.parse/metadata.txt b/python-stdlib/urllib.parse/metadata.txt
similarity index 100%
rename from urllib.parse/metadata.txt
rename to python-stdlib/urllib.parse/metadata.txt
diff --git a/urllib.parse/setup.py b/python-stdlib/urllib.parse/setup.py
similarity index 100%
rename from urllib.parse/setup.py
rename to python-stdlib/urllib.parse/setup.py
diff --git a/urllib.parse/test_urlparse.py b/python-stdlib/urllib.parse/test_urlparse.py
similarity index 100%
rename from urllib.parse/test_urlparse.py
rename to python-stdlib/urllib.parse/test_urlparse.py
diff --git a/urllib.parse/urllib/parse.py b/python-stdlib/urllib.parse/urllib/parse.py
similarity index 100%
rename from urllib.parse/urllib/parse.py
rename to python-stdlib/urllib.parse/urllib/parse.py
diff --git a/uu/metadata.txt b/python-stdlib/uu/metadata.txt
similarity index 100%
rename from uu/metadata.txt
rename to python-stdlib/uu/metadata.txt
diff --git a/uu/setup.py b/python-stdlib/uu/setup.py
similarity index 100%
rename from uu/setup.py
rename to python-stdlib/uu/setup.py
diff --git a/uu/uu.py b/python-stdlib/uu/uu.py
similarity index 100%
rename from uu/uu.py
rename to python-stdlib/uu/uu.py
diff --git a/warnings/example_warn.py b/python-stdlib/warnings/example_warn.py
similarity index 100%
rename from warnings/example_warn.py
rename to python-stdlib/warnings/example_warn.py
diff --git a/warnings/metadata.txt b/python-stdlib/warnings/metadata.txt
similarity index 100%
rename from warnings/metadata.txt
rename to python-stdlib/warnings/metadata.txt
diff --git a/warnings/setup.py b/python-stdlib/warnings/setup.py
similarity index 100%
rename from warnings/setup.py
rename to python-stdlib/warnings/setup.py
diff --git a/warnings/warnings.py b/python-stdlib/warnings/warnings.py
similarity index 100%
rename from warnings/warnings.py
rename to python-stdlib/warnings/warnings.py
diff --git a/_libc/_libc.py b/unix-ffi/_libc/_libc.py
similarity index 100%
rename from _libc/_libc.py
rename to unix-ffi/_libc/_libc.py
diff --git a/_libc/metadata.txt b/unix-ffi/_libc/metadata.txt
similarity index 100%
rename from _libc/metadata.txt
rename to unix-ffi/_libc/metadata.txt
diff --git a/_libc/setup.py b/unix-ffi/_libc/setup.py
similarity index 100%
rename from _libc/setup.py
rename to unix-ffi/_libc/setup.py
diff --git a/datetime/datetime.py b/unix-ffi/datetime/datetime.py
similarity index 100%
rename from datetime/datetime.py
rename to unix-ffi/datetime/datetime.py
diff --git a/datetime/metadata.txt b/unix-ffi/datetime/metadata.txt
similarity index 100%
rename from datetime/metadata.txt
rename to unix-ffi/datetime/metadata.txt
diff --git a/datetime/setup.py b/unix-ffi/datetime/setup.py
similarity index 100%
rename from datetime/setup.py
rename to unix-ffi/datetime/setup.py
diff --git a/datetime/test_datetime.py b/unix-ffi/datetime/test_datetime.py
similarity index 100%
rename from datetime/test_datetime.py
rename to unix-ffi/datetime/test_datetime.py
diff --git a/fcntl/fcntl.py b/unix-ffi/fcntl/fcntl.py
similarity index 100%
rename from fcntl/fcntl.py
rename to unix-ffi/fcntl/fcntl.py
diff --git a/fcntl/metadata.txt b/unix-ffi/fcntl/metadata.txt
similarity index 100%
rename from fcntl/metadata.txt
rename to unix-ffi/fcntl/metadata.txt
diff --git a/fcntl/setup.py b/unix-ffi/fcntl/setup.py
similarity index 100%
rename from fcntl/setup.py
rename to unix-ffi/fcntl/setup.py
diff --git a/ffilib/ffilib.py b/unix-ffi/ffilib/ffilib.py
similarity index 100%
rename from ffilib/ffilib.py
rename to unix-ffi/ffilib/ffilib.py
diff --git a/ffilib/metadata.txt b/unix-ffi/ffilib/metadata.txt
similarity index 100%
rename from ffilib/metadata.txt
rename to unix-ffi/ffilib/metadata.txt
diff --git a/ffilib/setup.py b/unix-ffi/ffilib/setup.py
similarity index 100%
rename from ffilib/setup.py
rename to unix-ffi/ffilib/setup.py
diff --git a/gettext/gettext.py b/unix-ffi/gettext/gettext.py
similarity index 100%
rename from gettext/gettext.py
rename to unix-ffi/gettext/gettext.py
diff --git a/gettext/metadata.txt b/unix-ffi/gettext/metadata.txt
similarity index 100%
rename from gettext/metadata.txt
rename to unix-ffi/gettext/metadata.txt
diff --git a/gettext/setup.py b/unix-ffi/gettext/setup.py
similarity index 100%
rename from gettext/setup.py
rename to unix-ffi/gettext/setup.py
diff --git a/gettext/test_gettext.py b/unix-ffi/gettext/test_gettext.py
similarity index 100%
rename from gettext/test_gettext.py
rename to unix-ffi/gettext/test_gettext.py
diff --git a/machine/example_timer.py b/unix-ffi/machine/example_timer.py
similarity index 100%
rename from machine/example_timer.py
rename to unix-ffi/machine/example_timer.py
diff --git a/machine/machine/__init__.py b/unix-ffi/machine/machine/__init__.py
similarity index 100%
rename from machine/machine/__init__.py
rename to unix-ffi/machine/machine/__init__.py
diff --git a/machine/machine/pin.py b/unix-ffi/machine/machine/pin.py
similarity index 100%
rename from machine/machine/pin.py
rename to unix-ffi/machine/machine/pin.py
diff --git a/machine/machine/timer.py b/unix-ffi/machine/machine/timer.py
similarity index 100%
rename from machine/machine/timer.py
rename to unix-ffi/machine/machine/timer.py
diff --git a/machine/metadata.txt b/unix-ffi/machine/metadata.txt
similarity index 100%
rename from machine/metadata.txt
rename to unix-ffi/machine/metadata.txt
diff --git a/machine/setup.py b/unix-ffi/machine/setup.py
similarity index 100%
rename from machine/setup.py
rename to unix-ffi/machine/setup.py
diff --git a/multiprocessing/metadata.txt b/unix-ffi/multiprocessing/metadata.txt
similarity index 100%
rename from multiprocessing/metadata.txt
rename to unix-ffi/multiprocessing/metadata.txt
diff --git a/multiprocessing/multiprocessing.py b/unix-ffi/multiprocessing/multiprocessing.py
similarity index 100%
rename from multiprocessing/multiprocessing.py
rename to unix-ffi/multiprocessing/multiprocessing.py
diff --git a/multiprocessing/setup.py b/unix-ffi/multiprocessing/setup.py
similarity index 100%
rename from multiprocessing/setup.py
rename to unix-ffi/multiprocessing/setup.py
diff --git a/multiprocessing/test_pipe.py b/unix-ffi/multiprocessing/test_pipe.py
similarity index 100%
rename from multiprocessing/test_pipe.py
rename to unix-ffi/multiprocessing/test_pipe.py
diff --git a/multiprocessing/test_pool.py b/unix-ffi/multiprocessing/test_pool.py
similarity index 100%
rename from multiprocessing/test_pool.py
rename to unix-ffi/multiprocessing/test_pool.py
diff --git a/multiprocessing/test_pool_async.py b/unix-ffi/multiprocessing/test_pool_async.py
similarity index 100%
rename from multiprocessing/test_pool_async.py
rename to unix-ffi/multiprocessing/test_pool_async.py
diff --git a/multiprocessing/test_process.py b/unix-ffi/multiprocessing/test_process.py
similarity index 100%
rename from multiprocessing/test_process.py
rename to unix-ffi/multiprocessing/test_process.py
diff --git a/os/example_dirs.py b/unix-ffi/os/example_dirs.py
similarity index 100%
rename from os/example_dirs.py
rename to unix-ffi/os/example_dirs.py
diff --git a/os/example_fork.py b/unix-ffi/os/example_fork.py
similarity index 100%
rename from os/example_fork.py
rename to unix-ffi/os/example_fork.py
diff --git a/os/example_fsencode.py b/unix-ffi/os/example_fsencode.py
similarity index 100%
rename from os/example_fsencode.py
rename to unix-ffi/os/example_fsencode.py
diff --git a/os/example_getenv.py b/unix-ffi/os/example_getenv.py
similarity index 100%
rename from os/example_getenv.py
rename to unix-ffi/os/example_getenv.py
diff --git a/os/example_open.py b/unix-ffi/os/example_open.py
similarity index 100%
rename from os/example_open.py
rename to unix-ffi/os/example_open.py
diff --git a/os/example_rw.py b/unix-ffi/os/example_rw.py
similarity index 100%
rename from os/example_rw.py
rename to unix-ffi/os/example_rw.py
diff --git a/os/example_system.py b/unix-ffi/os/example_system.py
similarity index 100%
rename from os/example_system.py
rename to unix-ffi/os/example_system.py
diff --git a/os/example_urandom.py b/unix-ffi/os/example_urandom.py
similarity index 100%
rename from os/example_urandom.py
rename to unix-ffi/os/example_urandom.py
diff --git a/os/metadata.txt b/unix-ffi/os/metadata.txt
similarity index 100%
rename from os/metadata.txt
rename to unix-ffi/os/metadata.txt
diff --git a/os/os/__init__.py b/unix-ffi/os/os/__init__.py
similarity index 100%
rename from os/os/__init__.py
rename to unix-ffi/os/os/__init__.py
diff --git a/os/setup.py b/unix-ffi/os/setup.py
similarity index 100%
rename from os/setup.py
rename to unix-ffi/os/setup.py
diff --git a/os/test_filestat.py b/unix-ffi/os/test_filestat.py
similarity index 100%
rename from os/test_filestat.py
rename to unix-ffi/os/test_filestat.py
diff --git a/pwd/metadata.txt b/unix-ffi/pwd/metadata.txt
similarity index 100%
rename from pwd/metadata.txt
rename to unix-ffi/pwd/metadata.txt
diff --git a/pwd/pwd.py b/unix-ffi/pwd/pwd.py
similarity index 100%
rename from pwd/pwd.py
rename to unix-ffi/pwd/pwd.py
diff --git a/pwd/setup.py b/unix-ffi/pwd/setup.py
similarity index 100%
rename from pwd/setup.py
rename to unix-ffi/pwd/setup.py
diff --git a/pwd/test_getpwnam.py b/unix-ffi/pwd/test_getpwnam.py
similarity index 100%
rename from pwd/test_getpwnam.py
rename to unix-ffi/pwd/test_getpwnam.py
diff --git a/pyb/example_blink.py b/unix-ffi/pyb/example_blink.py
similarity index 100%
rename from pyb/example_blink.py
rename to unix-ffi/pyb/example_blink.py
diff --git a/pyb/pyb.py b/unix-ffi/pyb/pyb.py
similarity index 100%
rename from pyb/pyb.py
rename to unix-ffi/pyb/pyb.py
diff --git a/re-pcre/metadata.txt b/unix-ffi/re-pcre/metadata.txt
similarity index 100%
rename from re-pcre/metadata.txt
rename to unix-ffi/re-pcre/metadata.txt
diff --git a/re-pcre/re.py b/unix-ffi/re-pcre/re.py
similarity index 100%
rename from re-pcre/re.py
rename to unix-ffi/re-pcre/re.py
diff --git a/re-pcre/setup.py b/unix-ffi/re-pcre/setup.py
similarity index 100%
rename from re-pcre/setup.py
rename to unix-ffi/re-pcre/setup.py
diff --git a/re-pcre/test_re.py b/unix-ffi/re-pcre/test_re.py
similarity index 100%
rename from re-pcre/test_re.py
rename to unix-ffi/re-pcre/test_re.py
diff --git a/select/example_epoll.py b/unix-ffi/select/example_epoll.py
similarity index 100%
rename from select/example_epoll.py
rename to unix-ffi/select/example_epoll.py
diff --git a/select/metadata.txt b/unix-ffi/select/metadata.txt
similarity index 100%
rename from select/metadata.txt
rename to unix-ffi/select/metadata.txt
diff --git a/select/select.py b/unix-ffi/select/select.py
similarity index 100%
rename from select/select.py
rename to unix-ffi/select/select.py
diff --git a/select/setup.py b/unix-ffi/select/setup.py
similarity index 100%
rename from select/setup.py
rename to unix-ffi/select/setup.py
diff --git a/signal/example_sigint.py b/unix-ffi/signal/example_sigint.py
similarity index 100%
rename from signal/example_sigint.py
rename to unix-ffi/signal/example_sigint.py
diff --git a/signal/example_sigint_exc.py b/unix-ffi/signal/example_sigint_exc.py
similarity index 100%
rename from signal/example_sigint_exc.py
rename to unix-ffi/signal/example_sigint_exc.py
diff --git a/signal/example_sigint_ign.py b/unix-ffi/signal/example_sigint_ign.py
similarity index 100%
rename from signal/example_sigint_ign.py
rename to unix-ffi/signal/example_sigint_ign.py
diff --git a/signal/metadata.txt b/unix-ffi/signal/metadata.txt
similarity index 100%
rename from signal/metadata.txt
rename to unix-ffi/signal/metadata.txt
diff --git a/signal/setup.py b/unix-ffi/signal/setup.py
similarity index 100%
rename from signal/setup.py
rename to unix-ffi/signal/setup.py
diff --git a/signal/signal.py b/unix-ffi/signal/signal.py
similarity index 100%
rename from signal/signal.py
rename to unix-ffi/signal/signal.py
diff --git a/sqlite3/metadata.txt b/unix-ffi/sqlite3/metadata.txt
similarity index 100%
rename from sqlite3/metadata.txt
rename to unix-ffi/sqlite3/metadata.txt
diff --git a/sqlite3/setup.py b/unix-ffi/sqlite3/setup.py
similarity index 100%
rename from sqlite3/setup.py
rename to unix-ffi/sqlite3/setup.py
diff --git a/sqlite3/sqlite3.py b/unix-ffi/sqlite3/sqlite3.py
similarity index 100%
rename from sqlite3/sqlite3.py
rename to unix-ffi/sqlite3/sqlite3.py
diff --git a/sqlite3/test_sqlite3.py b/unix-ffi/sqlite3/test_sqlite3.py
similarity index 100%
rename from sqlite3/test_sqlite3.py
rename to unix-ffi/sqlite3/test_sqlite3.py
diff --git a/sqlite3/test_sqlite3_2.py b/unix-ffi/sqlite3/test_sqlite3_2.py
similarity index 100%
rename from sqlite3/test_sqlite3_2.py
rename to unix-ffi/sqlite3/test_sqlite3_2.py
diff --git a/time/example_strftime.py b/unix-ffi/time/example_strftime.py
similarity index 100%
rename from time/example_strftime.py
rename to unix-ffi/time/example_strftime.py
diff --git a/time/example_time_tuple.py b/unix-ffi/time/example_time_tuple.py
similarity index 100%
rename from time/example_time_tuple.py
rename to unix-ffi/time/example_time_tuple.py
diff --git a/time/metadata.txt b/unix-ffi/time/metadata.txt
similarity index 100%
rename from time/metadata.txt
rename to unix-ffi/time/metadata.txt
diff --git a/time/setup.py b/unix-ffi/time/setup.py
similarity index 100%
rename from time/setup.py
rename to unix-ffi/time/setup.py
diff --git a/time/test_strftime.py b/unix-ffi/time/test_strftime.py
similarity index 100%
rename from time/test_strftime.py
rename to unix-ffi/time/test_strftime.py
diff --git a/time/time.py b/unix-ffi/time/time.py
similarity index 100%
rename from time/time.py
rename to unix-ffi/time/time.py
diff --git a/tty/metadata.txt b/unix-ffi/tty/metadata.txt
similarity index 100%
rename from tty/metadata.txt
rename to unix-ffi/tty/metadata.txt
diff --git a/tty/setup.py b/unix-ffi/tty/setup.py
similarity index 100%
rename from tty/setup.py
rename to unix-ffi/tty/setup.py
diff --git a/tty/tty.py b/unix-ffi/tty/tty.py
similarity index 100%
rename from tty/tty.py
rename to unix-ffi/tty/tty.py
diff --git a/ucurses/metadata.txt b/unix-ffi/ucurses/metadata.txt
similarity index 100%
rename from ucurses/metadata.txt
rename to unix-ffi/ucurses/metadata.txt
diff --git a/ucurses/setup.py b/unix-ffi/ucurses/setup.py
similarity index 100%
rename from ucurses/setup.py
rename to unix-ffi/ucurses/setup.py
diff --git a/ucurses/ucurses/__init__.py b/unix-ffi/ucurses/ucurses/__init__.py
similarity index 100%
rename from ucurses/ucurses/__init__.py
rename to unix-ffi/ucurses/ucurses/__init__.py