diff --git a/chaco/base_2d_plot.py b/chaco/base_2d_plot.py
index f49aea7ab..bc5bfbd3b 100644
--- a/chaco/base_2d_plot.py
+++ b/chaco/base_2d_plot.py
@@ -19,10 +19,10 @@
 # Local relative imports
 from .abstract_plot_renderer import AbstractPlotRenderer
 from .base import reverse_map_1d
-from .plot_label import PlotLabel
 from .grid_data_source import GridDataSource
 from .grid_mapper import GridMapper
 from .image_data import ImageData
+from .overlays.plot_label import PlotLabel
 
 
 class Base2DPlot(AbstractPlotRenderer):
diff --git a/chaco/base_xy_plot.py b/chaco/base_xy_plot.py
index 21510c63e..509f47fa8 100644
--- a/chaco/base_xy_plot.py
+++ b/chaco/base_xy_plot.py
@@ -26,7 +26,7 @@
 from .axis import PlotAxis
 from .base import point_line_distance, reverse_map_1d
 from .grid import PlotGrid
-from .plot_label import PlotLabel
+from .overlays.plot_label import PlotLabel
 
 
 class BaseXYPlot(AbstractPlotRenderer):
diff --git a/chaco/plot.py b/chaco/plot.py
index fcd4ca2b8..4c2b8c555 100644
--- a/chaco/plot.py
+++ b/chaco/plot.py
@@ -33,10 +33,10 @@
 from .grid_data_source import GridDataSource
 from .grid_mapper import GridMapper
 from .image_data import ImageData
-from .legend import Legend
 from .linear_mapper import LinearMapper
 from .log_mapper import LogMapper
-from .plot_label import PlotLabel
+from .overlays.legend import Legend
+from .overlays.plot_label import PlotLabel
 from .plots.barplot import BarPlot
 from .plots.candle_plot import CandlePlot
 from .plots.colormapped_scatterplot import ColormappedScatterPlot
diff --git a/chaco/selectable_legend.py b/chaco/selectable_legend.py
index 97584a5fc..197c43e11 100644
--- a/chaco/selectable_legend.py
+++ b/chaco/selectable_legend.py
@@ -11,7 +11,7 @@
 from chaco.tools.select_tool import SelectTool
 from traits.api import List
 
-from .legend import Legend
+from .overlays.legend import Legend
 
 
 class SelectableLegend(Legend, SelectTool):
diff --git a/chaco/tests/test_array_or_none.py b/chaco/tests/test_array_or_none.py
index 28cb87798..c67af3e55 100644
--- a/chaco/tests/test_array_or_none.py
+++ b/chaco/tests/test_array_or_none.py
@@ -15,11 +15,11 @@
 
 from chaco.array_data_source import ArrayDataSource
 from chaco.axis import PlotAxis
-from chaco.data_label import DataLabel
 from chaco.data_range_1d import DataRange1D
 from chaco.label_axis import LabelAxis
-from chaco.legend import Legend
 from chaco.linear_mapper import LinearMapper
+from chaco.overlays.data_label import DataLabel
+from chaco.overlays.legend import Legend
 from chaco.plots.scatterplot import ScatterPlot
 
 
diff --git a/chaco/tools/image_inspector_tool.py b/chaco/tools/image_inspector_tool.py
index 9fad9a8bb..bb1c49a38 100644
--- a/chaco/tools/image_inspector_tool.py
+++ b/chaco/tools/image_inspector_tool.py
@@ -17,8 +17,8 @@
 
 # Chaco imports
 from chaco.abstract_overlay import AbstractOverlay
+from chaco.overlays.text_box_overlay import TextBoxOverlay
 from chaco.plots.image_plot import ImagePlot
-from chaco.text_box_overlay import TextBoxOverlay
 
 
 class ImageInspectorTool(BaseTool):
diff --git a/chaco/tools/regression_lasso.py b/chaco/tools/regression_lasso.py
index 18d060d48..b5e1e7b30 100644
--- a/chaco/tools/regression_lasso.py
+++ b/chaco/tools/regression_lasso.py
@@ -21,8 +21,8 @@
 from traits.api import Any, Float, Instance
 
 # Chaco imports
-from chaco.lasso_overlay import LassoOverlay
 from chaco.label import Label
+from chaco.overlays.lasso_overlay import LassoOverlay
 from .lasso_selection import LassoSelection