diff --git a/enable/example_application.py b/enable/example_application.py
index 783fabd15..11898f715 100644
--- a/enable/example_application.py
+++ b/enable/example_application.py
@@ -11,65 +11,21 @@
 Example Application Support
 ===========================
 
-This module provides a simple Pyface application that can be used by examples
-in places where a DemoFrame is insufficient.
+This module is meant for internal use only and it is not meant for use in
+library code. Importing from this module is deprecated and it will be removed
+in Enable 6.0. We highly recommend that you update your code and vendorize what
+is necessary.
 
 """
-
-from pyface.api import ApplicationWindow, GUI
-
-
-class DemoApplication(ApplicationWindow):
-    """ Simple Pyface application displaying a component.
-
-    This application has the same interface as the DemoFrames from the
-    example_support module, but the window is embedded in a full Pyface
-    application.  This means that subclasses have the opportunity of
-    adding Menus, Toolbars, and other similar features to the demo, where
-    needed.
-
-    """
-
-    def _create_contents(self, parent):
-        self.enable_win = self._create_window()
-        return self.enable_win.control
-
-    def _create_window(self):
-        "Subclasses should override this method and return an enable.Window"
-        raise NotImplementedError()
-
-    @classmethod
-    def demo_main(cls, **traits):
-        """ Create the demo application and start the mainloop, if needed
-
-        This should be called with appropriate arguments which will be passed
-        to the class' constructor.
-
-        """
-        # get the Pyface GUI
-        gui = GUI()
-
-        # create the application's main window
-        window = cls(**traits)
-        window.open()
-
-        # start the application
-        # if there isn't already a running mainloop, this will block
-        gui.start_event_loop()
-
-        # if there is already a running mainloop (eg. in an IPython session),
-        # return a reference to the window so that our caller can hold on to it
-        return window
-
-
-def demo_main(cls, **traits):
-    """ Create the demo application and start the mainloop, if needed.
-
-    This is a simple wrapper around `cls.demo_main` for compatibility with the
-    `DemoFrame` implementation.
-
-    This should be called with appropriate arguments which will be passed to
-    the class' constructor.
-
-    """
-    cls.demo_main(**traits)
+import warnings
+
+from enable.examples._example_application import DemoApplication, demo_main
+
+warnings.warn(
+    "This module is meant for internal use only and it is not meant for use in"
+    " library code. Importing from this module is deprecated and it will be"
+    " removed in Enable 6.0. We highly recommend that you update your code and"
+    " vendorize what is necessary.",
+    DeprecationWarning,
+    stacklevel=2
+)
diff --git a/enable/example_canvas.py b/enable/example_canvas.py
index 6dd7a9f0b..b9a5d9ae1 100644
--- a/enable/example_canvas.py
+++ b/enable/example_canvas.py
@@ -7,36 +7,21 @@
 # is also available online at http://www.enthought.com/licenses/BSD.txt
 #
 # Thanks for using Enthought open source!
-""" A suitable replacement for the old Canvas class in Kiva.
 """
-
-from enable.api import Component, Window
-
-
-class _DummyComponent(Component):
-    def __init__(self, draw_func, *args, **kwargs):
-        super(_DummyComponent, self).__init__(*args, **kwargs)
-        self._draw_func = draw_func
-
-    def __del__(self):
-        self._draw_func = None
-
-    def draw(self, gc, **kwargs):
-        """ Call our wrapped draw function.
-        """
-        self._draw_func(gc)
-
-
-class Canvas(Window):
-    def __init__(self):
-        # Create a component that wraps our do_draw method
-        self.component = _DummyComponent(self.do_draw)
-
-        # call our base class
-        super(Window, self).__init__(None)
-
-    def do_draw(self, gc):
-        """ Method to be implemented by subclasses to actually perform various
-        GC drawing commands before the GC is blitted into the screen.
-        """
-        pass
+This module is meant for internal use only and it is not meant for use in
+library code. Importing from this module is deprecated and it will be removed
+in Enable 6.0. We highly recommend that you update your code and vendorize what
+is necessary.
+"""
+import warnings
+
+from enable.examples._example_canvas import Canvas
+
+warnings.warn(
+    "This module is meant for internal use only and it is not meant for use in"
+    " library code. Importing from this module is deprecated and it will be"
+    " removed in Enable 6.0. We highly recommend that you update your code and"
+    " vendorize what is necessary.",
+    DeprecationWarning,
+    stacklevel=2
+)
diff --git a/enable/example_support.py b/enable/example_support.py
index 156d46f3a..eac1173bf 100644
--- a/enable/example_support.py
+++ b/enable/example_support.py
@@ -8,50 +8,20 @@
 #
 # Thanks for using Enthought open source!
 """
-Support class that wraps up the boilerplate toolkit calls that virtually all
-demo programs have to use.
+This module is meant for internal use only and it is not meant for use in
+library code. Importing from this module is deprecated and it will be removed
+in Enable 6.0. We highly recommend that you update your code and vendorize what
+is necessary.
 """
