diff --git a/python-stdlib/base64/base64.py b/python-stdlib/base64/base64.py
index 866bf9c9..daa39728 100644
--- a/python-stdlib/base64/base64.py
+++ b/python-stdlib/base64/base64.py
@@ -96,7 +96,7 @@ def b64decode(s, altchars=None, validate=False):
         altchars = _bytes_from_decode_data(altchars)
         assert len(altchars) == 2, repr(altchars)
         s = s.translate(bytes.maketrans(altchars, b"+/"))
-    if validate and not re.match(b"^[A-Za-z0-9+/]*={0,2}$", s):
+    if validate and not re.match(b"^[A-Za-z0-9+/]*=*$", s):
         raise binascii.Error("Non-base64 digit found")
     return binascii.a2b_base64(s)
 
diff --git a/python-stdlib/base64/manifest.py b/python-stdlib/base64/manifest.py
index 4268481a..59d39f78 100644
--- a/python-stdlib/base64/manifest.py
+++ b/python-stdlib/base64/manifest.py
@@ -1,7 +1,6 @@
 metadata(version="3.3.3-4")
 
 require("binascii")
-require("re-pcre")
 require("struct")
 
 module("base64.py")
diff --git a/python-stdlib/email.charset/manifest.py b/python-stdlib/email.charset/manifest.py
deleted file mode 100644
index 208dd9a9..00000000
--- a/python-stdlib/email.charset/manifest.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# email.charset
-
-require("functools")
-require("email.encoders")
-require("email.errors")
-
-package("email", version="0.5.1")
diff --git a/python-stdlib/email.feedparser/manifest.py b/python-stdlib/email.feedparser/manifest.py
deleted file mode 100644
index bc0da6dc..00000000
--- a/python-stdlib/email.feedparser/manifest.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# email.feedparser
-
-require("re-pcre")
-require("email.errors")
-require("email.message")
-require("email.internal")
-
-package("email", version="0.5.1")
diff --git a/python-stdlib/email.header/manifest.py b/python-stdlib/email.header/manifest.py
deleted file mode 100644
index c901a52e..00000000
--- a/python-stdlib/email.header/manifest.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# email.header
-
-require("re-pcre")
-require("binascii")
-require("email.encoders")
-require("email.errors")
-require("email.charset")
-
-package("email", version="0.5.2")
diff --git a/python-stdlib/email.internal/manifest.py b/python-stdlib/email.internal/manifest.py
deleted file mode 100644
index 602d1ce3..00000000
--- a/python-stdlib/email.internal/manifest.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# email.internal
-
-require("re-pcre")
-require("base64")
-require("binascii")
-require("functools")
-require("string")
-# require("calendar") TODO
-require("abc")
-require("email.errors")
-require("email.header")
-require("email.charset")
-require("email.utils")
-
-package("email", version="0.5.1")
diff --git a/python-stdlib/email.message/manifest.py b/python-stdlib/email.message/manifest.py
deleted file mode 100644
index 1f1fa48a..00000000
--- a/python-stdlib/email.message/manifest.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# email.message
-
-require("re-pcre")
-require("uu")
-require("base64")
-require("binascii")
-require("email.utils")
-require("email.errors")
-require("email.charset")
-
-package("email", version="0.5.3")
diff --git a/python-stdlib/email.parser/manifest.py b/python-stdlib/email.parser/manifest.py
deleted file mode 100644
index 095e3224..00000000
--- a/python-stdlib/email.parser/manifest.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# email.parser
-
-require("warnings")
-require("email.feedparser")
-require("email.message")
-require("email.internal")
-
-package("email", version="0.5.1")
diff --git a/python-stdlib/glob/manifest.py b/python-stdlib/glob/manifest.py
deleted file mode 100644
index e4cb7ccc..00000000
--- a/python-stdlib/glob/manifest.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# glob
-
-require("os")
-require("re-pcre")
-require("fnmatch")
-
-module("glob.py", version="0.5.2")
diff --git a/python-stdlib/html.parser/manifest.py b/python-stdlib/html.parser/manifest.py
deleted file mode 100644
index 44a41c31..00000000
--- a/python-stdlib/html.parser/manifest.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# html.parser
-
-require("_markupbase")
-require("warnings")
-require("html.entities")
-require("re-pcre")
-
-package("html", version="3.3.3-2")
diff --git a/python-stdlib/http.client/manifest.py b/python-stdlib/http.client/manifest.py
deleted file mode 100644
index 119d08f3..00000000
--- a/python-stdlib/http.client/manifest.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# http.client
-
-require("email.parser")
-require("email.message")
-require("socket")
-require("collections")
-require("urllib.parse")
-require("warnings")
-
-package("http", version="0.5.1")
diff --git a/python-stdlib/uu/manifest.py b/python-stdlib/uu/manifest.py
index daf50569..ae90f888 100644
--- a/python-stdlib/uu/manifest.py
+++ b/python-stdlib/uu/manifest.py
@@ -1,6 +1,6 @@
 metadata(version="0.5.1")
 
 require("binascii")
