diff --git a/examples/Customization/Index.ipynb b/examples/Customization/Index.ipynb
index 9ad7be3..dccd084 100644
--- a/examples/Customization/Index.ipynb
+++ b/examples/Customization/Index.ipynb
@@ -1,7 +1,7 @@
 {
  "metadata": {
   "name": "",
-  "signature": "sha256:2fc11a62b83396569f64bfde2516a0219a62108a64f920dedb7217a63d67a9bc"
+  "signature": "sha256:a805b2c46cc61ed300cc06162f057e5c2f934cf3df10daa27ca885a1ab74674a"
  },
  "nbformat": 3,
  "nbformat_minor": 0,
@@ -86,20 +86,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "from IPython.display import FileLink, display"
-     ],
-     "language": "python",
-     "metadata": {},
-     "outputs": [],
-     "prompt_number": 1
-    },
-    {
-     "cell_type": "code",
-     "collapsed": false,
-     "input": [
-      "files =!ls *.py\n",
-      "for f in files:\n",
-      "    display(FileLink(f))"
+      "%run ../list_pyfiles.ipy"
      ],
      "language": "python",
      "metadata": {},
diff --git a/examples/Embedding/Index.ipynb b/examples/Embedding/Index.ipynb
index aa019bf..be6ddef 100644
--- a/examples/Embedding/Index.ipynb
+++ b/examples/Embedding/Index.ipynb
@@ -1,7 +1,7 @@
 {
  "metadata": {
   "name": "",
-  "signature": "sha256:78b90d18791f32ff5abbbf5b4a9846ad8fad0a46af65125faac15f86f68da57f"
+  "signature": "sha256:29db13dc7016ac387a7b8f535ee31c19456004997ba93c328fa0abae41704e5f"
  },
  "nbformat": 3,
  "nbformat_minor": 0,
@@ -93,20 +93,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "from IPython.display import FileLink, display"
-     ],
-     "language": "python",
-     "metadata": {},
-     "outputs": [],
-     "prompt_number": 2
-    },
-    {
-     "cell_type": "code",
-     "collapsed": false,
-     "input": [
-      "files =!ls *.py\n",
-      "for f in files:\n",
-      "    display(FileLink(f))"
+      "%run ../list_pyfiles.ipy"
      ],
      "language": "python",
      "metadata": {},
@@ -192,7 +179,7 @@
        ]
       }
      ],
-     "prompt_number": 3
+     "prompt_number": 1
     }
    ],
    "metadata": {}