-
-from traits.api import HasTraits, Instance
-from traits.etsconfig.api import ETSConfig
-from traitsui.api import Item, View
-
-from enable.api import Component, ComponentEditor
-
-# FIXME - it should be enough to do the following import, but because of the
-# PyQt/traits problem (see below) we can't because it would drag in traits too
-# early.  Until it is fixed we just assume wx if we can import it.
-# Force the selection of a valid toolkit.
-# import enable.toolkit
-if not ETSConfig.toolkit:
-    for toolkit, toolkit_module in (("wx", "wx"), ("qt4", "PyQt4")):
-        try:
-            exec("import " + toolkit_module)
-            ETSConfig.toolkit = toolkit
-            break
-        except ImportError:
-            pass
-    else:
-        raise RuntimeError("Can't load wx or qt4 backend for Chaco.")
-
-
-class DemoFrame(HasTraits):
-
-    component = Instance(Component)
-
-    traits_view = View(
-        Item("component", editor=ComponentEditor(), show_label=False),
-        resizable=True,
-    )
-
-    def _component_default(self):
-        return self._create_component()
-
-    def _create_component(self):
-        """ Create and return a component which is typically a
-        container with nested components """
-        raise NotImplementedError
-
-
-def demo_main(demo_class, size=(640, 480), title="Enable Example"):
-    demo_class().configure_traits()
+import warnings
+
+from enable.examples._example_support import DemoFrame, demo_main
+
+warnings.warn(
+    "This module is meant for internal use only and it is not meant for use in"
+    " library code. Importing from this module is deprecated and it will be"
+    " removed in Enable 6.0. We highly recommend that you update your code and"
+    " vendorize what is necessary.",
+    DeprecationWarning,
+    stacklevel=2
+)
diff --git a/enable/examples/_example_application.py b/enable/examples/_example_application.py
new file mode 100644
index 000000000..783fabd15
--- /dev/null
+++ b/enable/examples/_example_application.py
@@ -0,0 +1,75 @@
+# (C) Copyright 2005-2021 Enthought, Inc., Austin, TX
+# All rights reserved.
+#
+# This software is provided without warranty under the terms of the BSD
+# license included in LICENSE.txt and may be redistributed only under
+# the conditions described in the aforementioned license. The license
+# is also available online at http://www.enthought.com/licenses/BSD.txt
+#
+# Thanks for using Enthought open source!
+"""
+Example Application Support
+===========================
+
+This module provides a simple Pyface application that can be used by examples
+in places where a DemoFrame is insufficient.
+
+"""
+
+from pyface.api import ApplicationWindow, GUI
+
+
+class DemoApplication(ApplicationWindow):
+    """ Simple Pyface application displaying a component.
+
+    This application has the same interface as the DemoFrames from the
+    example_support module, but the window is embedded in a full Pyface
+    application.  This means that subclasses have the opportunity of
+    adding Menus, Toolbars, and other similar features to the demo, where
+    needed.
+
+    """
+
+    def _create_contents(self, parent):
+        self.enable_win = self._create_window()
+        return self.enable_win.control
+
+    def _create_window(self):
+        "Subclasses should override this method and return an enable.Window"
+        raise NotImplementedError()
+
+    @classmethod
+    def demo_main(cls, **traits):
+        """ Create the demo application and start the mainloop, if needed
+
+        This should be called with appropriate arguments which will be passed
+        to the class' constructor.
+
+        """
+        # get the Pyface GUI
+        gui = GUI()
+
+        # create the application's main window
+        window = cls(**traits)
+        window.open()
+
+        # start the application
+        # if there isn't already a running mainloop, this will block
+        gui.start_event_loop()
+
+        # if there is already a running mainloop (eg. in an IPython session),
+        # return a reference to the window so that our caller can hold on to it
+        return window
+
+
+def demo_main(cls, **traits):
+    """ Create the demo application and start the mainloop, if needed.
+
+    This is a simple wrapper around `cls.demo_main` for compatibility with the
+    `DemoFrame` implementation.
+
+    This should be called with appropriate arguments which will be passed to
+    the class' constructor.
+
+    """
+    cls.demo_main(**traits)
diff --git a/enable/examples/_example_canvas.py b/enable/examples/_example_canvas.py
new file mode 100644
index 000000000..6dd7a9f0b
--- /dev/null
+++ b/enable/examples/_example_canvas.py
@@ -0,0 +1,42 @@
+# (C) Copyright 2005-2021 Enthought, Inc., Austin, TX
+# All rights reserved.
+#
+# This software is provided without warranty under the terms of the BSD
+# license included in LICENSE.txt and may be redistributed only under
+# the conditions described in the aforementioned license. The license
+# is also available online at http://www.enthought.com/licenses/BSD.txt
+#
+# Thanks for using Enthought open source!
+""" A suitable replacement for the old Canvas class in Kiva.
+"""
+
+from enable.api import Component, Window
+
+
+class _DummyComponent(Component):
+    def __init__(self, draw_func, *args, **kwargs):
+        super(_DummyComponent, self).__init__(*args, **kwargs)
+        self._draw_func = draw_func
+
+    def __del__(self):
+        self._draw_func = None
+
+    def draw(self, gc, **kwargs):
+        """ Call our wrapped draw function.
+        """
+        self._draw_func(gc)
+
+
+class Canvas(Window):
+    def __init__(self):
+        # Create a component that wraps our do_draw method
+        self.component = _DummyComponent(self.do_draw)
+
+        # call our base class
+        super(Window, self).__init__(None)
+
+    def do_draw(self, gc):
+        """ Method to be implemented by subclasses to actually perform various
+        GC drawing commands before the GC is blitted into the screen.
+        """
+        pass
diff --git a/enable/examples/_example_support.py b/enable/examples/_example_support.py
new file mode 100644
index 000000000..892576d54
--- /dev/null
+++ b/enable/examples/_example_support.py
@@ -0,0 +1,41 @@
+# (C) Copyright 2005-2021 Enthought, Inc., Austin, TX
+# All rights reserved.
+#
+# This software is provided without warranty under the terms of the BSD
+# license included in LICENSE.txt and may be redistributed only under
+# the conditions described in the aforementioned license. The license
+# is also available online at http://www.enthought.com/licenses/BSD.txt
+#
+# Thanks for using Enthought open source!
+"""
+Support class that wraps up the boilerplate toolkit calls that virtually all
+demo programs have to use.
+"""
+
+from traits.api import HasTraits, Instance
+from traits.etsconfig.api import ETSConfig
+from traitsui.api import Item, View
+
+from enable.api import Component, ComponentEditor
+
+
+class DemoFrame(HasTraits):
+
+    component = Instance(Component)
+
+    traits_view = View(
+        Item("component", editor=ComponentEditor(), show_label=False),
+        resizable=True,
+    )
+
+    def _component_default(self):
+        return self._create_component()
+
+    def _create_component(self):
+        """ Create and return a component which is typically a
+        container with nested components """
+        raise NotImplementedError
+
+
+def demo_main(demo_class, size=(640, 480), title="Enable Example"):
+    demo_class().configure_traits()
diff --git a/enable/examples/demo/enable/basic_draw.py b/enable/examples/demo/enable/basic_draw.py
index a18aca324..07bef145e 100644
--- a/enable/examples/demo/enable/basic_draw.py
+++ b/enable/examples/demo/enable/basic_draw.py
@@ -11,7 +11,7 @@
 This demonstrates the most basic drawing capabilities using Enable.  A new
 component is created and added to a container.
 """
-from enable.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.api import Component, Container
 
 
diff --git a/enable/examples/demo/enable/basic_move.py b/enable/examples/demo/enable/basic_move.py
index 9f21804b4..0e3c14cb4 100644
--- a/enable/examples/demo/enable/basic_move.py
+++ b/enable/examples/demo/enable/basic_move.py
@@ -14,7 +14,7 @@
 from traits.api import Float
 
 from enable.api import Component, Pointer, Container
-from enable.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 
 
 class Box(Component):
diff --git a/enable/examples/demo/enable/brush_draw.py b/enable/examples/demo/enable/brush_draw.py
index e94c6f81b..f8403d52e 100644
--- a/enable/examples/demo/enable/brush_draw.py
+++ b/enable/examples/demo/enable/brush_draw.py
@@ -12,7 +12,7 @@
 """
 from traits.api import Instance
 
