diff --git a/doc/index.rst b/doc/index.rst
index 4aa179777..0e3e8eef6 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -572,25 +572,30 @@ Simulation examples
 
 Most basic
 ==========
-.. include:: ../examples/basic_sim.py
+.. include:: ../examples/sim/basic1.py
    :code: python
 
 A few more features
 ===================
-.. include:: ../examples/basic2_sim.py
+.. include:: ../examples/sim/basic2.py
    :code: python
 
 Memory access
 =============
-.. include:: ../examples/memory_sim.py
+.. include:: ../examples/sim/memory.py
    :code: python
 
 A FIR filter
 ============
-.. include:: ../examples/fir.py
+.. include:: ../examples/sim/fir.py
    :code: python
    
 Abstract bus transactions
 =========================
-.. include:: ../examples/abstract_transactions.py
+.. include:: ../examples/sim/abstract_transactions.py
+   :code: python
+
+Dataflow simulation actors
+==========================
+.. include:: ../examples/sim/dataflow.py
    :code: python
diff --git a/examples/fsm.py b/examples/basic/fsm.py
similarity index 100%
rename from examples/fsm.py
rename to examples/basic/fsm.py
diff --git a/examples/lm32_inst.py b/examples/basic/lm32_inst.py
similarity index 100%
rename from examples/lm32_inst.py
rename to examples/basic/lm32_inst.py
diff --git a/examples/memory.py b/examples/basic/memory.py
similarity index 100%
rename from examples/memory.py
rename to examples/basic/memory.py
diff --git a/examples/simple_gpio.py b/examples/basic/simple_gpio.py
similarity index 100%
rename from examples/simple_gpio.py
rename to examples/basic/simple_gpio.py
diff --git a/examples/corelogic_conv.py b/examples/basic/two_dividers.py
similarity index 100%
rename from examples/corelogic_conv.py
rename to examples/basic/two_dividers.py
diff --git a/examples/using_record.py b/examples/basic/using_record.py
similarity index 100%
rename from examples/using_record.py
rename to examples/basic/using_record.py
diff --git a/examples/dataflow.py b/examples/dataflow/arithmetic.py
similarity index 100%
rename from examples/dataflow.py
rename to examples/dataflow/arithmetic.py
diff --git a/examples/dataflow_dma.py b/examples/dataflow/dma.py
similarity index 100%
rename from examples/dataflow_dma.py
rename to examples/dataflow/dma.py
diff --git a/examples/abstract_transactions.py b/examples/sim/abstract_transactions.py
similarity index 100%
rename from examples/abstract_transactions.py
rename to examples/sim/abstract_transactions.py
diff --git a/examples/basic_sim.py b/examples/sim/basic1.py
similarity index 100%
rename from examples/basic_sim.py
rename to examples/sim/basic1.py
diff --git a/examples/basic2_sim.py b/examples/sim/basic2.py
similarity index 100%
rename from examples/basic2_sim.py
rename to examples/sim/basic2.py
diff --git a/examples/dataflow_sim.py b/examples/sim/dataflow.py
similarity index 100%
rename from examples/dataflow_sim.py
rename to examples/sim/dataflow.py
diff --git a/examples/fir.py b/examples/sim/fir.py
similarity index 100%
rename from examples/fir.py
rename to examples/sim/fir.py
diff --git a/examples/memory_sim.py b/examples/sim/memory.py
similarity index 100%
rename from examples/memory_sim.py
rename to examples/sim/memory.py