diff --git a/micropython/bluetooth/aioble/manifest.py b/micropython/bluetooth/aioble/manifest.py
index 056c909e..33701475 100644
--- a/micropython/bluetooth/aioble/manifest.py
+++ b/micropython/bluetooth/aioble/manifest.py
@@ -1,5 +1,3 @@
-import os
-
 _files = (
     "__init__.py",
     "core.py",
@@ -26,8 +24,4 @@ if options.l2cap:
 if options.security:
     _files += ("security.py",)
 
-freeze(
-    ".",
-    tuple(os.path.join("aioble", f) for f in _files),
-    opt=3,
-)
+package("aioble", files=_files)
diff --git a/micropython/test.support/manifest.py b/micropython/test.support/manifest.py
new file mode 100644
index 00000000..d927e7ee
--- /dev/null
+++ b/micropython/test.support/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1.3")
+
+package("test")
diff --git a/micropython/test.support/metadata.txt b/micropython/test.support/metadata.txt
deleted file mode 100644
index 44531b19..00000000
--- a/micropython/test.support/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype=micropython-lib
-type=package
-version = 0.1.3
diff --git a/micropython/uaiohttpclient/manifest.py b/micropython/uaiohttpclient/manifest.py
new file mode 100644
index 00000000..72dd9671
--- /dev/null
+++ b/micropython/uaiohttpclient/manifest.py
@@ -0,0 +1,5 @@
+metadata(description="HTTP client module for MicroPython uasyncio module", version="0.5.1")
+
+# Originally written by Paul Sokolovsky.
+
+module("uaiohttpclient.py")
diff --git a/micropython/uaiohttpclient/metadata.txt b/micropython/uaiohttpclient/metadata.txt
deleted file mode 100644
index 4005f784..00000000
--- a/micropython/uaiohttpclient/metadata.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.5.1
-author = Paul Sokolovsky
-desc = HTTP client module for MicroPython uasyncio module
-long_desc = README
diff --git a/micropython/ucontextlib/manifest.py b/micropython/ucontextlib/manifest.py
new file mode 100644
index 00000000..81e6e085
--- /dev/null
+++ b/micropython/ucontextlib/manifest.py
@@ -0,0 +1,5 @@
+metadata(
+    description="Minimal subset of contextlib for MicroPython low-memory ports", version="0.1.1"
+)
+
+module("ucontextlib.py")
diff --git a/micropython/ucontextlib/metadata.txt b/micropython/ucontextlib/metadata.txt
deleted file mode 100644
index df76a1d7..00000000
--- a/micropython/ucontextlib/metadata.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.1.1
-license = Python
-long_desc = Minimal subset of contextlib for MicroPython low-memory ports
diff --git a/micropython/udnspkt/manifest.py b/micropython/udnspkt/manifest.py
new file mode 100644
index 00000000..382b8dd7
--- /dev/null
+++ b/micropython/udnspkt/manifest.py
@@ -0,0 +1,5 @@
+metadata(description="Make and parse DNS packets (Sans I/O approach).", version="0.1")
+
+# Originally written by Paul Sokolovsky.
+
+module("udnspkt.py")
diff --git a/micropython/udnspkt/metadata.txt b/micropython/udnspkt/metadata.txt
deleted file mode 100644
index b3d97e3c..00000000
--- a/micropython/udnspkt/metadata.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.1
-author = Paul Sokolovsky
-desc = Make and parse DNS packets (Sans I/O approach).
diff --git a/micropython/umqtt.robust/manifest.py b/micropython/umqtt.robust/manifest.py
new file mode 100644
index 00000000..28f83d9e
--- /dev/null
+++ b/micropython/umqtt.robust/manifest.py
@@ -0,0 +1,7 @@
+metadata(
+    description='Lightweight MQTT client for MicroPython ("robust" version).', version="1.0.1"
+)
+
+# Originally written by Paul Sokolovsky.
+
+package("umqtt")
diff --git a/micropython/umqtt.robust/metadata.txt b/micropython/umqtt.robust/metadata.txt
deleted file mode 100644
index aef748f7..00000000
--- a/micropython/umqtt.robust/metadata.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-srctype = micropython-lib
-type = package
-version = 1.0.1
-author = Paul Sokolovsky
-desc = Lightweight MQTT client for MicroPython ("robust" version).
-long_desc = README.rst
diff --git a/micropython/umqtt.simple/manifest.py b/micropython/umqtt.simple/manifest.py
new file mode 100644
index 00000000..19617a5e
--- /dev/null
+++ b/micropython/umqtt.simple/manifest.py
@@ -0,0 +1,5 @@
+metadata(description="Lightweight MQTT client for MicroPython.", version="1.3.4")
+
+# Originally written by Paul Sokolovsky.
+
+package("umqtt")
diff --git a/micropython/umqtt.simple/metadata.txt b/micropython/umqtt.simple/metadata.txt
deleted file mode 100644
index c95ee605..00000000
--- a/micropython/umqtt.simple/metadata.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-srctype = micropython-lib
-type = package
-version = 1.3.4
-author = Paul Sokolovsky
-desc = Lightweight MQTT client for MicroPython.
-long_desc = README.rst
diff --git a/micropython/upysh/manifest.py b/micropython/upysh/manifest.py
new file mode 100644
index 00000000..2d36a9ab
--- /dev/null
+++ b/micropython/upysh/manifest.py
@@ -0,0 +1,3 @@
+metadata(description="Minimalistic file shell using native Python syntax.", version="0.6.1")
+
+module("upysh.py")
diff --git a/micropython/upysh/metadata.txt b/micropython/upysh/metadata.txt
deleted file mode 100644
index ff11de93..00000000
--- a/micropython/upysh/metadata.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.6.1
-desc = Minimalistic file shell using native Python syntax.
-long_desc = Minimalistic file shell using native Python syntax.
diff --git a/micropython/urllib.urequest/manifest.py b/micropython/urllib.urequest/manifest.py
new file mode 100644
index 00000000..cb4c1569
--- /dev/null
+++ b/micropython/urllib.urequest/manifest.py
@@ -0,0 +1,5 @@
+metadata(version="0.6")
+
+# Originally written by Paul Sokolovsky.
+
+package("urllib")
diff --git a/micropython/urllib.urequest/metadata.txt b/micropython/urllib.urequest/metadata.txt
deleted file mode 100644
index 9db40027..00000000
--- a/micropython/urllib.urequest/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = micropython-lib
-type = package
-version = 0.6
-author = Paul Sokolovsky
diff --git a/micropython/utarfile/manifest.py b/micropython/utarfile/manifest.py
new file mode 100644
index 00000000..65bd68b9
--- /dev/null
+++ b/micropython/utarfile/manifest.py
@@ -0,0 +1,5 @@
+metadata(description="Lightweight tarfile module subset", version="0.3.2")
+
+# Originally written by Paul Sokolovsky.
+
+module("utarfile.py")
diff --git a/micropython/utarfile/metadata.txt b/micropython/utarfile/metadata.txt
deleted file mode 100644
index 4dab5614..00000000
--- a/micropython/utarfile/metadata.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.3.2
-author = Paul Sokolovsky
-long_desc = Lightweight tarfile module subset
diff --git a/micropython/xmltok/manifest.py b/micropython/xmltok/manifest.py
new file mode 100644
index 00000000..efbe41cc
--- /dev/null
+++ b/micropython/xmltok/manifest.py
@@ -0,0 +1,5 @@
+metadata(description="Simple XML tokenizer", version="0.2")
+
+# Originally written by Paul Sokolovsky.
+
+module("xmltok.py")
diff --git a/micropython/xmltok/metadata.txt b/micropython/xmltok/metadata.txt
deleted file mode 100644
index f25bb248..00000000
--- a/micropython/xmltok/metadata.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.2
-author = Paul Sokolovsky
-long_desc = Simple XML tokenizer
diff --git a/python-ecosys/iperf3/manifest.py b/python-ecosys/iperf3/manifest.py
new file mode 100644
index 00000000..dafba2e1
--- /dev/null
+++ b/python-ecosys/iperf3/manifest.py
@@ -0,0 +1 @@
+module("iperf3.py")
diff --git a/python-ecosys/pyjwt/manifest.py b/python-ecosys/pyjwt/manifest.py
new file mode 100644
index 00000000..8e9b22c1
--- /dev/null
+++ b/python-ecosys/pyjwt/manifest.py
@@ -0,0 +1,5 @@
+metadata(version="0.1")
+
+require("hmac")
+
+module("jwt.py")
diff --git a/python-ecosys/urequests/manifest.py b/python-ecosys/urequests/manifest.py
new file mode 100644
index 00000000..5fd2e8a2
--- /dev/null
+++ b/python-ecosys/urequests/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.7.0")
+
+module("urequests.py")
diff --git a/python-ecosys/urequests/metadata.txt b/python-ecosys/urequests/metadata.txt
deleted file mode 100644
index 04861d96..00000000
--- a/python-ecosys/urequests/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.7.0
diff --git a/python-stdlib/__future__/manifest.py b/python-stdlib/__future__/manifest.py
new file mode 100644
index 00000000..4b4de03c
--- /dev/null
+++ b/python-stdlib/__future__/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.0.3")
+
+module("__future__.py")
diff --git a/python-stdlib/__future__/metadata.txt b/python-stdlib/__future__/metadata.txt
deleted file mode 100644
index 560b8578..00000000
--- a/python-stdlib/__future__/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype=dummy
-type=module
-version=0.0.3
-dist_name=future
diff --git a/python-stdlib/_markupbase/manifest.py b/python-stdlib/_markupbase/manifest.py
new file mode 100644
index 00000000..470f8a45
--- /dev/null
+++ b/python-stdlib/_markupbase/manifest.py
@@ -0,0 +1,5 @@
+metadata(version="3.3.3-1")
+
+require("re-pcre")
+
+module("_markupbase.py")
diff --git a/python-stdlib/_markupbase/metadata.txt b/python-stdlib/_markupbase/metadata.txt
deleted file mode 100644
index d1d9150e..00000000
--- a/python-stdlib/_markupbase/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = cpython
-type = module
-version = 3.3.3-1
-depends = re-pcre
diff --git a/python-stdlib/abc/manifest.py b/python-stdlib/abc/manifest.py
new file mode 100644
index 00000000..66495fd7
--- /dev/null
+++ b/python-stdlib/abc/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.0.1")
+
+module("abc.py")
diff --git a/python-stdlib/abc/metadata.txt b/python-stdlib/abc/metadata.txt
deleted file mode 100644
index abee00b4..00000000
--- a/python-stdlib/abc/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype=dummy
-type=module
-version = 0.0.1
diff --git a/python-stdlib/argparse/manifest.py b/python-stdlib/argparse/manifest.py
new file mode 100644
index 00000000..034d73c7
--- /dev/null
+++ b/python-stdlib/argparse/manifest.py
@@ -0,0 +1,5 @@
+metadata(version="0.4")
+
+# Originally written by Damien George.
+
+module("argparse.py")
diff --git a/python-stdlib/argparse/metadata.txt b/python-stdlib/argparse/metadata.txt
deleted file mode 100644
index a724aace..00000000
--- a/python-stdlib/argparse/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.4
-author = Damien George
diff --git a/python-stdlib/base64/manifest.py b/python-stdlib/base64/manifest.py
new file mode 100644
index 00000000..4268481a
--- /dev/null
+++ b/python-stdlib/base64/manifest.py
@@ -0,0 +1,7 @@
+metadata(version="3.3.3-4")
+
+require("binascii")
+require("re-pcre")
+require("struct")
+
+module("base64.py")
diff --git a/python-stdlib/base64/metadata.txt b/python-stdlib/base64/metadata.txt
deleted file mode 100644
index f1955821..00000000
--- a/python-stdlib/base64/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype=cpython
-type=module
-version = 3.3.3-4
-depends = binascii, re-pcre, struct
diff --git a/python-stdlib/binascii/manifest.py b/python-stdlib/binascii/manifest.py
new file mode 100644
index 00000000..4a478f26
--- /dev/null
+++ b/python-stdlib/binascii/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="2.4.0-5")
+
+module("binascii.py")
diff --git a/python-stdlib/binascii/metadata.txt b/python-stdlib/binascii/metadata.txt
deleted file mode 100644
index 7baf07a2..00000000
--- a/python-stdlib/binascii/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = cpython
-type = module
-version = 2.4.0-5
diff --git a/python-stdlib/cgi/manifest.py b/python-stdlib/cgi/manifest.py
new file mode 100644
index 00000000..b1db6ce3
--- /dev/null
+++ b/python-stdlib/cgi/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="3.3.3-2")
+
+module("cgi.py")
diff --git a/python-stdlib/cgi/metadata.txt b/python-stdlib/cgi/metadata.txt
deleted file mode 100644
index 75dcaed4..00000000
--- a/python-stdlib/cgi/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype=cpython
-type=module
-version = 3.3.3-2
diff --git a/python-stdlib/cmd/manifest.py b/python-stdlib/cmd/manifest.py
new file mode 100644
index 00000000..572f97df
--- /dev/null
+++ b/python-stdlib/cmd/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="3.4.0-2")
+
+module("cmd.py")
diff --git a/python-stdlib/cmd/metadata.txt b/python-stdlib/cmd/metadata.txt
deleted file mode 100644
index 8ec1fe5d..00000000
--- a/python-stdlib/cmd/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = cpython
-type = module
-version = 3.4.0-2
diff --git a/python-stdlib/collections.defaultdict/manifest.py b/python-stdlib/collections.defaultdict/manifest.py
new file mode 100644
index 00000000..bbce4be1
--- /dev/null
+++ b/python-stdlib/collections.defaultdict/manifest.py
@@ -0,0 +1,5 @@
+metadata(version="0.3")
+
+# Originally written by Paul Sokolovsky.
+
+package("collections")
diff --git a/python-stdlib/collections.defaultdict/metadata.txt b/python-stdlib/collections.defaultdict/metadata.txt
deleted file mode 100644
index 0ae0cdcd..00000000
--- a/python-stdlib/collections.defaultdict/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = micropython-lib
-type = package
-version = 0.3
-author = Paul Sokolovsky
diff --git a/python-stdlib/collections.deque/manifest.py b/python-stdlib/collections.deque/manifest.py
new file mode 100644
index 00000000..e4306fae
--- /dev/null
+++ b/python-stdlib/collections.deque/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1.3")
+
+package("collections")
diff --git a/python-stdlib/collections.deque/metadata.txt b/python-stdlib/collections.deque/metadata.txt
deleted file mode 100644
index 820b24dd..00000000
--- a/python-stdlib/collections.deque/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = micropython-lib
-type = package
-version = 0.1.3
diff --git a/python-stdlib/collections/manifest.py b/python-stdlib/collections/manifest.py
new file mode 100644
index 00000000..d5ef6947
--- /dev/null
+++ b/python-stdlib/collections/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1.2")
+
+package("collections")
diff --git a/python-stdlib/collections/metadata.txt b/python-stdlib/collections/metadata.txt
deleted file mode 100644
index c50f2e45..00000000
--- a/python-stdlib/collections/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = micropython-lib
-type = package
-version = 0.1.2
diff --git a/python-stdlib/contextlib/manifest.py b/python-stdlib/contextlib/manifest.py
new file mode 100644
index 00000000..ab7ae577
--- /dev/null
+++ b/python-stdlib/contextlib/manifest.py
@@ -0,0 +1,6 @@
+metadata(description="Port of contextlib for micropython", version="3.4.2-4")
+
+require("ucontextlib")
+require("collections")
+
+module("contextlib.py")
diff --git a/python-stdlib/contextlib/metadata.txt b/python-stdlib/contextlib/metadata.txt
deleted file mode 100644
index 3664c376..00000000
--- a/python-stdlib/contextlib/metadata.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-srctype = cpython
-type = module
-version = 3.4.2-4
-long_desc = Port of contextlib for micropython
-depends = ucontextlib, collections
diff --git a/python-stdlib/copy/manifest.py b/python-stdlib/copy/manifest.py
new file mode 100644
index 00000000..909ac205
--- /dev/null
+++ b/python-stdlib/copy/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="3.3.3-2")
+
+module("copy.py")
diff --git a/python-stdlib/copy/metadata.txt b/python-stdlib/copy/metadata.txt
deleted file mode 100644
index cb5ffa32..00000000
--- a/python-stdlib/copy/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = cpython
-type = module
-version = 3.3.3-2
diff --git a/python-stdlib/curses.ascii/manifest.py b/python-stdlib/curses.ascii/manifest.py
new file mode 100644
index 00000000..6a651808
--- /dev/null
+++ b/python-stdlib/curses.ascii/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="3.4.2-1")
+
+package("curses")
diff --git a/python-stdlib/curses.ascii/metadata.txt b/python-stdlib/curses.ascii/metadata.txt
deleted file mode 100644
index 5ed1bbef..00000000
--- a/python-stdlib/curses.ascii/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = cpython
-type = package
-version = 3.4.2-1
diff --git a/python-stdlib/datetime/manifest.py b/python-stdlib/datetime/manifest.py
new file mode 100644
index 00000000..017189ce
--- /dev/null
+++ b/python-stdlib/datetime/manifest.py
@@ -0,0 +1,5 @@
+metadata(version="4.0.0")
+
+# Originally written by Lorenzo Cappelletti.
+
+module("datetime.py")
diff --git a/python-stdlib/datetime/metadata.txt b/python-stdlib/datetime/metadata.txt
deleted file mode 100644
index ee879327..00000000
--- a/python-stdlib/datetime/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 4.0.0
-author = Lorenzo Cappelletti
diff --git a/python-stdlib/email.charset/manifest.py b/python-stdlib/email.charset/manifest.py
new file mode 100644
index 00000000..208dd9a9
--- /dev/null
+++ b/python-stdlib/email.charset/manifest.py
@@ -0,0 +1,7 @@
+# email.charset
+
+require("functools")
+require("email.encoders")
+require("email.errors")
+
+package("email", version="0.5.1")
diff --git a/python-stdlib/email.charset/metadata.txt b/python-stdlib/email.charset/metadata.txt
deleted file mode 100644
index 138ad19d..00000000
--- a/python-stdlib/email.charset/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = cpython
-type = package
-version = 0.5.1
-depends = functools, email.encoders, email.errors
diff --git a/python-stdlib/email.encoders/manifest.py b/python-stdlib/email.encoders/manifest.py
new file mode 100644
index 00000000..f59bf11b
--- /dev/null
+++ b/python-stdlib/email.encoders/manifest.py
@@ -0,0 +1,9 @@
+metadata(version="0.5.1")
+
+require("base64")
+require("binascii")
+require("quopri")
+require("re-pcre")
+require("string")
+
+package("email")
diff --git a/python-stdlib/email.encoders/metadata.txt b/python-stdlib/email.encoders/metadata.txt
deleted file mode 100644
index 359304fc..00000000
--- a/python-stdlib/email.encoders/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = cpython
-type = package
-version = 0.5.1
-depends = base64, binascii, quopri, re-pcre, string
diff --git a/python-stdlib/email.errors/manifest.py b/python-stdlib/email.errors/manifest.py
new file mode 100644
index 00000000..6a2e0be7
--- /dev/null
+++ b/python-stdlib/email.errors/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.5.1")
+
+package("email")
diff --git a/python-stdlib/email.errors/metadata.txt b/python-stdlib/email.errors/metadata.txt
deleted file mode 100644
index f07adb24..00000000
--- a/python-stdlib/email.errors/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = cpython
-type = package
-version = 0.5.1
diff --git a/python-stdlib/email.feedparser/manifest.py b/python-stdlib/email.feedparser/manifest.py
new file mode 100644
index 00000000..bc0da6dc
--- /dev/null
+++ b/python-stdlib/email.feedparser/manifest.py
@@ -0,0 +1,8 @@
+# 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.feedparser/metadata.txt b/python-stdlib/email.feedparser/metadata.txt
deleted file mode 100644
index b6622ec9..00000000
--- a/python-stdlib/email.feedparser/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = cpython
-type = package
-version = 0.5.1
-depends = re-pcre, email.errors, email.message, email.internal
diff --git a/python-stdlib/email.header/manifest.py b/python-stdlib/email.header/manifest.py
new file mode 100644
index 00000000..c901a52e
--- /dev/null
+++ b/python-stdlib/email.header/manifest.py
@@ -0,0 +1,9 @@
+# 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.header/metadata.txt b/python-stdlib/email.header/metadata.txt
deleted file mode 100644
index adc8d7f2..00000000
--- a/python-stdlib/email.header/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = cpython
-type = package
-version = 0.5.2
-depends = re-pcre, binascii, email.encoders, email.errors, email.charset
diff --git a/python-stdlib/email.internal/manifest.py b/python-stdlib/email.internal/manifest.py
new file mode 100644
index 00000000..602d1ce3
--- /dev/null
+++ b/python-stdlib/email.internal/manifest.py
@@ -0,0 +1,15 @@
+# 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.internal/metadata.txt b/python-stdlib/email.internal/metadata.txt
deleted file mode 100644
index af3090fd..00000000
--- a/python-stdlib/email.internal/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = cpython
-type = package
-version = 0.5.1
-depends = re-pcre, base64, binascii, functools, string, calendar, abc, email.errors, email.header, email.charset, email.utils
diff --git a/python-stdlib/email.message/manifest.py b/python-stdlib/email.message/manifest.py
new file mode 100644
index 00000000..1f1fa48a
--- /dev/null
+++ b/python-stdlib/email.message/manifest.py
@@ -0,0 +1,11 @@
+# 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.message/metadata.txt b/python-stdlib/email.message/metadata.txt
deleted file mode 100644
index feedfa9e..00000000
--- a/python-stdlib/email.message/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = cpython
-type = package
-version = 0.5.3
-depends = re-pcre, uu, base64, binascii, email.utils, email.errors, email.charset
diff --git a/python-stdlib/email.parser/manifest.py b/python-stdlib/email.parser/manifest.py
new file mode 100644
index 00000000..095e3224
--- /dev/null
+++ b/python-stdlib/email.parser/manifest.py
@@ -0,0 +1,8 @@
+# email.parser
+
+require("warnings")
+require("email.feedparser")
+require("email.message")
+require("email.internal")
+
+package("email", version="0.5.1")
diff --git a/python-stdlib/email.parser/metadata.txt b/python-stdlib/email.parser/metadata.txt
deleted file mode 100644
index 95316b93..00000000
--- a/python-stdlib/email.parser/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = cpython
-type = package
-version = 0.5.1
-depends = warnings, email.feedparser, email.message, email.internal
diff --git a/python-stdlib/email.utils/manifest.py b/python-stdlib/email.utils/manifest.py
new file mode 100644
index 00000000..30770226
--- /dev/null
+++ b/python-stdlib/email.utils/manifest.py
@@ -0,0 +1,13 @@
+metadata(version="3.3.3-2")
+
+require("os")
+require("re-pcre")
+require("base64")
+require("random")
+require("datetime")
+require("urllib.parse")
+require("warnings")
+require("quopri")
+require("email.charset")
+
+package("email")
diff --git a/python-stdlib/email.utils/metadata.txt b/python-stdlib/email.utils/metadata.txt
deleted file mode 100644
index 833c02a5..00000000
--- a/python-stdlib/email.utils/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = cpython
-type = package
-version = 3.3.3-2
-depends = os, re-pcre, base64, random, datetime, urllib.parse, warnings, quopri, email.charset
diff --git a/python-stdlib/errno/manifest.py b/python-stdlib/errno/manifest.py
new file mode 100644
index 00000000..a1e1e6c7
--- /dev/null
+++ b/python-stdlib/errno/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1.4")
+
+module("errno.py")
diff --git a/python-stdlib/errno/metadata.txt b/python-stdlib/errno/metadata.txt
deleted file mode 100644
index c8ecc053..00000000
--- a/python-stdlib/errno/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.1.4
diff --git a/python-stdlib/fnmatch/manifest.py b/python-stdlib/fnmatch/manifest.py
new file mode 100644
index 00000000..8f19bb8f
--- /dev/null
+++ b/python-stdlib/fnmatch/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.6.0")
+
+module("fnmatch.py")
diff --git a/python-stdlib/fnmatch/metadata.txt b/python-stdlib/fnmatch/metadata.txt
deleted file mode 100644
index 27b8c03f..00000000
--- a/python-stdlib/fnmatch/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = cpython
-type = module
-version = 0.6.0
diff --git a/python-stdlib/functools/manifest.py b/python-stdlib/functools/manifest.py
new file mode 100644
index 00000000..634413c1
--- /dev/null
+++ b/python-stdlib/functools/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.0.7")
+
+module("functools.py")
diff --git a/python-stdlib/functools/metadata.txt b/python-stdlib/functools/metadata.txt
deleted file mode 100644
index 3b48c032..00000000
--- a/python-stdlib/functools/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.0.7
diff --git a/python-stdlib/getopt/manifest.py b/python-stdlib/getopt/manifest.py
new file mode 100644
index 00000000..437f4068
--- /dev/null
+++ b/python-stdlib/getopt/manifest.py
@@ -0,0 +1,5 @@
+metadata(version="3.3.3-1")
+
+require("os")
+
+module("getopt.py")
diff --git a/python-stdlib/getopt/metadata.txt b/python-stdlib/getopt/metadata.txt
deleted file mode 100644
index 58db3c22..00000000
--- a/python-stdlib/getopt/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = cpython
-type = module
-version = 3.3.3-1
-depends = os
diff --git a/python-stdlib/glob/manifest.py b/python-stdlib/glob/manifest.py
new file mode 100644
index 00000000..e4cb7ccc
--- /dev/null
+++ b/python-stdlib/glob/manifest.py
@@ -0,0 +1,7 @@
+# glob
+
+require("os")
+require("re-pcre")
+require("fnmatch")
+
+module("glob.py", version="0.5.2")
diff --git a/python-stdlib/glob/metadata.txt b/python-stdlib/glob/metadata.txt
deleted file mode 100644
index 870dfba1..00000000
--- a/python-stdlib/glob/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = cpython
-type = module
-version = 0.5.2
-depends = os, re-pcre, fnmatch
diff --git a/python-stdlib/gzip/manifest.py b/python-stdlib/gzip/manifest.py
new file mode 100644
index 00000000..eab70e56
--- /dev/null
+++ b/python-stdlib/gzip/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1.1")
+
+module("gzip.py")
diff --git a/python-stdlib/gzip/metadata.txt b/python-stdlib/gzip/metadata.txt
deleted file mode 100644
index a9265f64..00000000
--- a/python-stdlib/gzip/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype=micropython-lib
-type=module
-version = 0.1.1
diff --git a/python-stdlib/hashlib/manifest.py b/python-stdlib/hashlib/manifest.py
new file mode 100644
index 00000000..106168ba
--- /dev/null
+++ b/python-stdlib/hashlib/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="2.4.0-4")
+
+package("hashlib")
diff --git a/python-stdlib/hashlib/metadata.txt b/python-stdlib/hashlib/metadata.txt
deleted file mode 100644
index 5cbf6235..00000000
--- a/python-stdlib/hashlib/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = cpython
-type = package
-version = 2.4.0-4
diff --git a/python-stdlib/heapq/manifest.py b/python-stdlib/heapq/manifest.py
new file mode 100644
index 00000000..1d71a318
--- /dev/null
+++ b/python-stdlib/heapq/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.9.3")
+
+module("heapq.py")
diff --git a/python-stdlib/heapq/metadata.txt b/python-stdlib/heapq/metadata.txt
deleted file mode 100644
index c521dd0a..00000000
--- a/python-stdlib/heapq/metadata.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-srctype = cpython
-type = module
-version = 0.9.3
-# Module uses in *some* functions, but we don't want to depend on it
-#depends = itertools
diff --git a/python-stdlib/hmac/manifest.py b/python-stdlib/hmac/manifest.py
new file mode 100644
index 00000000..92b8b18e
--- /dev/null
+++ b/python-stdlib/hmac/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="3.4.2-3")
+
+module("hmac.py")
diff --git a/python-stdlib/hmac/metadata.txt b/python-stdlib/hmac/metadata.txt
deleted file mode 100644
index ee8bd9f9..00000000
--- a/python-stdlib/hmac/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = cpython
-type = module
-version = 3.4.2-3
diff --git a/python-stdlib/html.entities/manifest.py b/python-stdlib/html.entities/manifest.py
new file mode 100644
index 00000000..0a612905
--- /dev/null
+++ b/python-stdlib/html.entities/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="3.3.3-1")
+
+package("html")
diff --git a/python-stdlib/html.entities/metadata.txt b/python-stdlib/html.entities/metadata.txt
deleted file mode 100644
index 580cce68..00000000
--- a/python-stdlib/html.entities/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype=cpython
-type=package
-version = 3.3.3-1
diff --git a/python-stdlib/html.parser/manifest.py b/python-stdlib/html.parser/manifest.py
new file mode 100644
index 00000000..44a41c31
--- /dev/null
+++ b/python-stdlib/html.parser/manifest.py
@@ -0,0 +1,8 @@
+# html.parser
+
+require("_markupbase")
+require("warnings")
+require("html.entities")
+require("re-pcre")
+
+package("html", version="3.3.3-2")
diff --git a/python-stdlib/html.parser/metadata.txt b/python-stdlib/html.parser/metadata.txt
deleted file mode 100644
index 036766fa..00000000
--- a/python-stdlib/html.parser/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = cpython
-type = package
-version = 3.3.3-2
-depends = _markupbase, warnings, html.entities, re-pcre
diff --git a/python-stdlib/html/manifest.py b/python-stdlib/html/manifest.py
new file mode 100644
index 00000000..2f0dcec7
--- /dev/null
+++ b/python-stdlib/html/manifest.py
@@ -0,0 +1,5 @@
+metadata(version="3.3.3-2")
+
+require("string")
+
+package("html")
diff --git a/python-stdlib/html/metadata.txt b/python-stdlib/html/metadata.txt
deleted file mode 100644
index 96505cda..00000000
--- a/python-stdlib/html/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = cpython
-type = package
-version = 3.3.3-2
-depends = string
diff --git a/python-stdlib/http.client/manifest.py b/python-stdlib/http.client/manifest.py
new file mode 100644
index 00000000..119d08f3
--- /dev/null
+++ b/python-stdlib/http.client/manifest.py
@@ -0,0 +1,10 @@
+# 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/http.client/metadata.txt b/python-stdlib/http.client/metadata.txt
deleted file mode 100644
index 1b2fb96d..00000000
--- a/python-stdlib/http.client/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = cpython
-type = package
-version = 0.5.1
-depends = email.parser, email.message, socket, collections, urllib.parse, warnings
diff --git a/python-stdlib/inspect/manifest.py b/python-stdlib/inspect/manifest.py
new file mode 100644
index 00000000..a9d5a238
--- /dev/null
+++ b/python-stdlib/inspect/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1.2")
+
+module("inspect.py")
diff --git a/python-stdlib/inspect/metadata.txt b/python-stdlib/inspect/metadata.txt
deleted file mode 100644
index 2254c557..00000000
--- a/python-stdlib/inspect/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.1.2
diff --git a/python-stdlib/io/manifest.py b/python-stdlib/io/manifest.py
new file mode 100644
index 00000000..ba1659ce
--- /dev/null
+++ b/python-stdlib/io/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1")
+
+module("io.py")
diff --git a/python-stdlib/io/metadata.txt b/python-stdlib/io/metadata.txt
deleted file mode 100644
index abe46bcf..00000000
--- a/python-stdlib/io/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = dummy
-type = module
-version = 0.1
diff --git a/python-stdlib/itertools/manifest.py b/python-stdlib/itertools/manifest.py
new file mode 100644
index 00000000..80ebd502
--- /dev/null
+++ b/python-stdlib/itertools/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.2.3")
+
+module("itertools.py")
diff --git a/python-stdlib/itertools/metadata.txt b/python-stdlib/itertools/metadata.txt
deleted file mode 100644
index d1c5847b..00000000
--- a/python-stdlib/itertools/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.2.3
diff --git a/python-stdlib/locale/manifest.py b/python-stdlib/locale/manifest.py
new file mode 100644
index 00000000..9d56ae6a
--- /dev/null
+++ b/python-stdlib/locale/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.0.2")
+
+module("locale.py")
diff --git a/python-stdlib/locale/metadata.txt b/python-stdlib/locale/metadata.txt
deleted file mode 100644
index fda992a9..00000000
--- a/python-stdlib/locale/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype=dummy
-type=module
-version = 0.0.2
diff --git a/python-stdlib/logging/manifest.py b/python-stdlib/logging/manifest.py
new file mode 100644
index 00000000..17601509
--- /dev/null
+++ b/python-stdlib/logging/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.3")
+
+module("logging.py")
diff --git a/python-stdlib/logging/metadata.txt b/python-stdlib/logging/metadata.txt
deleted file mode 100644
index a1ff78f6..00000000
--- a/python-stdlib/logging/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.3
diff --git a/python-stdlib/operator/manifest.py b/python-stdlib/operator/manifest.py
new file mode 100644
index 00000000..0d53e597
--- /dev/null
+++ b/python-stdlib/operator/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1.1")
+
+module("operator.py")
diff --git a/python-stdlib/operator/metadata.txt b/python-stdlib/operator/metadata.txt
deleted file mode 100644
index a90b2ef3..00000000
--- a/python-stdlib/operator/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.1.1
diff --git a/python-stdlib/os.path/manifest.py b/python-stdlib/os.path/manifest.py
new file mode 100644
index 00000000..920d522c
--- /dev/null
+++ b/python-stdlib/os.path/manifest.py
@@ -0,0 +1,7 @@
+metadata(version="0.1.3")
+
+# Originally written by Paul Sokolovsky.
+
+require("os")
+
+package("os")
diff --git a/python-stdlib/os.path/metadata.txt b/python-stdlib/os.path/metadata.txt
deleted file mode 100644
index fc0e6430..00000000
--- a/python-stdlib/os.path/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = micropython-lib
-type = package
-version = 0.1.3
-author = Paul Sokolovsky
diff --git a/python-stdlib/os/manifest.py b/python-stdlib/os/manifest.py
new file mode 100644
index 00000000..7cdeee65
--- /dev/null
+++ b/python-stdlib/os/manifest.py
@@ -0,0 +1,5 @@
+metadata(version="0.6")
+
+# Originally written by Paul Sokolovsky.
+
+package("os")
diff --git a/python-stdlib/os/metadata.txt b/python-stdlib/os/metadata.txt
deleted file mode 100644
index 9db40027..00000000
--- a/python-stdlib/os/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = micropython-lib
-type = package
-version = 0.6
-author = Paul Sokolovsky
diff --git a/python-stdlib/pickle/manifest.py b/python-stdlib/pickle/manifest.py
new file mode 100644
index 00000000..0f6fbf76
--- /dev/null
+++ b/python-stdlib/pickle/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1")
+
+module("pickle.py")
diff --git a/python-stdlib/pickle/metadata.txt b/python-stdlib/pickle/metadata.txt
deleted file mode 100644
index 3fa13ba0..00000000
--- a/python-stdlib/pickle/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype=dummy
-type=module
-version = 0.1
diff --git a/python-stdlib/pkg_resources/manifest.py b/python-stdlib/pkg_resources/manifest.py
new file mode 100644
index 00000000..ba316c9c
--- /dev/null
+++ b/python-stdlib/pkg_resources/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.2.1")
+
+module("pkg_resources.py")
diff --git a/python-stdlib/pkg_resources/metadata.txt b/python-stdlib/pkg_resources/metadata.txt
deleted file mode 100644
index 47384f3b..00000000
--- a/python-stdlib/pkg_resources/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype=micropython-lib
-type=module
-version = 0.2.1
diff --git a/python-stdlib/pkgutil/manifest.py b/python-stdlib/pkgutil/manifest.py
new file mode 100644
index 00000000..5e5f13b2
--- /dev/null
+++ b/python-stdlib/pkgutil/manifest.py
@@ -0,0 +1,5 @@
+metadata(version="0.1.1")
+
+require("pkg_resources")
+
+module("pkgutil.py")
diff --git a/python-stdlib/pkgutil/metadata.txt b/python-stdlib/pkgutil/metadata.txt
deleted file mode 100644
index ab1816c8..00000000
--- a/python-stdlib/pkgutil/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.1.1
-depends = pkg_resources
diff --git a/python-stdlib/pprint/manifest.py b/python-stdlib/pprint/manifest.py
new file mode 100644
index 00000000..9c0ebe9e
--- /dev/null
+++ b/python-stdlib/pprint/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.0.4")
+
+module("pprint.py")
diff --git a/python-stdlib/pprint/metadata.txt b/python-stdlib/pprint/metadata.txt
deleted file mode 100644
index 03253b0c..00000000
--- a/python-stdlib/pprint/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype=dummy
-type=module
-version = 0.0.4
diff --git a/python-stdlib/pystone/manifest.py b/python-stdlib/pystone/manifest.py
new file mode 100644
index 00000000..2a25db81
--- /dev/null
+++ b/python-stdlib/pystone/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="3.4.2-2")
+
+module("pystone.py")
diff --git a/python-stdlib/pystone/metadata.txt b/python-stdlib/pystone/metadata.txt
deleted file mode 100644
index cca4b9d1..00000000
--- a/python-stdlib/pystone/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = cpython
-type = module
-version = 3.4.2-2
diff --git a/python-stdlib/pystone_lowmem/manifest.py b/python-stdlib/pystone_lowmem/manifest.py
new file mode 100644
index 00000000..c46ec68e
--- /dev/null
+++ b/python-stdlib/pystone_lowmem/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="3.4.2-4")
+
+module("pystone_lowmem.py")
diff --git a/python-stdlib/pystone_lowmem/metadata.txt b/python-stdlib/pystone_lowmem/metadata.txt
deleted file mode 100644
index ddb4a3c4..00000000
--- a/python-stdlib/pystone_lowmem/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = cpython
-type = module
-version = 3.4.2-4
diff --git a/python-stdlib/quopri/manifest.py b/python-stdlib/quopri/manifest.py
new file mode 100644
index 00000000..b7336972
--- /dev/null
+++ b/python-stdlib/quopri/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.5.1")
+
+module("quopri.py")
diff --git a/python-stdlib/quopri/metadata.txt b/python-stdlib/quopri/metadata.txt
deleted file mode 100644
index 3b1a1930..00000000
--- a/python-stdlib/quopri/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype=cpython
-type=module
-version = 0.5.1
diff --git a/python-stdlib/random/manifest.py b/python-stdlib/random/manifest.py
new file mode 100644
index 00000000..fcd10007
--- /dev/null
+++ b/python-stdlib/random/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.2")
+
+module("random.py")
diff --git a/python-stdlib/random/metadata.txt b/python-stdlib/random/metadata.txt
deleted file mode 100644
index 8fbfc2b3..00000000
--- a/python-stdlib/random/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype=dummy
-type=module
-version = 0.2
diff --git a/python-stdlib/shutil/manifest.py b/python-stdlib/shutil/manifest.py
new file mode 100644
index 00000000..385d50ad
--- /dev/null
+++ b/python-stdlib/shutil/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.0.3")
+
+module("shutil.py")
diff --git a/python-stdlib/shutil/metadata.txt b/python-stdlib/shutil/metadata.txt
deleted file mode 100644
index 1a982226..00000000
--- a/python-stdlib/shutil/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype=micropython-lib
-type=module
-version = 0.0.3
diff --git a/python-stdlib/socket/manifest.py b/python-stdlib/socket/manifest.py
new file mode 100644
index 00000000..a0a384d3
--- /dev/null
+++ b/python-stdlib/socket/manifest.py
@@ -0,0 +1,5 @@
+metadata(version="0.5.2")
+
+# Originally written by Paul Sokolovsky.
+
+module("socket.py")
diff --git a/python-stdlib/socket/metadata.txt b/python-stdlib/socket/metadata.txt
deleted file mode 100644
index e84d96ba..00000000
--- a/python-stdlib/socket/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.5.2
-author = Paul Sokolovsky
diff --git a/python-stdlib/ssl/manifest.py b/python-stdlib/ssl/manifest.py
new file mode 100644
index 00000000..fb92cdf4
--- /dev/null
+++ b/python-stdlib/ssl/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1")
+
+module("ssl.py")
diff --git a/python-stdlib/ssl/metadata.txt b/python-stdlib/ssl/metadata.txt
deleted file mode 100644
index abe46bcf..00000000
--- a/python-stdlib/ssl/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = dummy
-type = module
-version = 0.1
diff --git a/python-stdlib/stat/manifest.py b/python-stdlib/stat/manifest.py
new file mode 100644
index 00000000..a4a0b811
--- /dev/null
+++ b/python-stdlib/stat/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.5.1")
+
+module("stat.py")
diff --git a/python-stdlib/stat/metadata.txt b/python-stdlib/stat/metadata.txt
deleted file mode 100644
index 3b1a1930..00000000
--- a/python-stdlib/stat/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype=cpython
-type=module
-version = 0.5.1
diff --git a/python-stdlib/string/manifest.py b/python-stdlib/string/manifest.py
new file mode 100644
index 00000000..a6b552be
--- /dev/null
+++ b/python-stdlib/string/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1.1")
+
+module("string.py")
diff --git a/python-stdlib/string/metadata.txt b/python-stdlib/string/metadata.txt
deleted file mode 100644
index a9265f64..00000000
--- a/python-stdlib/string/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype=micropython-lib
-type=module
-version = 0.1.1
diff --git a/python-stdlib/struct/manifest.py b/python-stdlib/struct/manifest.py
new file mode 100644
index 00000000..4535d780
--- /dev/null
+++ b/python-stdlib/struct/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1.1")
+
+module("struct.py")
diff --git a/python-stdlib/struct/metadata.txt b/python-stdlib/struct/metadata.txt
deleted file mode 100644
index a90b2ef3..00000000
--- a/python-stdlib/struct/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.1.1
diff --git a/python-stdlib/test.pystone/manifest.py b/python-stdlib/test.pystone/manifest.py
new file mode 100644
index 00000000..a1bd5912
--- /dev/null
+++ b/python-stdlib/test.pystone/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="1.0.1")
+
+package("test")
diff --git a/python-stdlib/test.pystone/metadata.txt b/python-stdlib/test.pystone/metadata.txt
deleted file mode 100644
index e9979d39..00000000
--- a/python-stdlib/test.pystone/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = cpython
-type = package
-version = 1.0.1
diff --git a/python-stdlib/textwrap/manifest.py b/python-stdlib/textwrap/manifest.py
new file mode 100644
index 00000000..d43a54bb
--- /dev/null
+++ b/python-stdlib/textwrap/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="3.4.2-1")
+
+module("textwrap.py")
diff --git a/python-stdlib/textwrap/metadata.txt b/python-stdlib/textwrap/metadata.txt
deleted file mode 100644
index fc82994c..00000000
--- a/python-stdlib/textwrap/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = cpython
-type = module
-version = 3.4.2-1
diff --git a/python-stdlib/threading/manifest.py b/python-stdlib/threading/manifest.py
new file mode 100644
index 00000000..4db21dd1
--- /dev/null
+++ b/python-stdlib/threading/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1")
+
+module("threading.py")
diff --git a/python-stdlib/threading/metadata.txt b/python-stdlib/threading/metadata.txt
deleted file mode 100644
index a9a85a5b..00000000
--- a/python-stdlib/threading/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.1
diff --git a/python-stdlib/timeit/manifest.py b/python-stdlib/timeit/manifest.py
new file mode 100644
index 00000000..67ff1590
--- /dev/null
+++ b/python-stdlib/timeit/manifest.py
@@ -0,0 +1,9 @@
+metadata(version="3.3.3-3")
+
+require("getopt")
+require("itertools")
+# require("linecache") TODO
+require("time")
+require("traceback")
+
+module("timeit.py")
diff --git a/python-stdlib/timeit/metadata.txt b/python-stdlib/timeit/metadata.txt
deleted file mode 100644
index 63b2f4c8..00000000
--- a/python-stdlib/timeit/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = cpython
-type = module
-version = 3.3.3-3
-depends = getopt, itertools, linecache, time, traceback
diff --git a/python-stdlib/traceback/manifest.py b/python-stdlib/traceback/manifest.py
new file mode 100644
index 00000000..65b3cdaa
--- /dev/null
+++ b/python-stdlib/traceback/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.3")
+
+module("traceback.py")
diff --git a/python-stdlib/traceback/metadata.txt b/python-stdlib/traceback/metadata.txt
deleted file mode 100644
index 85829f3e..00000000
--- a/python-stdlib/traceback/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype=micropython-lib
-type=module
-version = 0.3
diff --git a/python-stdlib/unittest/manifest.py b/python-stdlib/unittest/manifest.py
new file mode 100644
index 00000000..85a5f401
--- /dev/null
+++ b/python-stdlib/unittest/manifest.py
@@ -0,0 +1,6 @@
+metadata(version="0.9.0")
+
+require("argparse")
+require("fnmatch")
+
+module("unittest.py")
diff --git a/python-stdlib/unittest/metadata.txt b/python-stdlib/unittest/metadata.txt
deleted file mode 100644
index ba9a983f..00000000
--- a/python-stdlib/unittest/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.9.0
-depends = argparse, fnmatch
diff --git a/python-stdlib/urllib.parse/manifest.py b/python-stdlib/urllib.parse/manifest.py
new file mode 100644
index 00000000..4731060d
--- /dev/null
+++ b/python-stdlib/urllib.parse/manifest.py
@@ -0,0 +1,7 @@
+metadata(version="0.5.2")
+
+require("re-pcre")
+require("collections")
+require("collections.defaultdict")
+
+package("urllib")
diff --git a/python-stdlib/urllib.parse/metadata.txt b/python-stdlib/urllib.parse/metadata.txt
deleted file mode 100644
index b28c5674..00000000
--- a/python-stdlib/urllib.parse/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = cpython
-type = package
-version = 0.5.2
-depends = re-pcre, collections, collections.defaultdict
diff --git a/python-stdlib/uu/manifest.py b/python-stdlib/uu/manifest.py
new file mode 100644
index 00000000..daf50569
--- /dev/null
+++ b/python-stdlib/uu/manifest.py
@@ -0,0 +1,6 @@
+metadata(version="0.5.1")
+
+require("binascii")
+require("os")
+
+module("uu.py")
diff --git a/python-stdlib/uu/metadata.txt b/python-stdlib/uu/metadata.txt
deleted file mode 100644
index 53096593..00000000
--- a/python-stdlib/uu/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = cpython
-type = module
-version = 0.5.1
-depends = binascii, os
diff --git a/python-stdlib/warnings/manifest.py b/python-stdlib/warnings/manifest.py
new file mode 100644
index 00000000..ca41363a
--- /dev/null
+++ b/python-stdlib/warnings/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="0.1.1")
+
+module("warnings.py")
diff --git a/python-stdlib/warnings/metadata.txt b/python-stdlib/warnings/metadata.txt
deleted file mode 100644
index a9265f64..00000000
--- a/python-stdlib/warnings/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype=micropython-lib
-type=module
-version = 0.1.1
diff --git a/unix-ffi/_libc/manifest.py b/unix-ffi/_libc/manifest.py
new file mode 100644
index 00000000..61bf421b
--- /dev/null
+++ b/unix-ffi/_libc/manifest.py
@@ -0,0 +1,8 @@
+metadata(
+    description="MicroPython FFI helper module (deprecated, replaced by micropython-ffilib).",
+    version="0.3.1",
+)
+
+# Originally written by Paul Sokolovsky.
+
+module("_libc.py")
diff --git a/unix-ffi/_libc/metadata.txt b/unix-ffi/_libc/metadata.txt
deleted file mode 100644
index 96cf9315..00000000
--- a/unix-ffi/_libc/metadata.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-dist_name = libc
-srctype = micropython-lib
-type = module
-version = 0.3.1
-author = Paul Sokolovsky
-desc = MicroPython FFI helper module (deprecated)
-long_desc = MicroPython FFI helper module (deprecated, replaced by micropython-ffilib).
diff --git a/unix-ffi/email.charset/manifest.py b/unix-ffi/email.charset/manifest.py
new file mode 100644
index 00000000..31d70cec
--- /dev/null
+++ b/unix-ffi/email.charset/manifest.py
@@ -0,0 +1,7 @@
+metadata(version="0.5.1")
+
+require("functools")
+require("email.encoders", unix_ffi=True)
+require("email.errors", unix_ffi=True)
+
+package("email")
diff --git a/unix-ffi/email.feedparser/manifest.py b/unix-ffi/email.feedparser/manifest.py
new file mode 100644
index 00000000..4ea80e30
--- /dev/null
+++ b/unix-ffi/email.feedparser/manifest.py
@@ -0,0 +1,8 @@
+metadata(version="0.5.1")
+
+require("re", unix_ffi=True)
+require("email.errors", unix_ffi=True)
+require("email.message", unix_ffi=True)
+require("email.internal", unix_ffi=True)
+
+package("email")
diff --git a/unix-ffi/email.header/manifest.py b/unix-ffi/email.header/manifest.py
new file mode 100644
index 00000000..65b017b5
--- /dev/null
+++ b/unix-ffi/email.header/manifest.py
@@ -0,0 +1,9 @@
+metadata(version="0.5.2")
+
+require("re", unix_ffi=True)
+require("binascii")
+require("email.encoders", unix_ffi=True)
+require("email.errors", unix_ffi=True)
+require("email.charset", unix_ffi=True)
+
+package("email")
diff --git a/unix-ffi/email.internal/manifest.py b/unix-ffi/email.internal/manifest.py
new file mode 100644
index 00000000..4aff6d2c
--- /dev/null
+++ b/unix-ffi/email.internal/manifest.py
@@ -0,0 +1,15 @@
+metadata(version="0.5.1")
+
+require("re", unix_ffi=True)
+require("base64")
+require("binascii")
+require("functools")
+require("string")
+# require("calendar") TODO
+require("abc")
+require("email.errors", unix_ffi=True)
+require("email.header", unix_ffi=True)
+require("email.charset", unix_ffi=True)
+require("email.utils", unix_ffi=True)
+
+package("email")
diff --git a/unix-ffi/email.message/manifest.py b/unix-ffi/email.message/manifest.py
new file mode 100644
index 00000000..7b75ee7a
--- /dev/null
+++ b/unix-ffi/email.message/manifest.py
@@ -0,0 +1,11 @@
+metadata(version="0.5.3")
+
+require("re", unix_ffi=True)
+require("uu")
+require("base64")
+require("binascii")
+require("email.utils", unix_ffi=True)
+require("email.errors", unix_ffi=True)
+require("email.charset", unix_ffi=True)
+
+package("email")
diff --git a/unix-ffi/email.parser/manifest.py b/unix-ffi/email.parser/manifest.py
new file mode 100644
index 00000000..ebe66211
--- /dev/null
+++ b/unix-ffi/email.parser/manifest.py
@@ -0,0 +1,8 @@
+metadata(version="0.5.1")
+
+require("warnings")
+require("email.feedparser", unix_ffi=True)
+require("email.message", unix_ffi=True)
+require("email.internal", unix_ffi=True)
+
+package("email")
diff --git a/unix-ffi/fcntl/manifest.py b/unix-ffi/fcntl/manifest.py
new file mode 100644
index 00000000..e572a58e
--- /dev/null
+++ b/unix-ffi/fcntl/manifest.py
@@ -0,0 +1,7 @@
+metadata(version="0.0.4")
+
+# Originally written by Paul Sokolovsky.
+
+require("ffilib")
+
+module("fcntl.py")
diff --git a/unix-ffi/fcntl/metadata.txt b/unix-ffi/fcntl/metadata.txt
deleted file mode 100644
index b031606e..00000000
--- a/unix-ffi/fcntl/metadata.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.0.4
-author = Paul Sokolovsky
-depends = ffilib
diff --git a/unix-ffi/ffilib/manifest.py b/unix-ffi/ffilib/manifest.py
new file mode 100644
index 00000000..fe795a2e
--- /dev/null
+++ b/unix-ffi/ffilib/manifest.py
@@ -0,0 +1,8 @@
+metadata(
+    description="MicroPython FFI helper module to easily interface with underlying shared libraries",
+    version="0.1.3",
+)
+
+# Originally written by Damien George.
+
+module("ffilib.py")
diff --git a/unix-ffi/ffilib/metadata.txt b/unix-ffi/ffilib/metadata.txt
deleted file mode 100644
index 3cb26e77..00000000
--- a/unix-ffi/ffilib/metadata.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-dist_name = ffilib
-srctype = micropython-lib
-type = module
-version = 0.1.3
-author = Damien George
-desc = MicroPython FFI helper module
-long_desc = MicroPython FFI helper module to easily interface with underlying shared libraries
diff --git a/unix-ffi/gettext/manifest.py b/unix-ffi/gettext/manifest.py
new file mode 100644
index 00000000..a2b52015
--- /dev/null
+++ b/unix-ffi/gettext/manifest.py
@@ -0,0 +1,7 @@
+metadata(version="0.1")
+
+# Originally written by Riccardo Magliocchetti.
+
+require("ffilib")
+
+module("gettext.py")
diff --git a/unix-ffi/gettext/metadata.txt b/unix-ffi/gettext/metadata.txt
deleted file mode 100644
index 55d84737..00000000
--- a/unix-ffi/gettext/metadata.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.1
-author = Riccardo Magliocchetti
-depends = ffilib
diff --git a/unix-ffi/glob/manifest.py b/unix-ffi/glob/manifest.py
new file mode 100644
index 00000000..0d0a25d3
--- /dev/null
+++ b/unix-ffi/glob/manifest.py
@@ -0,0 +1,8 @@
+metadata(version="0.5.2")
+
+require("os", unix_ffi=True)
+require("os.path")
+require("re", unix_ffi=True)
+require("fnmatch")
+
+module("glob.py")
diff --git a/unix-ffi/html.parser/manifest.py b/unix-ffi/html.parser/manifest.py
new file mode 100644
index 00000000..9c82a783
--- /dev/null
+++ b/unix-ffi/html.parser/manifest.py
@@ -0,0 +1,8 @@
+metadata(version="3.3.3-2")
+
+require("_markupbase", unix_ffi=True)
+require("warnings")
+require("html.entities", unix_ffi=True)
+require("re", unix_ffi=True)
+
+package("html")
diff --git a/unix-ffi/http.client/manifest.py b/unix-ffi/http.client/manifest.py
new file mode 100644
index 00000000..be0c9ef3
--- /dev/null
+++ b/unix-ffi/http.client/manifest.py
@@ -0,0 +1,10 @@
+metadata(version="0.5.1")
+
+require("email.parser", unix_ffi=True)
+require("email.message", unix_ffi=True)
+require("socket", unix_ffi=True)
+require("collections")
+require("urllib.parse", unix_ffi=True)
+require("warnings")
+
+package("http")
diff --git a/unix-ffi/machine/manifest.py b/unix-ffi/machine/manifest.py
new file mode 100644
index 00000000..c0e40764
--- /dev/null
+++ b/unix-ffi/machine/manifest.py
@@ -0,0 +1,9 @@
+metadata(version="0.2.1")
+
+# Originally written by Paul Sokolovsky.
+
+require("ffilib")
+require("os")
+require("signal")
+
+package("machine")
diff --git a/unix-ffi/machine/metadata.txt b/unix-ffi/machine/metadata.txt
deleted file mode 100644
index 51a4d3b3..00000000
--- a/unix-ffi/machine/metadata.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-srctype = micropython-lib
-type = package
-version = 0.2.1
-author = Paul Sokolovsky
-depends = ffilib, os, signal
diff --git a/unix-ffi/multiprocessing/manifest.py b/unix-ffi/multiprocessing/manifest.py
new file mode 100644
index 00000000..d6b32411
--- /dev/null
+++ b/unix-ffi/multiprocessing/manifest.py
@@ -0,0 +1,9 @@
+metadata(version="0.1.2")
+
+# Originally written by Paul Sokolovsky.
+
+require("os")
+require("select")
+require("pickle")
+
+module("multiprocessing.py")
diff --git a/unix-ffi/multiprocessing/metadata.txt b/unix-ffi/multiprocessing/metadata.txt
deleted file mode 100644
index d4d5f8d9..00000000
--- a/unix-ffi/multiprocessing/metadata.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.1.2
-author = Paul Sokolovsky
-depends = os, select, pickle
diff --git a/unix-ffi/os/manifest.py b/unix-ffi/os/manifest.py
new file mode 100644
index 00000000..496a9e44
--- /dev/null
+++ b/unix-ffi/os/manifest.py
@@ -0,0 +1,9 @@
+metadata(version="0.6")
+
+# Originally written by Paul Sokolovsky.
+
+require("ffilib")
+require("errno")
+require("stat")
+
+package("os")
diff --git a/unix-ffi/os/metadata.txt b/unix-ffi/os/metadata.txt
deleted file mode 100644
index 22a1ac65..00000000
--- a/unix-ffi/os/metadata.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-srctype = micropython-lib
-type = package
-version = 0.6
-author = Paul Sokolovsky
-depends = ffilib, errno, stat
diff --git a/unix-ffi/pwd/manifest.py b/unix-ffi/pwd/manifest.py
new file mode 100644
index 00000000..26e289b4
--- /dev/null
+++ b/unix-ffi/pwd/manifest.py
@@ -0,0 +1,7 @@
+metadata(version="0.1")
+
+# Originally written by Riccardo Magliocchetti.
+
+require("ffilib")
+
+module("pwd.py")
diff --git a/unix-ffi/pwd/metadata.txt b/unix-ffi/pwd/metadata.txt
deleted file mode 100644
index 55d84737..00000000
--- a/unix-ffi/pwd/metadata.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.1
-author = Riccardo Magliocchetti
-depends = ffilib
diff --git a/unix-ffi/re-pcre/manifest.py b/unix-ffi/re-pcre/manifest.py
new file mode 100644
index 00000000..ca027317
--- /dev/null
+++ b/unix-ffi/re-pcre/manifest.py
@@ -0,0 +1,7 @@
+metadata(version="0.2.5")
+
+# Originally written by Paul Sokolovsky.
+
+require("ffilib")
+
+module("re.py")
diff --git a/unix-ffi/re-pcre/metadata.txt b/unix-ffi/re-pcre/metadata.txt
deleted file mode 100644
index d129ed7d..00000000
--- a/unix-ffi/re-pcre/metadata.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-name = re
-srctype = micropython-lib
-type = module
-version = 0.2.5
-author = Paul Sokolovsky
-depends = ffilib
diff --git a/unix-ffi/select/manifest.py b/unix-ffi/select/manifest.py
new file mode 100644
index 00000000..b76078cc
--- /dev/null
+++ b/unix-ffi/select/manifest.py
@@ -0,0 +1,8 @@
+metadata(version="0.3")
+
+# Originally written by Paul Sokolovsky.
+
+require("os")
+require("ffilib")
+
+module("select.py")
diff --git a/unix-ffi/select/metadata.txt b/unix-ffi/select/metadata.txt
deleted file mode 100644
index c44f5dad..00000000
--- a/unix-ffi/select/metadata.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.3
-author = Paul Sokolovsky
-depends = os, ffilib
diff --git a/unix-ffi/signal/manifest.py b/unix-ffi/signal/manifest.py
new file mode 100644
index 00000000..cb23542c
--- /dev/null
+++ b/unix-ffi/signal/manifest.py
@@ -0,0 +1,7 @@
+metadata(version="0.3.2")
+
+# Originally written by Paul Sokolovsky.
+
+require("ffilib")
+
+module("signal.py")
diff --git a/unix-ffi/signal/metadata.txt b/unix-ffi/signal/metadata.txt
deleted file mode 100644
index ffc676c9..00000000
--- a/unix-ffi/signal/metadata.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.3.2
-author = Paul Sokolovsky
-depends = ffilib
diff --git a/unix-ffi/sqlite3/manifest.py b/unix-ffi/sqlite3/manifest.py
new file mode 100644
index 00000000..63cdf4b9
--- /dev/null
+++ b/unix-ffi/sqlite3/manifest.py
@@ -0,0 +1,7 @@
+metadata(version="0.2.4")
+
+# Originally written by Paul Sokolovsky.
+
+require("ffilib")
+
+module("sqlite3.py")
diff --git a/unix-ffi/sqlite3/metadata.txt b/unix-ffi/sqlite3/metadata.txt
deleted file mode 100644
index 92eeb4c0..00000000
--- a/unix-ffi/sqlite3/metadata.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.2.4
-author = Paul Sokolovsky
-depends = ffilib
diff --git a/unix-ffi/time/manifest.py b/unix-ffi/time/manifest.py
new file mode 100644
index 00000000..32004b15
--- /dev/null
+++ b/unix-ffi/time/manifest.py
@@ -0,0 +1,5 @@
+metadata(version="0.5")
+
+require("ffilib")
+
+module("time.py")
diff --git a/unix-ffi/time/metadata.txt b/unix-ffi/time/metadata.txt
deleted file mode 100644
index f4700d3c..00000000
--- a/unix-ffi/time/metadata.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 0.5
-depends = ffilib
diff --git a/unix-ffi/tty/manifest.py b/unix-ffi/tty/manifest.py
new file mode 100644
index 00000000..7c8a88ca
--- /dev/null
+++ b/unix-ffi/tty/manifest.py
@@ -0,0 +1,3 @@
+metadata(version="1.0.1")
+
+module("tty.py")
diff --git a/unix-ffi/tty/metadata.txt b/unix-ffi/tty/metadata.txt
deleted file mode 100644
index cfad2f99..00000000
--- a/unix-ffi/tty/metadata.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-srctype = micropython-lib
-type = module
-version = 1.0.1
diff --git a/unix-ffi/ucurses/manifest.py b/unix-ffi/ucurses/manifest.py
new file mode 100644
index 00000000..8ec2675a
--- /dev/null
+++ b/unix-ffi/ucurses/manifest.py
@@ -0,0 +1,9 @@
+metadata(version="0.1.2")
+
+# Originally written by Paul Sokolovsky.
+
+require("os")
+require("tty")
+require("select")
+
+package("ucurses")
diff --git a/unix-ffi/ucurses/metadata.txt b/unix-ffi/ucurses/metadata.txt
deleted file mode 100644
index c9f63dde..00000000
--- a/unix-ffi/ucurses/metadata.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-srctype = micropython-lib
-type = package
-version = 0.1.2
-author = Paul Sokolovsky
-depends = os, tty, select