-from enable.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.api import (
     Brush, ColorStop, Component, Container, Gradient, RadialGradientBrush
 )
diff --git a/enable/examples/demo/enable/canvas_demo.py b/enable/examples/demo/enable/canvas_demo.py
index ef0d88784..8a4d61ad7 100644
--- a/enable/examples/demo/enable/canvas_demo.py
+++ b/enable/examples/demo/enable/canvas_demo.py
@@ -8,7 +8,7 @@
 #
 # Thanks for using Enthought open source!
 from enable.api import Canvas, Viewport
-from enable.example_support import demo_main, DemoFrame
+from enable.examples._example_support import demo_main, DemoFrame
 from enable.tools.api import ViewportPanTool
 
 
diff --git a/enable/examples/demo/enable/compass_example.py b/enable/examples/demo/enable/compass_example.py
index 1f1155386..16b44adef 100644
--- a/enable/examples/demo/enable/compass_example.py
+++ b/enable/examples/demo/enable/compass_example.py
@@ -8,7 +8,7 @@
 #
 # Thanks for using Enthought open source!
 from enable.api import OverlayContainer, Compass
-from enable.example_support import demo_main, DemoFrame
+from enable.examples._example_support import demo_main, DemoFrame
 
 
 class Demo(DemoFrame):