diff --git a/examples/Miscellaneous/Background Jobs.ipynb b/examples/IPython Kernel/Background Jobs.ipynb
similarity index 96%
rename from examples/Miscellaneous/Background Jobs.ipynb
rename to examples/IPython Kernel/Background Jobs.ipynb
index 60c6828..b0b561e 100644
--- a/examples/Miscellaneous/Background Jobs.ipynb
+++ b/examples/IPython Kernel/Background Jobs.ipynb
@@ -1,7 +1,7 @@
 {
  "metadata": {
   "name": "",
-  "signature": "sha256:178b84c6ec2464bc76d655fb49d06913fcdcac5aad9e3442b6039c219f583e49"
+  "signature": "sha256:481e128e553ec13e039f3e3f5e567cc3caffe391b78b9821ee883fb8770ebc82"
  },
  "nbformat": 3,
  "nbformat_minor": 0,
@@ -9,11 +9,17 @@
   {
    "cells": [
     {
+     "cell_type": "heading",
+     "level": 1,
+     "metadata": {},
+     "source": [
+      "Background Jobs"
+     ]
+    },
+    {
      "cell_type": "markdown",
      "metadata": {},
      "source": [
-      "# Simple interactive bacgkround jobs with IPython\n",
-      "\n",
       "We start by loading the `backgroundjobs` library and defining a few trivial functions to illustrate things with."
      ]
     },
diff --git a/examples/IPython Kernel/Index.ipynb b/examples/IPython Kernel/Index.ipynb
index 6cb94bb..33a5310 100644
--- a/examples/IPython Kernel/Index.ipynb
+++ b/examples/IPython Kernel/Index.ipynb
@@ -1,7 +1,7 @@
 {
  "metadata": {
   "name": "",
-  "signature": "sha256:1f73cbd161515fd1a2c4b327925f1f17e45ed057ffb039a22cf833f61154e000"
+  "signature": "sha256:dd3f8171dfb5c8cb7aa9b1c0f5dee915f4ac8f73d9dc19a20a95c8f1583578ae"
  },
  "nbformat": 3,
  "nbformat_minor": 0,
@@ -65,7 +65,7 @@
      "cell_type": "markdown",
      "metadata": {},
      "source": [
-      "Coming soon."
+      "* [Background Jobs](Background Jobs.ipynb)"
      ]
     },
     {
@@ -87,32 +87,72 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "from IPython.display import FileLink, display"
+      "%run ../list_pyfiles.ipy"
      ],
      "language": "python",
      "metadata": {},
-     "outputs": [],
+     "outputs": [
+      {
+       "html": [
+        "<a href='example-demo.py' target='_blank'>example-demo.py</a><br>"
+       ],
+       "metadata": {},
+       "output_type": "display_data",
+       "text": [
+        "/Users/bgranger/Documents/Computing/IPython/code/ipython/examples/IPython Kernel/example-demo.py"
+       ]
+      },
+      {
+       "html": [
+        "<a href='ipython-get-history.py' target='_blank'>ipython-get-history.py</a><br>"
+       ],
+       "metadata": {},
+       "output_type": "display_data",
+       "text": [
+        "/Users/bgranger/Documents/Computing/IPython/code/ipython/examples/IPython Kernel/ipython-get-history.py"
+       ]
+      }
+     ],
      "prompt_number": 1
     },
     {
+     "cell_type": "markdown",
+     "metadata": {},
+     "source": [
+      "There are also a set of examples that show how to integrate IPython with different GUI event loops:"
+     ]
+    },
+    {
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "files =!ls *.py\n",
-      "for f in files:\n",
-      "    display(FileLink(f))"
+      "%run ../list_subdirs.ipy"
      ],
      "language": "python",
      "metadata": {},
      "outputs": [
       {
        "html": [
-        "<a href='ipython-get-history.py' target='_blank'>ipython-get-history.py</a><br>"
+        "gui/<br>\n",
+        "&nbsp;&nbsp;<a href='gui/gui-glut.py' target='_blank'>gui-glut.py</a><br>\n",
+        "&nbsp;&nbsp;<a href='gui/gui-gtk.py' target='_blank'>gui-gtk.py</a><br>\n",
+        "&nbsp;&nbsp;<a href='gui/gui-gtk3.py' target='_blank'>gui-gtk3.py</a><br>\n",
+        "&nbsp;&nbsp;<a href='gui/gui-pyglet.py' target='_blank'>gui-pyglet.py</a><br>\n",
+        "&nbsp;&nbsp;<a href='gui/gui-qt.py' target='_blank'>gui-qt.py</a><br>\n",
+        "&nbsp;&nbsp;<a href='gui/gui-tk.py' target='_blank'>gui-tk.py</a><br>\n",
+        "&nbsp;&nbsp;<a href='gui/gui-wx.py' target='_blank'>gui-wx.py</a><br>"
        ],
        "metadata": {},
        "output_type": "display_data",
        "text": [
-        "/Users/bgranger/Documents/Computing/IPython/code/ipython/examples/IPython Kernel/ipython-get-history.py"
+        "gui/\n",
+        "  gui-glut.py\n",
+        "  gui-gtk.py\n",
+        "  gui-gtk3.py\n",
+        "  gui-pyglet.py\n",
+        "  gui-qt.py\n",
+        "  gui-tk.py\n",
+        "  gui-wx.py"
        ]
       }
      ],
diff --git a/examples/Miscellaneous/example-demo.py b/examples/IPython Kernel/example-demo.py
similarity index 100%
rename from examples/Miscellaneous/example-demo.py
rename to examples/IPython Kernel/example-demo.py
diff --git a/examples/Miscellaneous/gui-glut.py b/examples/IPython Kernel/gui/gui-glut.py
similarity index 100%
rename from examples/Miscellaneous/gui-glut.py
rename to examples/IPython Kernel/gui/gui-glut.py
diff --git a/examples/Miscellaneous/gui-gtk.py b/examples/IPython Kernel/gui/gui-gtk.py
similarity index 100%
rename from examples/Miscellaneous/gui-gtk.py
rename to examples/IPython Kernel/gui/gui-gtk.py
diff --git a/examples/Miscellaneous/gui-gtk3.py b/examples/IPython Kernel/gui/gui-gtk3.py
similarity index 100%
rename from examples/Miscellaneous/gui-gtk3.py
rename to examples/IPython Kernel/gui/gui-gtk3.py
diff --git a/examples/Miscellaneous/gui-pyglet.py b/examples/IPython Kernel/gui/gui-pyglet.py
similarity index 100%
rename from examples/Miscellaneous/gui-pyglet.py
rename to examples/IPython Kernel/gui/gui-pyglet.py
diff --git a/examples/Miscellaneous/gui-qt.py b/examples/IPython Kernel/gui/gui-qt.py
similarity index 100%
rename from examples/Miscellaneous/gui-qt.py
rename to examples/IPython Kernel/gui/gui-qt.py
diff --git a/examples/Miscellaneous/gui-tk.py b/examples/IPython Kernel/gui/gui-tk.py
similarity index 100%
rename from examples/Miscellaneous/gui-tk.py
rename to examples/IPython Kernel/gui/gui-tk.py
diff --git a/examples/Miscellaneous/gui-wx.py b/examples/IPython Kernel/gui/gui-wx.py
similarity index 100%
rename from examples/Miscellaneous/gui-wx.py
rename to examples/IPython Kernel/gui/gui-wx.py
diff --git a/examples/Miscellaneous/ipython-completion.bash b/examples/IPython Kernel/ipython-completion.bash
similarity index 100%
rename from examples/Miscellaneous/ipython-completion.bash
rename to examples/IPython Kernel/ipython-completion.bash
diff --git a/examples/Miscellaneous/ipython-qtconsole.desktop b/examples/IPython Kernel/ipython-qtconsole.desktop
similarity index 100%
rename from examples/Miscellaneous/ipython-qtconsole.desktop
rename to examples/IPython Kernel/ipython-qtconsole.desktop
diff --git a/examples/Miscellaneous/ipython.desktop b/examples/IPython Kernel/ipython.desktop
similarity index 100%
rename from examples/Miscellaneous/ipython.desktop
rename to examples/IPython Kernel/ipython.desktop
diff --git a/examples/Index.ipynb b/examples/Index.ipynb
index 87dc831..6e02300 100644
--- a/examples/Index.ipynb
+++ b/examples/Index.ipynb
@@ -1,7 +1,7 @@
 {
  "metadata": {
   "name": "",
-  "signature": "sha256:f047f5edb4201c0c7aa38bdf31058bf6ab2785d53e7a03cdbd4e4ff4217c0007"
+  "signature": "sha256:0b4b631419772e40e0f4893f5a0f0fe089a39e46c8862af0256164628394302d"
  },
  "nbformat": 3,
  "nbformat_minor": 0,
@@ -48,8 +48,7 @@
       "* [Parallel Computing](Parallel Computing/Index.ipynb): IPython's library for interactive parallel computing\n",
       "* [Customization](Customization/Index.ipynb): How to configure IPython and customize it with magics, extensions, etc.\n",
       "* [Embedding](Embedding/Index.ipynb): Embedding and reusing IPython's components into other applications\n",
-      "* [Builtin Extensions](Builtin Extensions/Index.ipynb): Extensions we ship with IPython\n",
-      "* [Miscellaneous](Miscellaneous/Index.ipynb): Documentation that doesn't fit anywhere else"
+      "* [Builtin Extensions](Builtin Extensions/Index.ipynb): Extensions we ship with IPython"
      ]
     }
    ],