-require("os")
+require("os.path")
 
 module("uu.py")
diff --git a/unix-ffi/README.md b/unix-ffi/README.md
index ae58362c..d821dda4 100644
--- a/unix-ffi/README.md
+++ b/unix-ffi/README.md
@@ -1,9 +1,11 @@
 Unix-specific libraries
 =======================
 
-These are libraries that will only run on the Unix port of MicroPython. There is some limited support for the Windows port too.
+These are libraries that will only run on the Unix port of MicroPython, or are
+too big to be used on microcontrollers. There is some limited support for the
+Windows port too.
 
-**Note:** This directory is largely unmaintained, although large breaking changes are not expected.
+**Note:** This directory is unmaintained.
 
 Background
 ----------
@@ -11,7 +13,18 @@ Background
 The libraries in this directory provide additional CPython compatibility using
 the host operating system's native libraries.
 
-This is implemented either by accessing the libraries directly via libffi, or by using built-in modules that are only available on the Unix port.
+This is implemented either by accessing the libraries directly via libffi, or
+by using built-in modules that are only available on the Unix port.
 
 In theory, this allows you to use MicroPython as a more complete drop-in
 replacement for CPython.
+
+Usage
+-----
+
+To use a unix-specific library, pass `unix_ffi=True` to `require()` in your
+manifest file.
+
+```py
+require("os", unix_ffi=True) # Use the unix-ffi version instead of python-stdlib.
+```
diff --git a/python-stdlib/_markupbase/_markupbase.py b/unix-ffi/_markupbase/_markupbase.py
similarity index 100%
rename from python-stdlib/_markupbase/_markupbase.py
rename to unix-ffi/_markupbase/_markupbase.py
diff --git a/python-stdlib/_markupbase/manifest.py b/unix-ffi/_markupbase/manifest.py
similarity index 65%
rename from python-stdlib/_markupbase/manifest.py
rename to unix-ffi/_markupbase/manifest.py
index 470f8a45..983b5799 100644
--- a/python-stdlib/_markupbase/manifest.py
+++ b/unix-ffi/_markupbase/manifest.py
@@ -1,5 +1,5 @@
 metadata(version="3.3.3-1")
 
-require("re-pcre")
+require("re", unix_ffi=True)
 
 module("_markupbase.py")