diff --git a/enable/examples/demo/enable/container_demo.py b/enable/examples/demo/enable/container_demo.py
index b6312f331..ab0fcd6f4 100644
--- a/enable/examples/demo/enable/container_demo.py
+++ b/enable/examples/demo/enable/container_demo.py
@@ -11,7 +11,7 @@
 from traits.api import Enum, Float, Int, Str, Tuple
 
 from enable.api import ColorTrait
-from enable.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.tools.api import DragTool
 from kiva.trait_defs.api import KivaFont
 
diff --git a/enable/examples/demo/enable/filled_container_demo.py b/enable/examples/demo/enable/filled_container_demo.py
index f98841dea..eeb83ef10 100644
--- a/enable/examples/demo/enable/filled_container_demo.py
+++ b/enable/examples/demo/enable/filled_container_demo.py
@@ -22,7 +22,7 @@
 from traits.api import Any, Enum, Float, Instance, Tuple
 
 from enable.api import Container, Component, Pointer
-from enable.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from kiva.fonttools import str_to_font
 
 
diff --git a/enable/examples/demo/enable/gradient_demo.py b/enable/examples/demo/enable/gradient_demo.py
index 3747cee6b..1309e321d 100644
--- a/enable/examples/demo/enable/gradient_demo.py
+++ b/enable/examples/demo/enable/gradient_demo.py
@@ -26,7 +26,7 @@
 from traits.api import Instance, Int, observe
 from traitsui.api import Item, OKCancelButtons, View
 