diff --git a/examples/Miscellaneous/Index.ipynb b/examples/Miscellaneous/Index.ipynb
deleted file mode 100644
index 3809ef8..0000000
--- a/examples/Miscellaneous/Index.ipynb
+++ /dev/null
@@ -1,194 +0,0 @@
-{
- "metadata": {
-  "name": "",
-  "signature": "sha256:38d053b68b57c8c0c1208833a9449fc02d62f069f4f0088b0cc3d6f95ce7a455"
- },
- "nbformat": 3,
- "nbformat_minor": 0,
- "worksheets": [
-  {
-   "cells": [
-    {
-     "cell_type": "markdown",
-     "metadata": {},
-     "source": [
-      "<img src=\"../images/ipython_logo.png\">"
-     ]
-    },
-    {
-     "cell_type": "markdown",
-     "metadata": {},
-     "source": [
-      "Back to the main [Index](../Index.ipynb)"
-     ]
-    },
-    {
-     "cell_type": "heading",
-     "level": 1,
-     "metadata": {},
-     "source": [
-      "Miscellaneous Topics"
-     ]
-    },
-    {
-     "cell_type": "markdown",
-     "metadata": {},
-     "source": [
-      "Some IPython documentation topics just don't fit well anywhere else."
-     ]
-    },
-    {
-     "cell_type": "heading",
-     "level": 2,
-     "metadata": {},
-     "source": [
-      "Tutorials"
-     ]
-    },
-    {
-     "cell_type": "markdown",
-     "metadata": {},
-     "source": [
-      "Coming soon."
-     ]
-    },
-    {
-     "cell_type": "heading",
-     "level": 2,
-     "metadata": {},
-     "source": [
-      "Examples"
-     ]
-    },
-    {
-     "cell_type": "markdown",
-     "metadata": {},
-     "source": [
-      "* [Background Jobs](Background Jobs.ipynb)"
-     ]
-    },
-    {
-     "cell_type": "heading",
-     "level": 2,
-     "metadata": {},
-     "source": [
-      "Non-notebook examples"
-     ]
-    },
-    {
-     "cell_type": "markdown",
-     "metadata": {},
-     "source": [
-      "This directory also contains examples that are regular Python (`.py`) files."
-     ]
-    },
-    {
-     "cell_type": "code",
-     "collapsed": false,
-     "input": [
-      "from IPython.display import FileLink, display"
-     ],
-     "language": "python",
-     "metadata": {},
-     "outputs": [],
-     "prompt_number": 1
-    },
-    {
-     "cell_type": "code",
-     "collapsed": false,
-     "input": [
-      "files =!ls *.py\n",
-      "for f in files:\n",
-      "    display(FileLink(f))"
-     ],
-     "language": "python",
-     "metadata": {},
-     "outputs": [
-      {
-       "html": [
-        "<a href='example-demo.py' target='_blank'>example-demo.py</a><br>"
-       ],
-       "metadata": {},
-       "output_type": "display_data",
-       "text": [
-        "/Users/bgranger/Documents/Computing/IPython/code/ipython/examples/Miscellaneous/example-demo.py"
-       ]
-      },
-      {
-       "html": [
-        "<a href='gui-glut.py' target='_blank'>gui-glut.py</a><br>"
-       ],
-       "metadata": {},
-       "output_type": "display_data",
-       "text": [
-        "/Users/bgranger/Documents/Computing/IPython/code/ipython/examples/Miscellaneous/gui-glut.py"
-       ]
-      },
-      {
-       "html": [
-        "<a href='gui-gtk.py' target='_blank'>gui-gtk.py</a><br>"
-       ],
-       "metadata": {},
-       "output_type": "display_data",
-       "text": [
-        "/Users/bgranger/Documents/Computing/IPython/code/ipython/examples/Miscellaneous/gui-gtk.py"
-       ]
-      },
-      {
-       "html": [
-        "<a href='gui-gtk3.py' target='_blank'>gui-gtk3.py</a><br>"
-       ],
-       "metadata": {},
-       "output_type": "display_data",
-       "text": [
-        "/Users/bgranger/Documents/Computing/IPython/code/ipython/examples/Miscellaneous/gui-gtk3.py"
-       ]
-      },
-      {
-       "html": [
-        "<a href='gui-pyglet.py' target='_blank'>gui-pyglet.py</a><br>"
-       ],
-       "metadata": {},
-       "output_type": "display_data",
-       "text": [
-        "/Users/bgranger/Documents/Computing/IPython/code/ipython/examples/Miscellaneous/gui-pyglet.py"
-       ]
-      },
-      {
-       "html": [
-        "<a href='gui-qt.py' target='_blank'>gui-qt.py</a><br>"
-       ],
-       "metadata": {},
-       "output_type": "display_data",
-       "text": [
-        "/Users/bgranger/Documents/Computing/IPython/code/ipython/examples/Miscellaneous/gui-qt.py"
-       ]
-      },
-      {
-       "html": [
-        "<a href='gui-tk.py' target='_blank'>gui-tk.py</a><br>"
-       ],
-       "metadata": {},
-       "output_type": "display_data",
-       "text": [
-        "/Users/bgranger/Documents/Computing/IPython/code/ipython/examples/Miscellaneous/gui-tk.py"
-       ]
-      },
-      {
-       "html": [
-        "<a href='gui-wx.py' target='_blank'>gui-wx.py</a><br>"
-       ],
-       "metadata": {},
-       "output_type": "display_data",
-       "text": [
-        "/Users/bgranger/Documents/Computing/IPython/code/ipython/examples/Miscellaneous/gui-wx.py"
-       ]
-      }
-     ],
-     "prompt_number": 2
-    }
-   ],
-   "metadata": {}
-  }
- ]
-}
\ No newline at end of file
diff --git a/examples/Parallel Computing/Index.ipynb b/examples/Parallel Computing/Index.ipynb
index e35d505..bb28ff1 100644
--- a/examples/Parallel Computing/Index.ipynb
+++ b/examples/Parallel Computing/Index.ipynb
@@ -1,7 +1,7 @@
 {
  "metadata": {
   "name": "",
-  "signature": "sha256:24e7c8d3c3d2d4b6e7a5b9d01c7e413b736537327a485e257912943fc013a888"
+  "signature": "sha256:424566387e51dfd0dc559496301c86be9b1f610b6cfedb1cbd225ce9f0161b88"
  },
  "nbformat": 3,
  "nbformat_minor": 0,
@@ -92,27 +92,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "from IPython.display import FileLink, display"
-     ],
-     "language": "python",
-     "metadata": {},
-     "outputs": [],
-     "prompt_number": 7
-    },
-    {
-     "cell_type": "markdown",
-     "metadata": {},
-     "source": [
-      "Here are single file Python examples:"
-     ]
-    },
-    {
-     "cell_type": "code",
-     "collapsed": false,
-     "input": [
-      "files =!ls *.py\n",
-      "for f in files:\n",
-      "    display(FileLink(f))"
+      "%run ../list_pyfiles.ipy"
      ],
      "language": "python",
      "metadata": {},
@@ -218,7 +198,7 @@
        ]
       }
      ],