diff --git a/python-stdlib/argparse/argparse.py b/unix-ffi/argparse/argparse.py
similarity index 100%
rename from python-stdlib/argparse/argparse.py
rename to unix-ffi/argparse/argparse.py
diff --git a/python-stdlib/argparse/manifest.py b/unix-ffi/argparse/manifest.py
similarity index 100%
rename from python-stdlib/argparse/manifest.py
rename to unix-ffi/argparse/manifest.py
diff --git a/python-stdlib/argparse/test_argparse.py b/unix-ffi/argparse/test_argparse.py
similarity index 100%
rename from python-stdlib/argparse/test_argparse.py
rename to unix-ffi/argparse/test_argparse.py
diff --git a/python-stdlib/cgi/cgi.py b/unix-ffi/cgi/cgi.py
similarity index 100%
rename from python-stdlib/cgi/cgi.py
rename to unix-ffi/cgi/cgi.py
diff --git a/python-stdlib/cgi/manifest.py b/unix-ffi/cgi/manifest.py
similarity index 100%
rename from python-stdlib/cgi/manifest.py
rename to unix-ffi/cgi/manifest.py
diff --git a/python-stdlib/email.charset/email/charset.py b/unix-ffi/email.charset/email/charset.py
similarity index 100%
rename from python-stdlib/email.charset/email/charset.py
rename to unix-ffi/email.charset/email/charset.py
diff --git a/python-stdlib/email.encoders/email/base64mime.py b/unix-ffi/email.encoders/email/base64mime.py
similarity index 100%
rename from python-stdlib/email.encoders/email/base64mime.py
rename to unix-ffi/email.encoders/email/base64mime.py
diff --git a/python-stdlib/email.encoders/email/encoders.py b/unix-ffi/email.encoders/email/encoders.py
similarity index 100%
rename from python-stdlib/email.encoders/email/encoders.py
rename to unix-ffi/email.encoders/email/encoders.py
diff --git a/python-stdlib/email.encoders/email/quoprimime.py b/unix-ffi/email.encoders/email/quoprimime.py
similarity index 100%
rename from python-stdlib/email.encoders/email/quoprimime.py
rename to unix-ffi/email.encoders/email/quoprimime.py
diff --git a/python-stdlib/email.encoders/manifest.py b/unix-ffi/email.encoders/manifest.py
similarity index 80%
rename from python-stdlib/email.encoders/manifest.py
rename to unix-ffi/email.encoders/manifest.py
index f59bf11b..e1e2090c 100644
--- a/python-stdlib/email.encoders/manifest.py
+++ b/unix-ffi/email.encoders/manifest.py
@@ -3,7 +3,7 @@ metadata(version="0.5.1")
 require("base64")
 require("binascii")
 require("quopri")
-require("re-pcre")
+require("re", unix_ffi=True)
 require("string")
 
 package("email")