-from enable.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.api import (
     AbstractOverlay, BaseTool, ColorStop, Component, Gradient,
     LinearGradientBrush, black_color_trait, marker_trait
diff --git a/enable/examples/demo/enable/image_draw.py b/enable/examples/demo/enable/image_draw.py
index 3948f7b91..05730c000 100644
--- a/enable/examples/demo/enable/image_draw.py
+++ b/enable/examples/demo/enable/image_draw.py
@@ -13,7 +13,7 @@
 import os
 
 from enable.api import ConstraintsContainer
-from enable.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.primitives.image import Image
 
 THIS_DIR = os.path.split(__file__)[0]
diff --git a/enable/examples/demo/enable/label_test.py b/enable/examples/demo/enable/label_test.py
index 6ecfe2046..f22c93a51 100644
--- a/enable/examples/demo/enable/label_test.py
+++ b/enable/examples/demo/enable/label_test.py
@@ -9,7 +9,7 @@
 # Thanks for using Enthought open source!
 """ Small demo of the Label component.  """
 
-from enable.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.label import Label
 
 
diff --git a/enable/examples/demo/enable/latency_demo.py b/enable/examples/demo/enable/latency_demo.py
index 4a17503bf..ae503c1e3 100644
--- a/enable/examples/demo/enable/latency_demo.py
+++ b/enable/examples/demo/enable/latency_demo.py
@@ -16,7 +16,7 @@
 from traits.api import Float
 
 from enable.api import Component, Container, ColorTrait, black_color_trait
-from enable.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from kiva.api import SWISS, Font
 
 font = Font(family=SWISS)
diff --git a/enable/examples/demo/enable/primitives_demo.py b/enable/examples/demo/enable/primitives_demo.py
index 75e04e2d6..c7cc9cd3d 100644
--- a/enable/examples/demo/enable/primitives_demo.py
+++ b/enable/examples/demo/enable/primitives_demo.py
@@ -16,7 +16,7 @@
     DragLine, DragPolygon, DragSegment, DrawingCanvas, DrawingCanvasToolbar,
     DrawingTool, PointLine, PointPolygon, ToolbarButton
 )
-from enable.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 
 
 class ResetButton(ToolbarButton):
