diff --git a/doc/faq/howto_faq.rst b/doc/faq/howto_faq.rst
@@ -340,7 +340,7 @@ and patches, respectively::
 
 .. htmlonly::
 
-    See :ref:`sphx_glr_gallery_pylab_examples_zorder_demo.py` for a complete example.
+    See :ref:`sphx_glr_gallery_misc_zorder_demo.py` for a complete example.
 
 You can also use the Axes property
 :meth:`~matplotlib.axes.Axes.set_axisbelow` to control whether the grid

diff --git a/doc/users/prev_whats_new/whats_new_1.3.rst b/doc/users/prev_whats_new/whats_new_1.3.rst
@@ -117,8 +117,8 @@ New eventplot plot type
 Todd Jennings added a :func:`~matplotlib.pyplot.eventplot` function to
 create multiple rows or columns of identical line segments
 
-.. figure:: ../../gallery/pylab_examples/images/sphx_glr_eventplot_demo_001.png
-   :target: ../../gallery/pylab_examples/eventplot_demo.html
+.. figure:: ../../gallery/lines_bars_and_markers/images/sphx_glr_eventplot_demo_001.png
+   :target: ../../gallery/lines_bars_and_markers/eventplot_demo.html
    :align: center
    :scale: 50
 
@@ -199,8 +199,8 @@ Path effects on lines
 `````````````````````
 Thanks to Jae-Joon Lee, path effects now also work on plot lines.
 
-.. figure:: ../../gallery/pylab_examples/images/sphx_glr_patheffect_demo_001.png
-   :target: ../../gallery/pylab_examples/patheffect_demo.html
+.. figure:: ../../gallery/misc/images/sphx_glr_patheffect_demo_001.png
+   :target: ../../gallery/misc/patheffect_demo.html
    :align: center
    :scale: 50
 

diff --git a/examples/pylab_examples/movie_demo_sgskip.py → examples/animation/movie_demo_sgskip.py b/examples/pylab_examples/movie_demo_sgskip.py → examples/animation/movie_demo_sgskip.py
diff --git a/...ples/pylab_examples/ginput_demo_sgskip.py → ...ples/event_handling/ginput_demo_sgskip.py b/...ples/pylab_examples/ginput_demo_sgskip.py → ...ples/event_handling/ginput_demo_sgskip.py
diff --git a/...b_examples/ginput_manual_clabel_sgskip.py → ...t_handling/ginput_manual_clabel_sgskip.py b/...b_examples/ginput_manual_clabel_sgskip.py → ...t_handling/ginput_manual_clabel_sgskip.py
@@ -32,6 +32,7 @@ def tellme(s):
 ##################################################
 # Define a triangle by clicking three points
 
+
 plt.clf()
 plt.axis([-1., 1., -1., 1.])
 plt.setp(plt.gca(), autoscale_on=False)
@@ -73,6 +74,7 @@ def f(x, y, pts):
         z = z + 1/(np.sqrt((x - p[0])**2 + (y - p[1])**2))
     return 1/z
 
+
 X, Y = np.meshgrid(np.linspace(-1, 1, 51), np.linspace(-1, 1, 51))
 Z = f(X, Y, pts)
 

diff --git a/examples/pylab_examples/barcode_demo.py → ...mages_contours_and_fields/barcode_demo.py b/examples/pylab_examples/barcode_demo.py → ...mages_contours_and_fields/barcode_demo.py
diff --git a/examples/pylab_examples/demo_bboximage.py → ...ges_contours_and_fields/demo_bboximage.py b/examples/pylab_examples/demo_bboximage.py → ...ges_contours_and_fields/demo_bboximage.py
@@ -37,7 +37,7 @@
         not m.startswith(('spectral', 'Vega'))  # Skip deprecated colormaps.
     )
 
-    #fig.subplots_adjust(top=0.99, bottom=0.01, left=0.2, right=0.99)
+    # fig.subplots_adjust(top=0.99, bottom=0.01, left=0.2, right=0.99)
 
     ncol = 2
     nrow = len(maps)//ncol + 1
@@ -50,7 +50,7 @@
 
     for i, m in enumerate(maps):
         ix, iy = divmod(i, nrow)
-        #plt.figimage(a, 10, i*10, cmap=plt.get_cmap(m), origin='lower')
+        # plt.figimage(a, 10, i*10, cmap=plt.get_cmap(m), origin='lower')
         bbox0 = Bbox.from_bounds(ix*dx*(1 + xpad_fraction),
                                  1. - iy*dy*(1 + ypad_fraction) - dy,
                                  dx, dy)

diff --git a/examples/pylab_examples/spy_demos.py → ...s/images_contours_and_fields/spy_demos.py b/examples/pylab_examples/spy_demos.py → ...s/images_contours_and_fields/spy_demos.py
diff --git a/...es/pylab_examples/eventcollection_demo.py → ..._bars_and_markers/eventcollection_demo.py b/...es/pylab_examples/eventcollection_demo.py → ..._bars_and_markers/eventcollection_demo.py
diff --git a/examples/pylab_examples/eventplot_demo.py → .../lines_bars_and_markers/eventplot_demo.py b/examples/pylab_examples/eventplot_demo.py → .../lines_bars_and_markers/eventplot_demo.py
diff --git a/examples/pylab_examples/interp_demo.py → ...les/lines_bars_and_markers/interp_demo.py b/examples/pylab_examples/interp_demo.py → ...les/lines_bars_and_markers/interp_demo.py
diff --git a/examples/pylab_examples/markevery_demo.py → .../lines_bars_and_markers/markevery_demo.py b/examples/pylab_examples/markevery_demo.py → .../lines_bars_and_markers/markevery_demo.py
@@ -55,7 +55,6 @@
     ax.append(fig1.add_subplot(gs[row, col]))
     ax[-1].set_title('markevery=%s' % str(case))
     ax[-1].plot(x, y, 'o', ls='-', ms=4, markevery=case)
-#fig1.tight_layout()
 
 ###############################################################################
 # Plot each markevery case for log x and y scales

diff --git a/examples/pylab_examples/masked_demo.py → ...les/lines_bars_and_markers/masked_demo.py b/examples/pylab_examples/masked_demo.py → ...les/lines_bars_and_markers/masked_demo.py
diff --git a/examples/pylab_examples/nan_test.py → examples/lines_bars_and_markers/nan_test.py b/examples/pylab_examples/nan_test.py → examples/lines_bars_and_markers/nan_test.py
@@ -30,4 +30,5 @@
 plt.ylabel('more nans')
 plt.grid(True)
 
+plt.tight_layout()
 plt.show()
diff --git a/examples/pylab_examples/vline_hline_demo.py → ...ines_bars_and_markers/vline_hline_demo.py b/examples/pylab_examples/vline_hline_demo.py → ...ines_bars_and_markers/vline_hline_demo.py
diff --git a/examples/pylab_examples/xcorr_acorr_demo.py → ...ines_bars_and_markers/xcorr_acorr_demo.py b/examples/pylab_examples/xcorr_acorr_demo.py → ...ines_bars_and_markers/xcorr_acorr_demo.py
@@ -3,7 +3,8 @@
 Cross- and Auto-Correlation Demo
 ================================
 
-Example use of cross-correlation (``xcorr``) and auto-correlation (``acorr``) plots.
+Example use of cross-correlation (`xcorr`) and auto-correlation (`acorr`)
+plots.
 """
 import matplotlib.pyplot as plt
 import numpy as np
@@ -14,13 +15,11 @@
 
 
 x, y = np.random.randn(2, 100)
-fig = plt.figure()
-ax1 = fig.add_subplot(211)
+fig, [ax1, ax2] = plt.subplots(2, 1, sharex=True)
 ax1.xcorr(x, y, usevlines=True, maxlags=50, normed=True, lw=2)
 ax1.grid(True)
 ax1.axhline(0, color='black', lw=2)
 
-ax2 = fig.add_subplot(212, sharex=ax1)
 ax2.acorr(x, usevlines=True, normed=True, maxlags=50, lw=2)
 ax2.grid(True)
 ax2.axhline(0, color='black', lw=2)

diff --git a/examples/pylab_examples/agg_buffer.py → examples/misc/agg_buffer.py b/examples/pylab_examples/agg_buffer.py → examples/misc/agg_buffer.py
diff --git a/...les/pylab_examples/agg_buffer_to_array.py → examples/misc/agg_buffer_to_array.py b/...les/pylab_examples/agg_buffer_to_array.py → examples/misc/agg_buffer_to_array.py
diff --git a/examples/pylab_examples/anchored_artists.py → examples/misc/anchored_artists.py b/examples/pylab_examples/anchored_artists.py → examples/misc/anchored_artists.py
@@ -11,7 +11,8 @@
 
 
 class AnchoredText(AnchoredOffsetbox):
-    def __init__(self, s, loc, pad=0.4, borderpad=0.5, prop=None, frameon=True):
+    def __init__(self, s, loc, pad=0.4, borderpad=0.5,
+                 prop=None, frameon=True):
 
         self.txt = TextArea(s,
                             minimumdescent=False)
@@ -26,8 +27,8 @@ class AnchoredSizeBar(AnchoredOffsetbox):
     def __init__(self, transform, size, label, loc,
                  pad=0.1, borderpad=0.1, sep=2, prop=None, frameon=True):
         """
-        Draw a horizontal bar with the size in data coordinate of the give axes.
-        A label will be drawn underneath (center-aligned).
+        Draw a horizontal bar with the size in data coordinate of the given
+        axes. A label will be drawn underneath (center-aligned).
 
         pad, borderpad in fraction of the legend font size (or prop)
         sep in points.
@@ -71,7 +72,8 @@ def __init__(self, width, height, xdescent, ydescent,
 
         self.da = DrawingArea(width, height, xdescent, ydescent)
 
-        super(AnchoredDrawingArea, self).__init__(loc, pad=pad, borderpad=borderpad,
+        super(AnchoredDrawingArea, self).__init__(loc, pad=pad,
+                                                  borderpad=borderpad,
                                                   child=self.da,
                                                   prop=None,
                                                   frameon=frameon)

diff --git a/examples/pylab_examples/coords_report.py → examples/misc/coords_report.py b/examples/pylab_examples/coords_report.py → examples/misc/coords_report.py
@@ -13,6 +13,7 @@
 def millions(x):
     return '$%1.1fM' % (x*1e-6)
 
+
 # Fixing random state for reproducibility
 np.random.seed(19680801)
 

diff --git a/...ples/pylab_examples/cursor_demo_sgskip.py → examples/misc/cursor_demo_sgskip.py b/...ples/pylab_examples/cursor_demo_sgskip.py → examples/misc/cursor_demo_sgskip.py
@@ -77,10 +77,10 @@ def mouse_move(self, event):
         plt.draw()
 
 t = np.arange(0.0, 1.0, 0.01)
-s = np.sin(2*2*np.pi*t)
+s = np.sin(2 * 2 * np.pi * t)
 fig, ax = plt.subplots()
 
-#cursor = Cursor(ax)
+# cursor = Cursor(ax)
 cursor = SnaptoCursor(ax, t, s)
 plt.connect('motion_notify_event', cursor.mouse_move)
 

diff --git a/examples/pylab_examples/customize_rc.py → examples/misc/customize_rc.py b/examples/pylab_examples/customize_rc.py → examples/misc/customize_rc.py
@@ -14,7 +14,7 @@
     def set_pub():
         rc('font', weight='bold')    # bold fonts are easier to see
         rc('tick', labelsize=15)     # tick labels bigger
-        rc('lines', lw=1, color='k') # thicker black lines (no budget for color!)
+        rc('lines', lw=1, color='k') # thicker black lines
         rc('grid', c='0.5', ls='-', lw=0.5)  # solid gray grid lines
         rc('savefig', dpi=300)       # higher res outputs
 

diff --git a/examples/pylab_examples/demo_agg_filter.py → examples/misc/demo_agg_filter.py b/examples/pylab_examples/demo_agg_filter.py → examples/misc/demo_agg_filter.py
@@ -9,6 +9,9 @@
 import numpy as np
 import matplotlib.cm as cm
 import matplotlib.mlab as mlab
+import matplotlib.transforms as mtransforms
+from matplotlib.colors import LightSource
+from matplotlib.artist import Artist
 
 
 def smooth1d(x, window_len):
@@ -34,7 +37,7 @@ def smooth2d(A, sigma=3):
 class BaseFilter(object):
     def prepare_image(self, src_image, dpi, pad):
         ny, nx, depth = src_image.shape
-        #tgt_image = np.zeros([pad*2+ny, pad*2+nx, depth], dtype="d")
+        # tgt_image = np.zeros([pad*2+ny, pad*2+nx, depth], dtype="d")
         padded_src = np.zeros([pad*2 + ny, pad*2 + nx, depth], dtype="d")
         padded_src[pad:-pad, pad:-pad, :] = src_image[:, :, :]
 
@@ -82,7 +85,7 @@ def get_pad(self, dpi):
         return int(self.sigma*3/72.*dpi)
 
     def process_image(self, padded_src, dpi):
-        #offsetx, offsety = int(self.offsets[0]), int(self.offsets[1])
+        # offsetx, offsety = int(self.offsets[0]), int(self.offsets[1])
         tgt_image = np.zeros_like(padded_src)
         aa = smooth2d(padded_src[:, :, -1]*self.alpha,
                       self.sigma/72.*dpi)
@@ -106,9 +109,6 @@ def process_image(self, padded_src, dpi):
         return t2
 
 
-from matplotlib.colors import LightSource
-
-
 class LightFilter(BaseFilter):
     "simple gauss filter"
 
@@ -160,9 +160,6 @@ def __call__(self, im, dpi):
         return new_im, offsetx, offsety
 
 
-from matplotlib.artist import Artist
-
-
 class FilteredArtistList(Artist):
     """
     A simple container to draw filtered artist.
@@ -182,9 +179,6 @@ def draw(self, renderer):
         renderer.stop_rasterizing()
 
 
-import matplotlib.transforms as mtransforms
-
-
 def filtered_text(ax):
     # mostly copied from contour_demo.py
 
@@ -281,9 +275,10 @@ def drop_shadow_patches(ax):
     rects1 = ax.bar(ind, menMeans, width, color='r', ec="w", lw=2)
 
     womenMeans = (25, 32, 34, 20, 25)
-    rects2 = ax.bar(ind + width + 0.1, womenMeans, width, color='y', ec="w", lw=2)
+    rects2 = ax.bar(ind + width + 0.1, womenMeans, width,
+                    color='y', ec="w", lw=2)
 
-    #gauss = GaussianFilter(1.5, offsets=(1,1), )
+    # gauss = GaussianFilter(1.5, offsets=(1,1), )
     gauss = DropShadowFilter(5, offsets=(1, 1), )
     shadow = FilteredArtistList(rects1 + rects2, gauss)
     ax.add_artist(shadow)

diff --git a/examples/pylab_examples/demo_ribbon_box.py → examples/misc/demo_ribbon_box.py b/examples/pylab_examples/demo_ribbon_box.py → examples/misc/demo_ribbon_box.py
diff --git a/examples/pylab_examples/fill_spiral.py → examples/misc/fill_spiral.py b/examples/pylab_examples/fill_spiral.py → examples/misc/fill_spiral.py
diff --git a/examples/pylab_examples/findobj_demo.py → examples/misc/findobj_demo.py b/examples/pylab_examples/findobj_demo.py → examples/misc/findobj_demo.py
@@ -29,6 +29,7 @@
 def myfunc(x):
     return hasattr(x, 'set_color') and not hasattr(x, 'set_facecolor')
 
+
 for o in fig.findobj(myfunc):
     o.set_color('blue')
 

diff --git a/examples/pylab_examples/hyperlinks_sgskip.py → examples/misc/hyperlinks_sgskip.py b/examples/pylab_examples/hyperlinks_sgskip.py → examples/misc/hyperlinks_sgskip.py
diff --git a/examples/pylab_examples/load_converter.py → examples/misc/load_converter.py b/examples/pylab_examples/load_converter.py → examples/misc/load_converter.py
diff --git a/examples/pylab_examples/multipage_pdf.py → examples/misc/multipage_pdf.py b/examples/pylab_examples/multipage_pdf.py → examples/misc/multipage_pdf.py
diff --git a/examples/pylab_examples/patheffect_demo.py → examples/misc/patheffect_demo.py b/examples/pylab_examples/patheffect_demo.py → examples/misc/patheffect_demo.py
@@ -15,8 +15,9 @@
     txt = ax1.annotate("test", (1., 1.), (0., 0),
                        arrowprops=dict(arrowstyle="->",
                                        connectionstyle="angle3", lw=2),
-                       size=20, ha="center", path_effects=[PathEffects.withStroke(linewidth=3,
-                                                                                  foreground="w")])
+                       size=20, ha="center",
+                       path_effects=[PathEffects.withStroke(linewidth=3,
+                                                            foreground="w")])
     txt.arrow_patch.set_path_effects([
         PathEffects.Stroke(linewidth=5, foreground="w"),
         PathEffects.Normal()])

diff --git a/examples/pylab_examples/plotfile_demo.py → examples/misc/plotfile_demo.py b/examples/pylab_examples/plotfile_demo.py → examples/misc/plotfile_demo.py
diff --git a/...les/pylab_examples/print_stdout_sgskip.py → examples/misc/print_stdout_sgskip.py b/...les/pylab_examples/print_stdout_sgskip.py → examples/misc/print_stdout_sgskip.py
diff --git a/...les/pylab_examples/pythonic_matplotlib.py → examples/misc/pythonic_matplotlib.py b/...les/pylab_examples/pythonic_matplotlib.py → examples/misc/pythonic_matplotlib.py
diff --git a/examples/pylab_examples/set_and_get.py → examples/misc/set_and_get.py b/examples/pylab_examples/set_and_get.py → examples/misc/set_and_get.py
diff --git a/examples/pylab_examples/transoffset.py → examples/misc/transoffset.py b/examples/pylab_examples/transoffset.py → examples/misc/transoffset.py
@@ -46,7 +46,8 @@
 # offset_copy works for polar plots also.
 ax = plt.subplot(2, 1, 2, projection='polar')
 
-trans_offset = mtransforms.offset_copy(ax.transData, fig=fig, y=6, units='dots')
+trans_offset = mtransforms.offset_copy(ax.transData, fig=fig,
+                                       y=6, units='dots')
 
 for x, y in zip(xs, ys):
     plt.polar((x,), (y,), 'ro')

diff --git a/...ples/pylab_examples/webapp_demo_sgskip.py → examples/misc/webapp_demo_sgskip.py b/...ples/pylab_examples/webapp_demo_sgskip.py → examples/misc/webapp_demo_sgskip.py
@@ -60,4 +60,5 @@ def make_fig():
 
     FigureCanvasAgg(fig).print_png('webapp.png', dpi=150)
 
+
 make_fig()
diff --git a/examples/pylab_examples/zorder_demo.py → examples/misc/zorder_demo.py b/examples/pylab_examples/zorder_demo.py → examples/misc/zorder_demo.py
@@ -56,10 +56,14 @@
 
 x = np.linspace(0, 2*np.pi, 100)
 plt.figure()
-plt.plot(x, np.sin(x), linewidth=10, color='black', label='zorder=10', zorder=10)  # on top
-plt.plot(x, np.cos(1.3*x), linewidth=10, color='red', label='zorder=1', zorder=1)  # bottom
-plt.plot(x, np.sin(2.1*x), linewidth=10, color='green', label='zorder=3', zorder=3)
-plt.axhline(0, linewidth=10, color='blue', label='zorder=2', zorder=2)
+plt.plot(x, np.sin(x), linewidth=10, color='black', label='zorder=10',
+         zorder=10)  # on top
+plt.plot(x, np.cos(1.3*x), linewidth=10, color='red', label='zorder=1',
+         zorder=1)  # bottom
+plt.plot(x, np.sin(2.1*x), linewidth=10, color='green', label='zorder=3',
+         zorder=3)
+plt.axhline(0, linewidth=10, color='blue', label='zorder=2',
+            zorder=2)
 plt.title('Custom order of elements')
 l = plt.legend()
 l.set_zorder(20)  # put the legend on top

diff --git a/examples/pylab_examples/README.txt b/examples/pylab_examples/README.txt
diff --git a/examples/pylab_examples/aspect_loglog.py → examples/scales/aspect_loglog.py b/examples/pylab_examples/aspect_loglog.py → examples/scales/aspect_loglog.py
diff --git a/examples/pylab_examples/symlog_demo.py → examples/scales/symlog_demo.py b/examples/pylab_examples/symlog_demo.py → examples/scales/symlog_demo.py
@@ -31,6 +31,5 @@
 plt.grid(True)
 plt.ylabel('symlog both')
 
-plt.subplots_adjust(hspace=0.5, left=0.2)
-
+plt.tight_layout()
 plt.show()
diff --git a/examples/pylab_examples/hatch_demo.py → ...ples/shapes_and_collections/hatch_demo.py b/examples/pylab_examples/hatch_demo.py → ...ples/shapes_and_collections/hatch_demo.py
@@ -12,12 +12,14 @@
 fig = plt.figure()
 ax1 = fig.add_subplot(131)
 ax1.bar(range(1, 5), range(1, 5), color='red', edgecolor='black', hatch="/")
-ax1.bar(range(1, 5), [6] * 4, bottom=range(1, 5), color='blue', edgecolor='black', hatch='//')
+ax1.bar(range(1, 5), [6] * 4, bottom=range(1, 5),
+        color='blue', edgecolor='black', hatch='//')
 ax1.set_xticks([1.5, 2.5, 3.5, 4.5])
 
 ax2 = fig.add_subplot(132)
 bars = ax2.bar(range(1, 5), range(1, 5), color='yellow', ecolor='black') + \
-    ax2.bar(range(1, 5), [6] * 4, bottom=range(1, 5), color='green', ecolor='black')
+    ax2.bar(range(1, 5), [6] * 4, bottom=range(1, 5),
+            color='green', ecolor='black')
 ax2.set_xticks([1.5, 2.5, 3.5, 4.5])
 
 patterns = ('-', '+', 'x', '\\', '*', 'o', 'O', '.')

diff --git a/examples/pylab_examples/marker_path.py → ...les/shapes_and_collections/marker_path.py b/examples/pylab_examples/marker_path.py → ...les/shapes_and_collections/marker_path.py
diff --git a/examples/pylab_examples/system_monitor.py → examples/specialty_plots/system_monitor.py b/examples/pylab_examples/system_monitor.py → examples/specialty_plots/system_monitor.py
diff --git a/examples/pylab_examples/demo_tight_layout.py → ...ots_axes_and_figures/demo_tight_layout.py b/examples/pylab_examples/demo_tight_layout.py → ...ots_axes_and_figures/demo_tight_layout.py
diff --git a/...ples/pylab_examples/multiple_figs_demo.py → ...ts_axes_and_figures/multiple_figs_demo.py b/...ples/pylab_examples/multiple_figs_demo.py → ...ts_axes_and_figures/multiple_figs_demo.py
diff --git a/examples/pylab_examples/demo_text_path.py → ..._labels_and_annotations/demo_text_path.py b/examples/pylab_examples/demo_text_path.py → ..._labels_and_annotations/demo_text_path.py
@@ -74,7 +74,7 @@ def draw(self, renderer=None):
     p = PathClippedImagePatch(text_path, arr, ec="k",
                               transform=IdentityTransform())
 
-    #p.set_clip_on(False)
+    # p.set_clip_on(False)
 
     # make offset box
     offsetbox = AuxTransformBox(IdentityTransform())
@@ -122,15 +122,18 @@ def draw(self, renderer=None):
     arr = np.arange(256).reshape(1, 256)/256.
 
     if usetex:
-        s = r"$\displaystyle\left[\sum_{n=1}^\infty\frac{-e^{i\pi}}{2^n}\right]$!"
+        s = (r"$\displaystyle\left[\sum_{n=1}^\infty"
+             r"\frac{-e^{i\pi}}{2^n}\right]$!")
     else:
         s = r"$\left[\sum_{n=1}^\infty\frac{-e^{i\pi}}{2^n}\right]$!"
     text_path = TextPath((0, 0), s, size=40, usetex=usetex)
     text_patch = PathClippedImagePatch(text_path, arr, ec="none",
                                        transform=IdentityTransform())
 
-    shadow1 = mpatches.Shadow(text_patch, 1, -1, props=dict(fc="none", ec="0.6", lw=3))
-    shadow2 = mpatches.Shadow(text_patch, 1, -1, props=dict(fc="0.3", ec="none"))
+    shadow1 = mpatches.Shadow(text_patch, 1, -1,
+                              props=dict(fc="none", ec="0.6", lw=3))
+    shadow2 = mpatches.Shadow(text_patch, 1, -1,
+                              props=dict(fc="0.3", ec="none"))
 
     # make offset box
     offsetbox = AuxTransformBox(IdentityTransform())
@@ -144,7 +147,7 @@ def draw(self, renderer=None):
                         boxcoords="offset points",
                         box_alignment=(0.5, 0.5),
                         )
-    #text_path.set_size(10)
+    # text_path.set_size(10)
 
     ax.add_artist(ab)
 

diff --git a/examples/pylab_examples/multiline.py → .../text_labels_and_annotations/multiline.py b/examples/pylab_examples/multiline.py → .../text_labels_and_annotations/multiline.py
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -1160,7 +1160,7 @@ def eventplot(self, positions, orientation='horizontal', lineoffsets=1,
         Examples
         --------
 
-        .. plot:: mpl_examples/pylab_examples/eventplot_demo.py
+        .. plot:: mpl_examples/lines_bars_and_markers/eventplot_demo.py
         """
         self._process_unit_info(xdata=positions,
                                 ydata=[lineoffsets, linelengths],

diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -1303,7 +1303,7 @@ def __init__(self,
         Examples
         --------
 
-        .. plot:: mpl_examples/pylab_examples/eventcollection_demo.py
+        .. plot:: mpl_examples/lines_bars_and_markers/eventcollection_demo.py
         """
 
         segment = (lineoffset + linelength / 2.,

diff --git a/lib/matplotlib/dates.py b/lib/matplotlib/dates.py
@@ -291,7 +291,7 @@ class bytespdate2num(strpdate2num):
     """
     Use this class to parse date strings to matplotlib datenums when
     you know the date format string of the date you are parsing.  See
-    :file:`examples/pylab_examples/load_converter.py`.
+    :file:`examples/misc/load_converter.py`.
     """
     def __init__(self, fmt, encoding='utf-8'):
         """
Original file line number	Diff line number	Diff line change
Expand Up		@@ -60,4 +60,5 @@ def make_fig():

		FigureCanvasAgg(fig).print_png('webapp.png', dpi=150)


		make_fig()