diff --git a/python-stdlib/email.errors/email/errors.py b/unix-ffi/email.errors/email/errors.py
similarity index 100%
rename from python-stdlib/email.errors/email/errors.py
rename to unix-ffi/email.errors/email/errors.py
diff --git a/python-stdlib/email.errors/manifest.py b/unix-ffi/email.errors/manifest.py
similarity index 100%
rename from python-stdlib/email.errors/manifest.py
rename to unix-ffi/email.errors/manifest.py
diff --git a/python-stdlib/email.feedparser/email/feedparser.py b/unix-ffi/email.feedparser/email/feedparser.py
similarity index 100%
rename from python-stdlib/email.feedparser/email/feedparser.py
rename to unix-ffi/email.feedparser/email/feedparser.py
diff --git a/python-stdlib/email.header/email/header.py b/unix-ffi/email.header/email/header.py
similarity index 100%
rename from python-stdlib/email.header/email/header.py
rename to unix-ffi/email.header/email/header.py
diff --git a/python-stdlib/email.internal/email/_encoded_words.py b/unix-ffi/email.internal/email/_encoded_words.py
similarity index 100%
rename from python-stdlib/email.internal/email/_encoded_words.py
rename to unix-ffi/email.internal/email/_encoded_words.py
diff --git a/python-stdlib/email.internal/email/_parseaddr.py b/unix-ffi/email.internal/email/_parseaddr.py
similarity index 100%
rename from python-stdlib/email.internal/email/_parseaddr.py
rename to unix-ffi/email.internal/email/_parseaddr.py
diff --git a/python-stdlib/email.internal/email/_policybase.py b/unix-ffi/email.internal/email/_policybase.py
similarity index 100%
rename from python-stdlib/email.internal/email/_policybase.py
rename to unix-ffi/email.internal/email/_policybase.py
diff --git a/python-stdlib/email.message/email/iterators.py b/unix-ffi/email.message/email/iterators.py
similarity index 100%
rename from python-stdlib/email.message/email/iterators.py
rename to unix-ffi/email.message/email/iterators.py
diff --git a/python-stdlib/email.message/email/message.py b/unix-ffi/email.message/email/message.py
similarity index 100%
rename from python-stdlib/email.message/email/message.py
rename to unix-ffi/email.message/email/message.py
diff --git a/python-stdlib/email.parser/email/parser.py b/unix-ffi/email.parser/email/parser.py
similarity index 100%
rename from python-stdlib/email.parser/email/parser.py
rename to unix-ffi/email.parser/email/parser.py
diff --git a/python-stdlib/email.utils/email/utils.py b/unix-ffi/email.utils/email/utils.py
similarity index 99%
rename from python-stdlib/email.utils/email/utils.py
rename to unix-ffi/email.utils/email/utils.py
index 0fe32cee..e0ebdd34 100644
--- a/python-stdlib/email.utils/email/utils.py
+++ b/unix-ffi/email.utils/email/utils.py
@@ -215,7 +215,10 @@ def make_msgid(idstring=None, domain=None):
     """
     timeval = time.time()
     utcdate = time.strftime("%Y%m%d%H%M%S", time.gmtime(timeval))
-    pid = os.getpid()
+    if hasattr(os, "getpid"):
+        pid = os.getpid()
+    else:
+        pid = 0
     randint = random.randrange(100000)
     if idstring is None:
         idstring = ""
diff --git a/python-stdlib/email.utils/manifest.py b/unix-ffi/email.utils/manifest.py
similarity index 50%
rename from python-stdlib/email.utils/manifest.py
rename to unix-ffi/email.utils/manifest.py
index 30770226..be6e3318 100644
--- a/python-stdlib/email.utils/manifest.py
+++ b/unix-ffi/email.utils/manifest.py
@@ -1,13 +1,13 @@
 metadata(version="3.3.3-2")
 
-require("os")
-require("re-pcre")
+require("os", unix_ffi=True)
+require("re", unix_ffi=True)
 require("base64")
 require("random")
 require("datetime")
-require("urllib.parse")
+require("urllib.parse", unix_ffi=True)
 require("warnings")
 require("quopri")
-require("email.charset")
+require("email.charset", unix_ffi=True)
 
 package("email")
diff --git a/unix-ffi/fcntl/manifest.py b/unix-ffi/fcntl/manifest.py
index e572a58e..a0e9d959 100644
--- a/unix-ffi/fcntl/manifest.py
+++ b/unix-ffi/fcntl/manifest.py
@@ -2,6 +2,6 @@ metadata(version="0.0.4")
 
 # Originally written by Paul Sokolovsky.
 
-require("ffilib")
+require("ffilib", unix_ffi=True)
 
 module("fcntl.py")
diff --git a/python-stdlib/getopt/getopt.py b/unix-ffi/getopt/getopt.py
similarity index 100%
rename from python-stdlib/getopt/getopt.py
rename to unix-ffi/getopt/getopt.py
diff --git a/python-stdlib/getopt/manifest.py b/unix-ffi/getopt/manifest.py
similarity index 63%
rename from python-stdlib/getopt/manifest.py
rename to unix-ffi/getopt/manifest.py
index 437f4068..2038e750 100644
--- a/python-stdlib/getopt/manifest.py
+++ b/unix-ffi/getopt/manifest.py
@@ -1,5 +1,5 @@
 metadata(version="3.3.3-1")
 
-require("os")
+require("os", unix_ffi=True)
 
 module("getopt.py")
diff --git a/unix-ffi/gettext/manifest.py b/unix-ffi/gettext/manifest.py
index a2b52015..527330e9 100644
--- a/unix-ffi/gettext/manifest.py
+++ b/unix-ffi/gettext/manifest.py
@@ -2,6 +2,6 @@ metadata(version="0.1")
 
 # Originally written by Riccardo Magliocchetti.
 
-require("ffilib")
+require("ffilib", unix_ffi=True)
 
 module("gettext.py")
diff --git a/python-stdlib/glob/glob.py b/unix-ffi/glob/glob.py
similarity index 100%
rename from python-stdlib/glob/glob.py
rename to unix-ffi/glob/glob.py
diff --git a/python-stdlib/glob/test_glob.py b/unix-ffi/glob/test_glob.py
similarity index 100%
rename from python-stdlib/glob/test_glob.py
rename to unix-ffi/glob/test_glob.py
diff --git a/python-stdlib/html.entities/html/entities.py b/unix-ffi/html.entities/html/entities.py
similarity index 100%
rename from python-stdlib/html.entities/html/entities.py
rename to unix-ffi/html.entities/html/entities.py
diff --git a/python-stdlib/html.entities/manifest.py b/unix-ffi/html.entities/manifest.py
similarity index 100%
rename from python-stdlib/html.entities/manifest.py
rename to unix-ffi/html.entities/manifest.py
diff --git a/python-stdlib/html.parser/html/parser.py b/unix-ffi/html.parser/html/parser.py
similarity index 100%
rename from python-stdlib/html.parser/html/parser.py
rename to unix-ffi/html.parser/html/parser.py
diff --git a/python-stdlib/http.client/example_client.py b/unix-ffi/http.client/example_client.py
similarity index 100%
rename from python-stdlib/http.client/example_client.py
rename to unix-ffi/http.client/example_client.py
diff --git a/python-stdlib/http.client/http/client.py b/unix-ffi/http.client/http/client.py
similarity index 100%
rename from python-stdlib/http.client/http/client.py
rename to unix-ffi/http.client/http/client.py
diff --git a/unix-ffi/machine/manifest.py b/unix-ffi/machine/manifest.py
index c0e40764..9c1f3477 100644
--- a/unix-ffi/machine/manifest.py
+++ b/unix-ffi/machine/manifest.py
@@ -2,8 +2,8 @@ metadata(version="0.2.1")
 
 # Originally written by Paul Sokolovsky.
 
-require("ffilib")
-require("os")
-require("signal")
+require("ffilib", unix_ffi=True)
+require("os", unix_ffi=True)
+require("signal", unix_ffi=True)
 
 package("machine")
diff --git a/unix-ffi/multiprocessing/manifest.py b/unix-ffi/multiprocessing/manifest.py
index d6b32411..68f2bca0 100644
--- a/unix-ffi/multiprocessing/manifest.py
+++ b/unix-ffi/multiprocessing/manifest.py
@@ -2,8 +2,8 @@ metadata(version="0.1.2")
 
 # Originally written by Paul Sokolovsky.
 
-require("os")
-require("select")
+require("os", unix_ffi=True)
+require("select", unix_ffi=True)
 require("pickle")
 
 module("multiprocessing.py")
diff --git a/unix-ffi/os/manifest.py b/unix-ffi/os/manifest.py
index 496a9e44..38cb87d5 100644
--- a/unix-ffi/os/manifest.py
+++ b/unix-ffi/os/manifest.py
@@ -2,7 +2,7 @@ metadata(version="0.6")
 
 # Originally written by Paul Sokolovsky.
 
-require("ffilib")
+require("ffilib", unix_ffi=True)
 require("errno")
 require("stat")
 
diff --git a/unix-ffi/pwd/manifest.py b/unix-ffi/pwd/manifest.py
index 26e289b4..7db3213f 100644
--- a/unix-ffi/pwd/manifest.py
+++ b/unix-ffi/pwd/manifest.py
@@ -2,6 +2,6 @@ metadata(version="0.1")
 
 # Originally written by Riccardo Magliocchetti.
 
-require("ffilib")
+require("ffilib", unix_ffi=True)
 
 module("pwd.py")
diff --git a/unix-ffi/re-pcre/manifest.py b/unix-ffi/re/manifest.py
similarity index 72%
rename from unix-ffi/re-pcre/manifest.py
rename to unix-ffi/re/manifest.py
index ca027317..cc52df47 100644
--- a/unix-ffi/re-pcre/manifest.py
+++ b/unix-ffi/re/manifest.py
@@ -2,6 +2,6 @@ metadata(version="0.2.5")
 
 # Originally written by Paul Sokolovsky.
 
-require("ffilib")
+require("ffilib", unix_ffi=True)
 
 module("re.py")
diff --git a/unix-ffi/re-pcre/re.py b/unix-ffi/re/re.py
similarity index 100%
rename from unix-ffi/re-pcre/re.py
rename to unix-ffi/re/re.py
diff --git a/unix-ffi/re-pcre/test_re.py b/unix-ffi/re/test_re.py
similarity index 100%
rename from unix-ffi/re-pcre/test_re.py
rename to unix-ffi/re/test_re.py
diff --git a/unix-ffi/select/manifest.py b/unix-ffi/select/manifest.py
index b76078cc..cadfd4e9 100644
--- a/unix-ffi/select/manifest.py
+++ b/unix-ffi/select/manifest.py
@@ -2,7 +2,7 @@ metadata(version="0.3")
 
 # Originally written by Paul Sokolovsky.
 
-require("os")
-require("ffilib")
+require("os", unix_ffi=True)
+require("ffilib", unix_ffi=True)
 
 module("select.py")
diff --git a/unix-ffi/signal/manifest.py b/unix-ffi/signal/manifest.py
index cb23542c..913bbdc8 100644
--- a/unix-ffi/signal/manifest.py
+++ b/unix-ffi/signal/manifest.py
@@ -2,6 +2,6 @@ metadata(version="0.3.2")
 
 # Originally written by Paul Sokolovsky.
 
-require("ffilib")
+require("ffilib", unix_ffi=True)
 
 module("signal.py")
diff --git a/python-stdlib/socket/manifest.py b/unix-ffi/socket/manifest.py
similarity index 100%
rename from python-stdlib/socket/manifest.py
rename to unix-ffi/socket/manifest.py
diff --git a/python-stdlib/socket/socket.py b/unix-ffi/socket/socket.py
similarity index 100%
rename from python-stdlib/socket/socket.py
rename to unix-ffi/socket/socket.py
diff --git a/unix-ffi/sqlite3/manifest.py b/unix-ffi/sqlite3/manifest.py
index 63cdf4b9..e941e1dd 100644
--- a/unix-ffi/sqlite3/manifest.py
+++ b/unix-ffi/sqlite3/manifest.py
@@ -2,6 +2,6 @@ metadata(version="0.2.4")
 
 # Originally written by Paul Sokolovsky.
 
-require("ffilib")
+require("ffilib", unix_ffi=True)
 
 module("sqlite3.py")
diff --git a/micropython/test.support/manifest.py b/unix-ffi/test.support/manifest.py
similarity index 100%
rename from micropython/test.support/manifest.py
rename to unix-ffi/test.support/manifest.py
diff --git a/micropython/test.support/test/support.py b/unix-ffi/test.support/test/support.py
similarity index 100%
rename from micropython/test.support/test/support.py
rename to unix-ffi/test.support/test/support.py
diff --git a/unix-ffi/time/manifest.py b/unix-ffi/time/manifest.py
index 32004b15..fcaaf727 100644
--- a/unix-ffi/time/manifest.py
+++ b/unix-ffi/time/manifest.py
@@ -1,5 +1,5 @@
 metadata(version="0.5")
 
-require("ffilib")
+require("ffilib", unix_ffi=True)
 
 module("time.py")
diff --git a/python-stdlib/timeit/manifest.py b/unix-ffi/timeit/manifest.py
similarity index 65%
rename from python-stdlib/timeit/manifest.py
rename to unix-ffi/timeit/manifest.py
index 67ff1590..82689bb8 100644
--- a/python-stdlib/timeit/manifest.py
+++ b/unix-ffi/timeit/manifest.py
@@ -1,9 +1,9 @@
 metadata(version="3.3.3-3")
 
-require("getopt")
+require("getopt", unix_ffi=True)
 require("itertools")
 # require("linecache") TODO
-require("time")
+require("time", unix_ffi=True)
 require("traceback")
 
 module("timeit.py")
diff --git a/python-stdlib/timeit/timeit.py b/unix-ffi/timeit/timeit.py
similarity index 100%
rename from python-stdlib/timeit/timeit.py
rename to unix-ffi/timeit/timeit.py
diff --git a/unix-ffi/ucurses/manifest.py b/unix-ffi/ucurses/manifest.py
index 8ec2675a..50648033 100644
--- a/unix-ffi/ucurses/manifest.py
+++ b/unix-ffi/ucurses/manifest.py
@@ -2,8 +2,8 @@ metadata(version="0.1.2")
 
 # Originally written by Paul Sokolovsky.
 
-require("os")
-require("tty")
-require("select")
+require("os", unix_ffi=True)
+require("tty", unix_ffi=True)
+require("select", unix_ffi=True)
 
 package("ucurses")
diff --git a/python-stdlib/unittest/manifest.py b/unix-ffi/unittest/manifest.py
similarity index 66%
rename from python-stdlib/unittest/manifest.py
rename to unix-ffi/unittest/manifest.py
index 85a5f401..3f4ddae5 100644
--- a/python-stdlib/unittest/manifest.py
+++ b/unix-ffi/unittest/manifest.py
@@ -1,6 +1,6 @@
 metadata(version="0.9.0")
 
-require("argparse")
+require("argparse", unix_ffi=True)
 require("fnmatch")
 
 module("unittest.py")
diff --git a/python-stdlib/unittest/test_unittest.py b/unix-ffi/unittest/test_unittest.py
similarity index 100%
rename from python-stdlib/unittest/test_unittest.py
rename to unix-ffi/unittest/test_unittest.py
diff --git a/python-stdlib/unittest/test_unittest_isolated.py b/unix-ffi/unittest/test_unittest_isolated.py
similarity index 100%
rename from python-stdlib/unittest/test_unittest_isolated.py
rename to unix-ffi/unittest/test_unittest_isolated.py
diff --git a/python-stdlib/unittest/unittest.py b/unix-ffi/unittest/unittest.py
similarity index 100%
rename from python-stdlib/unittest/unittest.py
rename to unix-ffi/unittest/unittest.py
diff --git a/python-stdlib/unittest/unittest_discover.py b/unix-ffi/unittest/unittest_discover.py
similarity index 100%
rename from python-stdlib/unittest/unittest_discover.py
rename to unix-ffi/unittest/unittest_discover.py
diff --git a/python-stdlib/urllib.parse/manifest.py b/unix-ffi/urllib.parse/manifest.py
similarity index 78%
rename from python-stdlib/urllib.parse/manifest.py
rename to unix-ffi/urllib.parse/manifest.py
index 4731060d..ad213bf0 100644
--- a/python-stdlib/urllib.parse/manifest.py
+++ b/unix-ffi/urllib.parse/manifest.py
@@ -1,6 +1,6 @@
 metadata(version="0.5.2")
 
-require("re-pcre")
+require("re", unix_ffi=True)
 require("collections")
 require("collections.defaultdict")
 
diff --git a/python-stdlib/urllib.parse/test_urlparse.py b/unix-ffi/urllib.parse/test_urlparse.py
similarity index 100%
rename from python-stdlib/urllib.parse/test_urlparse.py
rename to unix-ffi/urllib.parse/test_urlparse.py
diff --git a/python-stdlib/urllib.parse/urllib/parse.py b/unix-ffi/urllib.parse/urllib/parse.py
similarity index 100%
rename from python-stdlib/urllib.parse/urllib/parse.py
rename to unix-ffi/urllib.parse/urllib/parse.py