diff --git a/enable/examples/demo/enable/resize_tool_demo.py b/enable/examples/demo/enable/resize_tool_demo.py
index 8798dfda7..bbafa90e0 100644
--- a/enable/examples/demo/enable/resize_tool_demo.py
+++ b/enable/examples/demo/enable/resize_tool_demo.py
@@ -11,7 +11,7 @@
 This demonstrates the resize tool.
 """
 from enable.api import Component, Container
-from enable.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.tools.resize_tool import ResizeTool
 
 
diff --git a/enable/examples/demo/enable/scrollbar_demo.py b/enable/examples/demo/enable/scrollbar_demo.py
index b1a3c7a65..989f79cbf 100644
--- a/enable/examples/demo/enable/scrollbar_demo.py
+++ b/enable/examples/demo/enable/scrollbar_demo.py
@@ -8,7 +8,7 @@
 #
 # Thanks for using Enthought open source!
 from enable.api import Container, Label, NativeScrollBar
-from enable.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 
 
 class Demo(DemoFrame):
diff --git a/enable/examples/demo/enable/scrolled_canvas_demo.py b/enable/examples/demo/enable/scrolled_canvas_demo.py
index 98caccde9..c35bba079 100644
--- a/enable/examples/demo/enable/scrolled_canvas_demo.py
+++ b/enable/examples/demo/enable/scrolled_canvas_demo.py
@@ -19,7 +19,7 @@
 from numpy import array
 
 from enable.api import Canvas, Viewport, Scrolled
-from enable.example_support import demo_main, DemoFrame
+from enable.examples._example_support import demo_main, DemoFrame
 from enable.primitives.api import Box
 from enable.tools.api import ViewportPanTool
 
diff --git a/enable/examples/demo/enable/scrolled_demo.py b/enable/examples/demo/enable/scrolled_demo.py
index 6f1b399bd..139aa904d 100644
--- a/enable/examples/demo/enable/scrolled_demo.py
+++ b/enable/examples/demo/enable/scrolled_demo.py
@@ -14,7 +14,7 @@
 from traits.api import Enum, Float, Instance, Tuple
 
 from enable.api import Component, Scrolled, Container, Pointer
-from enable.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 
 
 class Circle(Component):
diff --git a/enable/examples/demo/enable/shapes/run.py b/enable/examples/demo/enable/shapes/run.py
index 4b21b7910..12cd51a78 100644
--- a/enable/examples/demo/enable/shapes/run.py
+++ b/enable/examples/demo/enable/shapes/run.py
@@ -13,7 +13,7 @@
 
 # Enthought library imports.
 from enable.api import Container
-from enable.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 
 # Local imports
 from enable.examples.demo.enable.shapes.api import Box, Circle
diff --git a/enable/examples/demo/enable/slider_example.py b/enable/examples/demo/enable/slider_example.py
index 9b81d66b1..639dcf857 100644
--- a/enable/examples/demo/enable/slider_example.py
+++ b/enable/examples/demo/enable/slider_example.py
@@ -8,7 +8,7 @@
 #
 # Thanks for using Enthought open source!
 from enable.api import OverlayContainer, Slider
-from enable.example_support import demo_main, DemoFrame
+from enable.examples._example_support import demo_main, DemoFrame
 
 
 class Demo(DemoFrame):
diff --git a/enable/examples/demo/enable/stacked_container_demo.py b/enable/examples/demo/enable/stacked_container_demo.py
index 734a1a098..f272df2e7 100644
--- a/enable/examples/demo/enable/stacked_container_demo.py
+++ b/enable/examples/demo/enable/stacked_container_demo.py
@@ -8,7 +8,7 @@
 #
 # Thanks for using Enthought open source!
 from enable.api import Container, Window, TextField
-from enable.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.stacked_container import VStackedContainer, HStackedContainer
 
 size = (240, 240)
diff --git a/enable/examples/demo/enable/text_field_demo.py b/enable/examples/demo/enable/text_field_demo.py
index 3bb0d32af..a32dfd49e 100644
--- a/enable/examples/demo/enable/text_field_demo.py
+++ b/enable/examples/demo/enable/text_field_demo.py
@@ -8,7 +8,7 @@
 #
 # Thanks for using Enthought open source!
 from enable.api import Container, TextField
-from enable.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 
 
 size = (500, 400)
diff --git a/enable/examples/demo/enable/text_grid_demo.py b/enable/examples/demo/enable/text_grid_demo.py
index ca18a423a..abb08efe4 100644
--- a/enable/examples/demo/enable/text_grid_demo.py
+++ b/enable/examples/demo/enable/text_grid_demo.py
@@ -10,7 +10,7 @@
 from numpy import array
 
 from enable.api import Container
-from enable.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.text_grid import TextGrid
 
 size = (400, 100)
diff --git a/enable/examples/demo/enable/tools/button_tool.py b/enable/examples/demo/enable/tools/button_tool.py
index 0c4c042f7..93105a3e7 100644
--- a/enable/examples/demo/enable/tools/button_tool.py
+++ b/enable/examples/demo/enable/tools/button_tool.py
@@ -17,7 +17,7 @@
 
 from enable.api import Container, transparent_color
 from enable.colors import ColorTrait
-from enable.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.primitives.api import Box
 from enable.tools.button_tool import ButtonTool
 
diff --git a/enable/examples/demo/enable/tools/drop_tool.py b/enable/examples/demo/enable/tools/drop_tool.py
index a683200c0..e2565f8dc 100644
--- a/enable/examples/demo/enable/tools/drop_tool.py
+++ b/enable/examples/demo/enable/tools/drop_tool.py
@@ -11,7 +11,7 @@
 This demonstrates the use of the drop tool.
 """
 
-from enable.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.api import Component, Container, Label
 from enable.tools.base_drop_tool import BaseDropTool
 
