diff --git a/examples/dataflow/dma.py b/examples/dataflow/dma.py
index ffc4d9799..6e8c88401 100644
--- a/examples/dataflow/dma.py
+++ b/examples/dataflow/dma.py
@@ -1,7 +1,7 @@
 from random import Random
 
-from migen.flow.ala import *
 from migen.flow.network import *
+from migen.actorlib.ala import *
 from migen.actorlib import dma_wishbone, dma_asmi
 from migen.actorlib.sim import *
 from migen.bus import wishbone, asmibus
diff --git a/examples/dataflow/fibonacci.py b/examples/dataflow/fibonacci.py
index 709cfe499..e67728bba 100644
--- a/examples/dataflow/fibonacci.py
+++ b/examples/dataflow/fibonacci.py
@@ -1,6 +1,6 @@
-from migen.flow.ala import *
 from migen.flow.network import *
 from migen.flow import plumbing
+from migen.actorlib.ala import *
 from migen.actorlib.sim import *
 from migen.sim.generic import Simulator
 from migen.sim.icarus import Runner
diff --git a/migen/flow/ala.py b/migen/actorlib/ala.py
similarity index 100%
rename from migen/flow/ala.py
rename to migen/actorlib/ala.py
diff --git a/migen/flow/composer.py b/migen/actorlib/composer.py
similarity index 98%
rename from migen/flow/composer.py
rename to migen/actorlib/composer.py
index 2c58c9672..683186d1d 100644
--- a/migen/flow/composer.py
+++ b/migen/actorlib/composer.py
@@ -1,7 +1,7 @@
 from migen.flow.actor import *
-from migen.flow.ala import *
 from migen.flow.plumbing import *
 from migen.flow.network import *
+from migen.actorlib.ala import *
 
 def _create(a, b, actor_class):
 	assert id(a.dfg) == id(b.dfg)