-     "prompt_number": 9
+     "prompt_number": 4
     },
     {
      "cell_type": "markdown",
@@ -231,9 +211,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "files =!ls -d */\n",
-      "for f in files:\n",
-      "    display(FileLinks(f))"
+      "%run ../list_subdirs.ipy"
      ],
      "language": "python",
      "metadata": {},
@@ -343,7 +321,7 @@
        ]
       }
      ],
-     "prompt_number": 13
+     "prompt_number": 3
     }
    ],
    "metadata": {}
diff --git a/examples/list_pyfiles.ipy b/examples/list_pyfiles.ipy
new file mode 100644
index 0000000..71a9e5d
--- /dev/null
+++ b/examples/list_pyfiles.ipy
@@ -0,0 +1,6 @@
+# A simple IPython script that provides Notebook links to .py files in the cwd
+
+from IPython.display import FileLink, display
+files =!ls *.py
+for f in files:
+    display(FileLink(f))
\ No newline at end of file
diff --git a/examples/list_subdirs.ipy b/examples/list_subdirs.ipy
new file mode 100644
index 0000000..36ca92c
--- /dev/null
+++ b/examples/list_subdirs.ipy
@@ -0,0 +1,6 @@
+# A simple IPython script that lists files in all subdirs
+
+from IPython.display import FileLinks, display
+dirs =!ls -d */
+for d in dirs:
+    display(FileLinks(d))
\ No newline at end of file