diff --git a/examples/Notebook/Animations Using clear_output.ipynb b/examples/IPython Kernel/Animations Using clear_output.ipynb
similarity index 100%
rename from examples/Notebook/Animations Using clear_output.ipynb
rename to examples/IPython Kernel/Animations Using clear_output.ipynb
diff --git a/examples/Notebook/Custom Display Logic.ipynb b/examples/IPython Kernel/Custom Display Logic.ipynb
similarity index 100%
rename from examples/Notebook/Custom Display Logic.ipynb
rename to examples/IPython Kernel/Custom Display Logic.ipynb
diff --git a/examples/Notebook/Display System.ipynb b/examples/IPython Kernel/Displaying Rich Output Formats.ipynb
similarity index 100%
rename from examples/Notebook/Display System.ipynb
rename to examples/IPython Kernel/Displaying Rich Output Formats.ipynb
diff --git a/examples/IPython Kernel/Index.ipynb b/examples/IPython Kernel/Index.ipynb
index 7ae884a..72947ae 100644
--- a/examples/IPython Kernel/Index.ipynb
+++ b/examples/IPython Kernel/Index.ipynb
@@ -1,7 +1,7 @@
 {
  "metadata": {
   "name": "",
-  "signature": "sha256:b0cbc510e3a2cd2333bc169f96a4e2e29d892cef880222c00f53b067f2d4f257"
+  "signature": "sha256:05d033f19b2130f961fefb1eb215e6ddd32825cb8484a9b63dc520a97a35c854"
  },
  "nbformat": 3,
  "nbformat_minor": 0,
@@ -50,7 +50,10 @@
      "metadata": {},
      "source": [
       "* [Cell Magics](Cell Magics.ipynb)\n",
-      "* [Script Magics](Script Magics.ipynb)"
+      "* [Script Magics](Script Magics.ipynb)\n",
+      "* [Displaying Rich Output Formats](Displaying Rich Output Formats.ipynb)\n",
+      "* [Custom Display Logic](Custom Display Logic.ipynb)\n",
+      "* [Plotting in the Notebook](Plotting in the Notebook.ipynb)"
      ]
     },
     {
@@ -65,7 +68,10 @@
      "cell_type": "markdown",
      "metadata": {},
      "source": [
-      "* [Background Jobs](Background Jobs.ipynb)"
+      "* [Background Jobs](Background Jobs.ipynb)\n",
+      "* [Trapezoid Rule](Trapezoid Rule.ipynb)\n",
+      "* [SymPy](SymPy.ipynb)\n",
+      "* [Raw Input in the Notebook](Raw Input in the Notebook.ipynb)"
      ]
     },
     {
diff --git a/examples/Notebook/Plotting with Matplotlib.ipynb b/examples/IPython Kernel/Plotting in the Notebook.ipynb
similarity index 100%
rename from examples/Notebook/Plotting with Matplotlib.ipynb
rename to examples/IPython Kernel/Plotting in the Notebook.ipynb
diff --git a/examples/Notebook/Raw Input.ipynb b/examples/IPython Kernel/Raw Input in the Notebook.ipynb
similarity index 100%
rename from examples/Notebook/Raw Input.ipynb
rename to examples/IPython Kernel/Raw Input in the Notebook.ipynb
diff --git a/examples/Notebook/SymPy.ipynb b/examples/IPython Kernel/SymPy.ipynb
similarity index 100%
rename from examples/Notebook/SymPy.ipynb
rename to examples/IPython Kernel/SymPy.ipynb
diff --git a/examples/Notebook/Trapezoid Rule.ipynb b/examples/IPython Kernel/Trapezoid Rule.ipynb
similarity index 100%
rename from examples/Notebook/Trapezoid Rule.ipynb
rename to examples/IPython Kernel/Trapezoid Rule.ipynb
diff --git a/examples/Notebook/Custom Keyboard Shortcuts.ipynb b/examples/Notebook/Custom Keyboard Shortcuts.ipynb
new file mode 100644
index 0000000..519dba7
--- /dev/null
+++ b/examples/Notebook/Custom Keyboard Shortcuts.ipynb
@@ -0,0 +1,9 @@
+{
+ "metadata": {
+  "name": "",
+  "signature": "sha256:0abf067a20ebda26a671db997ac954770350d292dff7b7d6a4ace8808f70aca1"
+ },
+ "nbformat": 3,
+ "nbformat_minor": 0,
+ "worksheets": []
+}
\ No newline at end of file
diff --git a/examples/Notebook/Index.ipynb b/examples/Notebook/Index.ipynb
index 1454ce0..07f160a 100644
--- a/examples/Notebook/Index.ipynb
+++ b/examples/Notebook/Index.ipynb
@@ -1,7 +1,7 @@
 {
  "metadata": {
   "name": "",
-  "signature": "sha256:c9fdf35bcd07c381b988af18346fceeb08107ce216817e4bd398641e9c93ecc1"
+  "signature": "sha256:c81ae6aa03abb91a6a64807c6cd7dae22f140f16780d54f0eb4beb3b1f8606aa"
  },
  "nbformat": 3,
  "nbformat_minor": 0,
@@ -49,14 +49,14 @@
      "cell_type": "markdown",
      "metadata": {},
      "source": [
-      "* [User Interface](User Interface.ipynb)\n",
-      "* [Running Code](Running Code.ipynb)\n",
-      "* [Basic Output](Basic Output.ipynb)\n",
-      "* [Plotting with Matplotlib](Plotting with Matplotlib.ipynb)\n",
-      "* [Markdown Cells](Markdown Cells.ipynb)\n",
-      "* [Typesetting Math Using MathJax](Typesetting Math Using MathJax.ipynb)\n",
-      "* [Display System](Display System.ipynb)\n",
-      "* [Custom Display Logic](Custom Display Logic.ipynb)"
+      "* [What is the IPython Notebook?](What is the IPython Notebook%3F.ipynb)\n",
+      "* [Running the Notebook Server](Running the Notebook Server.ipynb)\n",
+      "* [Notebook Dashboard](Notebook Dashboard.ipynb)\n",
+      "* [Notebook User Interface](Notebook User Interface.ipynb)\n",
+      "* [Notebook Cell Types](Notebook Cell Types.ipynb)\n",
+      "* [Working With Code Cells](Working With Code Cells.ipynb)\n",
+      "* [Working With Markdown Cells](Working With Markdown Cells.ipynb)\n",
+      "* [Notebook Security](Notebook Security.ipynb)"
      ]
     },
     {
@@ -71,13 +71,19 @@
      "cell_type": "markdown",
      "metadata": {},
      "source": [
-      "* [Trapezoid Rule](Trapezoid Rule.ipynb)\n",
-      "* [SymPy](SymPy.ipynb)\n",
-      "* [Raw Input](Raw Input.ipynb)\n",
+      "* [Custom Keyboard Shortcuts](Custom Keyboard Shortcuts.ipynb)\n",
       "* [Importing Notebooks](Importing Notebooks.ipynb)\n",
       "* [Connecting with the Qt Console](Connecting with the Qt Console.ipynb)\n",
-      "* [Animations Using clear_output](Animations Using clear_output.ipynb)"
+      "* [Typesetting Equations](Typesetting Equations.ipynb)"
      ]
+    },
+    {
+     "cell_type": "code",
+     "collapsed": false,
+     "input": [],
+     "language": "python",
+     "metadata": {},
+     "outputs": []
     }
    ],
    "metadata": {}
diff --git a/examples/Notebook/Notebook Cell Types.ipynb b/examples/Notebook/Notebook Cell Types.ipynb
new file mode 100644
index 0000000..519dba7
--- /dev/null
+++ b/examples/Notebook/Notebook Cell Types.ipynb
@@ -0,0 +1,9 @@
+{
+ "metadata": {
+  "name": "",
+  "signature": "sha256:0abf067a20ebda26a671db997ac954770350d292dff7b7d6a4ace8808f70aca1"
+ },
+ "nbformat": 3,
+ "nbformat_minor": 0,
+ "worksheets": []
+}
\ No newline at end of file
diff --git a/examples/Notebook/Notebook Dashboard.ipynb b/examples/Notebook/Notebook Dashboard.ipynb
new file mode 100644
index 0000000..519dba7
--- /dev/null
+++ b/examples/Notebook/Notebook Dashboard.ipynb
@@ -0,0 +1,9 @@
+{
+ "metadata": {
+  "name": "",
+  "signature": "sha256:0abf067a20ebda26a671db997ac954770350d292dff7b7d6a4ace8808f70aca1"
+ },
+ "nbformat": 3,
+ "nbformat_minor": 0,
+ "worksheets": []
+}
\ No newline at end of file
diff --git a/examples/Notebook/Notebook Security.ipynb b/examples/Notebook/Notebook Security.ipynb
new file mode 100644
index 0000000..519dba7
--- /dev/null
+++ b/examples/Notebook/Notebook Security.ipynb
@@ -0,0 +1,9 @@
+{
+ "metadata": {
+  "name": "",
+  "signature": "sha256:0abf067a20ebda26a671db997ac954770350d292dff7b7d6a4ace8808f70aca1"
+ },
+ "nbformat": 3,
+ "nbformat_minor": 0,
+ "worksheets": []
+}
\ No newline at end of file
diff --git a/examples/Notebook/User Interface.ipynb b/examples/Notebook/Notebook User Interface.ipynb
similarity index 100%
rename from examples/Notebook/User Interface.ipynb
rename to examples/Notebook/Notebook User Interface.ipynb
diff --git a/examples/Notebook/Running the Notebook Server.ipynb b/examples/Notebook/Running the Notebook Server.ipynb
new file mode 100644
index 0000000..519dba7
--- /dev/null
+++ b/examples/Notebook/Running the Notebook Server.ipynb
@@ -0,0 +1,9 @@
+{
+ "metadata": {
+  "name": "",
+  "signature": "sha256:0abf067a20ebda26a671db997ac954770350d292dff7b7d6a4ace8808f70aca1"
+ },
+ "nbformat": 3,
+ "nbformat_minor": 0,
+ "worksheets": []
+}
\ No newline at end of file
diff --git a/examples/Notebook/Typesetting Math Using MathJax.ipynb b/examples/Notebook/Typesetting Equations.ipynb
similarity index 100%
rename from examples/Notebook/Typesetting Math Using MathJax.ipynb
rename to examples/Notebook/Typesetting Equations.ipynb
diff --git a/examples/Notebook/What is the IPython Notebook?.ipynb b/examples/Notebook/What is the IPython Notebook?.ipynb
new file mode 100644
index 0000000..519dba7
--- /dev/null
+++ b/examples/Notebook/What is the IPython Notebook?.ipynb
@@ -0,0 +1,9 @@
+{
+ "metadata": {
+  "name": "",
+  "signature": "sha256:0abf067a20ebda26a671db997ac954770350d292dff7b7d6a4ace8808f70aca1"
+ },
+ "nbformat": 3,
+ "nbformat_minor": 0,
+ "worksheets": []
+}
\ No newline at end of file
diff --git a/examples/Notebook/Running Code.ipynb b/examples/Notebook/Working With Code Cells.ipynb
similarity index 100%
rename from examples/Notebook/Running Code.ipynb
rename to examples/Notebook/Working With Code Cells.ipynb
diff --git a/examples/Notebook/Markdown Cells.ipynb b/examples/Notebook/Working With Markdown Cells.ipynb
similarity index 100%
rename from examples/Notebook/Markdown Cells.ipynb
rename to examples/Notebook/Working With Markdown Cells.ipynb