diff --git a/enable/examples/demo/enable/tools/pyface/context_menu.py b/enable/examples/demo/enable/tools/pyface/context_menu.py
index a888b88fc..088a1270b 100644
--- a/enable/examples/demo/enable/tools/pyface/context_menu.py
+++ b/enable/examples/demo/enable/tools/pyface/context_menu.py
@@ -12,7 +12,7 @@
 component is created and added to a container.
 """
 
-from enable.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.api import Component, Container
 from enable.tools.pyface.context_menu_tool import ContextMenuTool
 
diff --git a/enable/examples/demo/enable/tools/pyface/undoable_move_tool.py b/enable/examples/demo/enable/tools/pyface/undoable_move_tool.py
index 2209e7cfb..42aefd273 100644
--- a/enable/examples/demo/enable/tools/pyface/undoable_move_tool.py
+++ b/enable/examples/demo/enable/tools/pyface/undoable_move_tool.py
@@ -27,7 +27,7 @@
 from traits.api import Instance
 
 from enable.api import Container, Window, KeySpec
-from enable.example_application import DemoApplication, demo_main
+from enable.examples._example_application import DemoApplication, demo_main
 from enable.primitives.api import Box
 from enable.tools.pyface.api import MoveCommandTool, UndoTool
 
diff --git a/enable/examples/demo/enable/view_bounds_test.py b/enable/examples/demo/enable/view_bounds_test.py
index 67f56bd8a..cb43d3997 100644
--- a/enable/examples/demo/enable/view_bounds_test.py
+++ b/enable/examples/demo/enable/view_bounds_test.py
@@ -13,7 +13,7 @@
 
 from enable.api import Container, Component, Scrolled
 from enable.base import empty_rectangle, intersect_bounds
-from enable.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 
 
 class Box(Component):
diff --git a/enable/examples/demo/enable/zoomed_event_demo.py b/enable/examples/demo/enable/zoomed_event_demo.py
index b5742e10e..09f4973ac 100644
--- a/enable/examples/demo/enable/zoomed_event_demo.py
+++ b/enable/examples/demo/enable/zoomed_event_demo.py
@@ -13,7 +13,7 @@
 from traits.api import Float
 
 from enable.api import AbstractOverlay, Canvas, Viewport, ColorTrait, Scrolled
-from enable.example_support import demo_main, DemoFrame
+from enable.examples._example_support import demo_main, DemoFrame
 from enable.primitives.api import Box
 from enable.tools.api import ViewportPanTool
 
diff --git a/enable/text_field_grid.py b/enable/text_field_grid.py
index 133b8fb0a..310c1edf3 100644
--- a/enable/text_field_grid.py
+++ b/enable/text_field_grid.py
@@ -188,7 +188,7 @@ def _cells_changed(self, new):
 if __name__ == "__main__":
     from enable.wx_backend.api import Window
     from enable.api import Container
-    from enable.example_support import DemoFrame, demo_main
+    from enable.examples._example_support import DemoFrame, demo_main
 
     class MyFrame(DemoFrame):
         def _create_window(self):
diff --git a/kiva/examples/kiva/compiled_path.py b/kiva/examples/kiva/compiled_path.py
index 6bdb9e49d..193f276b0 100644
--- a/kiva/examples/kiva/compiled_path.py
+++ b/kiva/examples/kiva/compiled_path.py
@@ -16,7 +16,7 @@
 import tempfile
 
 from enable.api import ConstraintsContainer
-from enable.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.primitives.image import Image
 from kiva.api import STROKE
 from kiva.image import GraphicsContext, CompiledPath
diff --git a/kiva/examples/kiva/dash.py b/kiva/examples/kiva/dash.py
index fe3c17bf5..2bf4513e5 100644
--- a/kiva/examples/kiva/dash.py
+++ b/kiva/examples/kiva/dash.py
@@ -13,7 +13,7 @@
 import numpy
 
 from enable.api import ConstraintsContainer
-from enable.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.primitives.image import Image
 from kiva import constants
 from kiva.agg import GraphicsContextArray
diff --git a/kiva/examples/kiva/ellipse.py b/kiva/examples/kiva/ellipse.py
index c36faaf66..d3a304a52 100644
--- a/kiva/examples/kiva/ellipse.py
+++ b/kiva/examples/kiva/ellipse.py
@@ -12,7 +12,7 @@
 from scipy import pi
 
 from enable.api import ConstraintsContainer
-from enable.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.primitives.image import Image
 from kiva.image import GraphicsContext
 
diff --git a/kiva/examples/kiva/gradient.py b/kiva/examples/kiva/gradient.py
index 592874e0e..eb156201d 100644
--- a/kiva/examples/kiva/gradient.py
+++ b/kiva/examples/kiva/gradient.py
@@ -12,7 +12,7 @@
 from numpy import array, pi
 
 from enable.api import ConstraintsContainer
-from enable.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.primitives.image import Image
 from kiva import constants
 from kiva.image import GraphicsContext
diff --git a/kiva/examples/kiva/qt4_simple.py b/kiva/examples/kiva/qt4_simple.py
index 676ae552e..cdc90be85 100644
--- a/kiva/examples/kiva/qt4_simple.py
+++ b/kiva/examples/kiva/qt4_simple.py
@@ -16,7 +16,7 @@
 
 ETSConfig.toolkit = "qt4.qpainter"
 
-from enable.example_canvas import Canvas
+from enable.examples._example_canvas import Canvas
 
 try:
     from pyface.qt import QtGui
diff --git a/kiva/examples/kiva/rect.py b/kiva/examples/kiva/rect.py
index 89c4ae1c0..ac1ab4ecb 100644
--- a/kiva/examples/kiva/rect.py
+++ b/kiva/examples/kiva/rect.py
@@ -10,7 +10,7 @@
 import tempfile
 
 from enable.api import ConstraintsContainer
-from enable.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.primitives.image import Image
 from kiva.image import GraphicsContext
 
diff --git a/kiva/examples/kiva/simple.py b/kiva/examples/kiva/simple.py
index 6cb46bf76..0b877775f 100644
--- a/kiva/examples/kiva/simple.py
+++ b/kiva/examples/kiva/simple.py
@@ -10,7 +10,7 @@
 import tempfile
 
 from enable.api import ConstraintsContainer
-from enable.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.primitives.image import Image
 from kiva import constants
 from kiva.image import GraphicsContext
diff --git a/kiva/examples/kiva/simple2.py b/kiva/examples/kiva/simple2.py
index 828a1522a..94828d01b 100644
--- a/kiva/examples/kiva/simple2.py
+++ b/kiva/examples/kiva/simple2.py
@@ -10,7 +10,7 @@
 import tempfile
 
 from enable.api import ConstraintsContainer
-from enable.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 from enable.primitives.image import Image
 from kiva.image import GraphicsContext
 
diff --git a/kiva/examples/kiva/star.py b/kiva/examples/kiva/star.py
index b99127699..a040be1c5 100644
--- a/kiva/examples/kiva/star.py
+++ b/kiva/examples/kiva/star.py
@@ -12,7 +12,7 @@
 from scipy import pi
 
 from enable.api import ConstraintsContainer
-from enable.example_support import demo_main, DemoFrame
+from enable.examples._example_support import demo_main, DemoFrame
 from enable.primitives.image import Image
 from kiva.image import GraphicsContext
 
diff --git a/kiva/examples/kiva/star1.py b/kiva/examples/kiva/star1.py
index 4be9b6dd5..acaf6743d 100644
--- a/kiva/examples/kiva/star1.py
+++ b/kiva/examples/kiva/star1.py
@@ -13,7 +13,7 @@
 from traitsui.api import Item, View
 
 from enable.api import ConstraintsContainer, Component, ComponentEditor
-from enable.example_support import demo_main, DemoFrame
+from enable.examples._example_support import demo_main, DemoFrame
 from enable.primitives.image import Image
 from kiva import constants
 from kiva.image import GraphicsContext
diff --git a/kiva/examples/kiva/ui_gradient.py b/kiva/examples/kiva/ui_gradient.py
index e440064cb..97bf68b63 100644
--- a/kiva/examples/kiva/ui_gradient.py
+++ b/kiva/examples/kiva/ui_gradient.py
@@ -10,7 +10,7 @@
 import numpy as np
 
 from enable.api import Component
-from enable.example_support import demo_main, DemoFrame
+from enable.examples._example_support import demo_main, DemoFrame
 
 
 class MyCanvas(Component):
diff --git a/kiva/examples/kiva/ui_text.py b/kiva/examples/kiva/ui_text.py
index 4037dacf2..cfcfb058f 100644
--- a/kiva/examples/kiva/ui_text.py
+++ b/kiva/examples/kiva/ui_text.py
@@ -8,7 +8,7 @@
 #
 # Thanks for using Enthought open source!
 from enable.api import Component
-from enable.example_support import DemoFrame, demo_main
+from enable.examples._example_support import DemoFrame, demo_main
 
 
 def glyph_a(gc):