diff --git a/examples/Parallel/multiengine1.ipy b/examples/Parallel/Examples/multiengine1.ipy
similarity index 100%
rename from examples/Parallel/multiengine1.ipy
rename to examples/Parallel/Examples/multiengine1.ipy
diff --git a/examples/Parallel/multiengine2.py b/examples/Parallel/Examples/multiengine2.py
similarity index 100%
rename from examples/Parallel/multiengine2.py
rename to examples/Parallel/Examples/multiengine2.py
diff --git a/examples/Parallel/multienginemap.py b/examples/Parallel/Examples/multienginemap.py
similarity index 100%
rename from examples/Parallel/multienginemap.py
rename to examples/Parallel/Examples/multienginemap.py
diff --git a/examples/Parallel/nwmerge.py b/examples/Parallel/Examples/nwmerge.py
similarity index 100%
rename from examples/Parallel/nwmerge.py
rename to examples/Parallel/Examples/nwmerge.py
diff --git a/examples/Parallel/parallel_mpi.ipynb b/examples/Parallel/Examples/parallel_mpi.ipynb
similarity index 100%
rename from examples/Parallel/parallel_mpi.ipynb
rename to examples/Parallel/Examples/parallel_mpi.ipynb
diff --git a/examples/Parallel/phistogram.py b/examples/Parallel/Examples/phistogram.py
similarity index 100%
rename from examples/Parallel/phistogram.py
rename to examples/Parallel/Examples/phistogram.py
diff --git a/examples/Parallel/task1.ipynb b/examples/Parallel/Examples/task1.ipynb
similarity index 100%
rename from examples/Parallel/task1.ipynb
rename to examples/Parallel/Examples/task1.ipynb
diff --git a/examples/Parallel/task2.py b/examples/Parallel/Examples/task2.py
similarity index 100%
rename from examples/Parallel/task2.py
rename to examples/Parallel/Examples/task2.py
diff --git a/examples/Parallel/task_profiler.py b/examples/Parallel/Examples/task_profiler.py
similarity index 100%
rename from examples/Parallel/task_profiler.py
rename to examples/Parallel/Examples/task_profiler.py
diff --git a/examples/Parallel/taskmap.ipynb b/examples/Parallel/Examples/taskmap.ipynb
similarity index 100%
rename from examples/Parallel/taskmap.ipynb
rename to examples/Parallel/Examples/taskmap.ipynb
diff --git a/examples/Parallel/task1.py b/examples/Parallel/task1.py
deleted file mode 100644
index 4623c9f..0000000
--- a/examples/Parallel/task1.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# <nbformat>2</nbformat>
-
-# <markdowncell>
-
-# # Simple task farming example
-
-# <codecell>
-from __future__ import print_function
-
-from IPython.parallel import Client
-
-# <markdowncell>
-
-# A `Client.load_balanced_view` is used to get the object used for working with load balanced tasks.
-
-# <codecell>
-
-rc = Client()
-v = rc.load_balanced_view()
-
-# <markdowncell>
-
-# Set the variable `d` on all engines:
-
-# <codecell>
-
-rc[:]['d'] = 30
-
-# <markdowncell>
-
-# Define a function that will be our task:
-
-# <codecell>
-
-def task(a):
-    return a, 10*d, a*10*d
-
-# <markdowncell>
-
-# Run the task once:
-
-# <codecell>
-
-ar = v.apply(task, 5)
-
-# <markdowncell>
-
-# Print the results:
-
-# <codecell>
-
-print("a, b, c: ", ar.get())
-
diff --git a/examples/Parallel/taskmap.py b/examples/Parallel/taskmap.py
deleted file mode 100644
index 5ec4ebb..0000000
--- a/examples/Parallel/taskmap.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# <nbformat>2</nbformat>
-
-# <markdowncell>
-
-# # Load balanced map and parallel function decorator
-
-# <codecell>
-from __future__ import print_function
-
-from IPython.parallel import Client
-
-# <codecell>
-
-rc = Client()
-v = rc.load_balanced_view()
-
-# <codecell>
-
-result = v.map(lambda x: 2*x, range(10))
-print("Simple, default map: ", list(result))
-
-# <codecell>
-
-ar = v.map_async(lambda x: 2*x, range(10))
-print("Submitted tasks, got ids: ", ar.msg_ids)
-result = ar.get()
-print("Using a mapper: ", result)
-
-# <codecell>
-
-@v.parallel(block=True)
-def f(x): return 2*x
-
-result = f.map(range(10))
-print("Using a parallel function: ", result)
-