diff --git a/Documentation/index.rst b/Documentation/index.rst
index 16a09d872..105933724 100644
--- a/Documentation/index.rst
+++ b/Documentation/index.rst
@@ -45,8 +45,11 @@ Tools for accessing, validating and making UFO and glif.
 .. toctree::
    :maxdepth: 1
 
+   ufoLib/ufoLib
    ufoLib/glifLib
    ufoLib/pointPen
+   ufoLib/filenames
+   ufoLib/converters
 
 
 
diff --git a/Documentation/ufoLib/converters.rst b/Documentation/ufoLib/converters.rst
new file mode 100644
index 000000000..74aafbf8a
--- /dev/null
+++ b/Documentation/ufoLib/converters.rst
@@ -0,0 +1,9 @@
+.. highlight:: python
+
+==========
+converters
+==========
+
+.. automodule:: ufoLib.converters
+   :inherited-members:
+   :members:
diff --git a/Documentation/ufoLib/filenames.rst b/Documentation/ufoLib/filenames.rst
new file mode 100644
index 000000000..d604c4c59
--- /dev/null
+++ b/Documentation/ufoLib/filenames.rst
@@ -0,0 +1,9 @@
+.. highlight:: python
+
+=========
+filenames
+=========
+
+.. automodule:: ufoLib.filenames
+   :inherited-members:
+   :members:
diff --git a/Documentation/ufoLib/pointPen.rst b/Documentation/ufoLib/pointPen.rst
index 426e3775e..6cb1ca175 100644
--- a/Documentation/ufoLib/pointPen.rst
+++ b/Documentation/ufoLib/pointPen.rst
@@ -4,6 +4,6 @@
 pointPen
 ========
 
-.. automodule:: robofab.pens.pointPen
+.. automodule:: ufoLib.pointPen
    :inherited-members:
    :members:
diff --git a/Documentation/ufoLib/ufoLib.rst b/Documentation/ufoLib/ufoLib.rst
new file mode 100644
index 000000000..3b3b0b1aa
--- /dev/null
+++ b/Documentation/ufoLib/ufoLib.rst
@@ -0,0 +1,9 @@
+.. highlight:: python
+
+======
+ufoLib
+======
+
+.. automodule:: ufoLib
+   :inherited-members:
+   :members: