diff --git a/distarray/plotting/plotting.py b/distarray/plotting/plotting.py
index 69f05a40..3e4c31bc 100644
--- a/distarray/plotting/plotting.py
+++ b/distarray/plotting/plotting.py
@@ -12,7 +12,7 @@
 from numpy import arange, concatenate, empty, linspace, resize
 
 from distarray.externals.six.moves import range
-from distarray.decorators import local
+from distarray.dist.decorators import local
 
 
 @local
diff --git a/examples/plot_distarray_block_axis_0.py b/examples/plot_distarray_block_axis_0.py
index 6e8c6b75..bfcb5683 100644
--- a/examples/plot_distarray_block_axis_0.py
+++ b/examples/plot_distarray_block_axis_0.py
@@ -11,11 +11,11 @@
 
 from matplotlib import pyplot
 
-import distarray
 from distarray import plotting
+from distarray.dist import Context
 
 
-c = distarray.Context()
+c = Context()
 a = c.zeros((64, 64))
 process_coords = [(0, 0), (1, 0), (2, 0), (3, 0)]
 plotting.plot_array_distribution(a, process_coords, cell_label=False,
diff --git a/examples/plot_distarray_block_axis_1.py b/examples/plot_distarray_block_axis_1.py
index f98f4591..337127e9 100644
--- a/examples/plot_distarray_block_axis_1.py
+++ b/examples/plot_distarray_block_axis_1.py
@@ -10,11 +10,11 @@
 
 from matplotlib import pyplot
 
-import distarray
 from distarray import plotting
+from distarray.dist import Context
 
 
-c = distarray.Context()
+c = Context()
 a = c.zeros((64, 64), dtype='int32', dist=('n', 'b'))
 process_coords = [(0, 0), (1, 0), (2, 0), (3, 0)]
 plotting.plot_array_distribution(a, process_coords, cell_label=False,
diff --git a/examples/plot_distarray_block_block.py b/examples/plot_distarray_block_block.py
index a4c14d5f..eccd7a55 100644
--- a/examples/plot_distarray_block_block.py
+++ b/examples/plot_distarray_block_block.py
@@ -10,11 +10,11 @@
 
 from matplotlib import pyplot
 
-import distarray
 from distarray import plotting
+from distarray.dist import Context
 
 
-c = distarray.Context()
+c = Context()
 a = c.zeros((64, 64), dtype='int32', dist=('b', 'b'))
 process_coords = [(0, 0), (0, 1), (1, 0), (1, 1)]
 plotting.plot_array_distribution(a, process_coords, cell_label=False,
diff --git a/examples/plot_distarray_block_cyclic.py b/examples/plot_distarray_block_cyclic.py
index 63ad3344..55ea981c 100644
--- a/examples/plot_distarray_block_cyclic.py
+++ b/examples/plot_distarray_block_cyclic.py
@@ -10,11 +10,11 @@
 
 from matplotlib import pyplot
 
-import distarray
 from distarray import plotting
+from distarray.dist import Context
 
 
-c = distarray.Context()
+c = Context()
 a = c.zeros((64, 64), dtype='int32', dist=('b', 'c'))
 process_coords = [(0, 0), (0, 1), (1, 0), (1, 1)]
 plotting.plot_array_distribution(a, process_coords, cell_label=False,
diff --git a/examples/plot_distarray_cyclic_cyclic.py b/examples/plot_distarray_cyclic_cyclic.py
index 651c4a19..7e514973 100644
--- a/examples/plot_distarray_cyclic_cyclic.py
+++ b/examples/plot_distarray_cyclic_cyclic.py
@@ -10,11 +10,11 @@
 
 from matplotlib import pyplot
 
-import distarray
 from distarray import plotting
+from distarray.dist import Context
 
 
-c = distarray.Context()
+c = Context()
 a = c.zeros((64, 64), dtype='int32', dist=('c', 'c'))
 process_coords = [(0, 0), (0, 1), (1, 0), (1, 1)]
 plotting.plot_array_distribution(a, process_coords, cell_label=False,
diff --git a/examples/plot_distarray_protocol.py b/examples/plot_distarray_protocol.py
index 52ffc066..ab3beb47 100644
--- a/examples/plot_distarray_protocol.py
+++ b/examples/plot_distarray_protocol.py
@@ -48,7 +48,7 @@ def print_array_documentation(context,
 
     Parameters
     ----------
-    context : distarray.Context
+    context : distarray.dist.Context
         The context that will be used to query the array properties.
     array : DistArray
         The array to describe.
@@ -556,7 +556,7 @@ def create_distribution_plot_and_documentation_all(context):
 
 
 def main():
-    context = distarray.Context()
+    context = distarray.dist.Context()
     num_targets = len(context.targets)
     # Examples are designed for various engine counts...
     engine_counts = [3, 4, 8]
@@ -565,7 +565,7 @@ def main():
         raise ValueError('Need at least %d engines for all the examples, '
                          'but only have %d.' % (need_targets, num_targets))
     for engine_count in engine_counts:
-        context_n = distarray.Context(targets=range(engine_count))
+        context_n = distarray.dist.Context(targets=range(engine_count))
         create_distribution_plot_and_documentation_all(context_n)