diff --git a/AuraTrader/AuraTrader.dpr b/AuraTrader/AuraTrader.dpr
index 008edd7..31edf55 100644
--- a/AuraTrader/AuraTrader.dpr
+++ b/AuraTrader/AuraTrader.dpr
@@ -5,15 +5,8 @@ uses
     System.StartUpCopy,
     FMX.Forms,
     MainForm in 'MainForm.pas' {Form1},
-    Myc.Aura.Module in '..\Src\Myc.Aura.Module.pas',
-    Myc.Aura.Parameter in '..\Src\Myc.Aura.Parameter.pas',
     TestModule in 'TestModule.pas',
-    DynamicFMXControl in 'DynamicFMXControl.pas',
-    Myc.Trade.DataArray in '..\Src\Myc.Trade.DataArray.pas',
-    Myc.FMX.Chart.Series in '..\Src\Myc.FMX.Chart.Series.pas',
-    Myc.Trade.Indicators in '..\Src\Myc.Trade.Indicators.pas',
-    Myc.Trade.Types in '..\Src\Myc.Trade.Types.pas',
-    Myc.DataRecord in '..\Src\Myc.DataRecord.pas';
+    DynamicFMXControl in 'DynamicFMXControl.pas';
 
 {$R *.res}
 
diff --git a/AuraTrader/AuraTrader.dproj b/AuraTrader/AuraTrader.dproj
index 0ded5a4..3808279 100644
--- a/AuraTrader/AuraTrader.dproj
+++ b/AuraTrader/AuraTrader.dproj
@@ -135,15 +135,8 @@
         <DCCReference Include="MainForm.pas">
             <Form>Form1</Form>
         </DCCReference>
-        <DCCReference Include="..\Src\Myc.Aura.Module.pas"/>
-        <DCCReference Include="..\Src\Myc.Aura.Parameter.pas"/>
         <DCCReference Include="TestModule.pas"/>
         <DCCReference Include="DynamicFMXControl.pas"/>
-        <DCCReference Include="..\Src\Myc.Trade.DataArray.pas"/>
-        <DCCReference Include="..\Src\Myc.FMX.Chart.Series.pas"/>
-        <DCCReference Include="..\Src\Myc.Trade.Indicators.pas"/>
-        <DCCReference Include="..\Src\Myc.Trade.Types.pas"/>
-        <DCCReference Include="..\Src\Myc.DataRecord.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>
diff --git a/AuraTrader/MainForm.pas b/AuraTrader/MainForm.pas
index 37c3241..2c45440 100644
--- a/AuraTrader/MainForm.pas
+++ b/AuraTrader/MainForm.pas
@@ -32,14 +32,13 @@ uses
     Myc.Futures,
     Myc.Trade.Types,
     Myc.Trade.DataStream,
-    Myc.Trade.DataPoint,
+    Myc.DataFlow,
     Myc.Signals,
     Myc.Mutable,
     Myc.Trade.DataArray,
     Myc.Signals.FMX,
     Myc.TaskManager,
     Myc.Aura.Module,
-    Myc.Trade.DataPoint.Impl,
     FMX.ListBox,
     FMX.Layouts,
     FMX.TreeView,
diff --git a/AuraTrader/StrategyTest.pas b/AuraTrader/StrategyTest.pas
index 6d08fd5..673f55c 100644
--- a/AuraTrader/StrategyTest.pas
+++ b/AuraTrader/StrategyTest.pas
@@ -5,8 +5,8 @@ interface
 uses
     Myc.Signals,
     Myc.Trade.Types,
-    Myc.Trade.DataPoint,
     Myc.Trade.DataArray,
+    Myc.DataFlow,
     Myc.DataRecord,
     Myc.Trade.Indicators;
 
diff --git a/Src/Myc.Aura.Module.pas b/Src/Myc.Aura.Module.pas
index 2f4cfc6..93e11cb 100644
--- a/Src/Myc.Aura.Module.pas
+++ b/Src/Myc.Aura.Module.pas
@@ -165,7 +165,6 @@ uses
     Myc.Signals,
     Myc.Futures,
     Myc.Mutable,
-    Myc.Trade.DataPoint,
     Myc.Aura.Parameter;
 
 type
diff --git a/Src/Myc.Trade.DataPoint.Impl.pas b/Src/Myc.DataFlow.Impl.pas
similarity index 96%
rename from Src/Myc.Trade.DataPoint.Impl.pas
rename to Src/Myc.DataFlow.Impl.pas
index 26ff5e1..bdcacc2 100644
--- a/Src/Myc.Trade.DataPoint.Impl.pas
+++ b/Src/Myc.DataFlow.Impl.pas
@@ -1,4 +1,4 @@
-unit Myc.Trade.DataPoint.Impl;
+unit Myc.DataFlow.Impl;
 
 interface
 
@@ -9,9 +9,9 @@ uses
     Myc.Signals,
     Myc.Mutable,
     Myc.Core.Notifier,
+    Myc.DataFlow,
     Myc.Trade.Types,
-    Myc.Trade.DataArray,
-    Myc.Trade.DataPoint;
+    Myc.Trade.DataArray;
 
 type
     // Abstract base class for data consumers.
diff --git a/Src/Myc.Trade.DataPoint.pas b/Src/Myc.DataFlow.pas
similarity index 96%
rename from Src/Myc.Trade.DataPoint.pas
rename to Src/Myc.DataFlow.pas
index 7836267..37dd162 100644
--- a/Src/Myc.Trade.DataPoint.pas
+++ b/Src/Myc.DataFlow.pas
@@ -1,4 +1,4 @@
-unit Myc.Trade.DataPoint;
+unit Myc.DataFlow;
 
 interface
 
@@ -151,7 +151,7 @@ type
 implementation
 
 uses
-    Myc.Trade.DataPoint.Impl;
+    Myc.DataFlow.Impl;
 
 { TProducer<T> }
 
diff --git a/Src/Myc.Fmx.Chart.Series.pas b/Src/Myc.Fmx.Chart.Series.pas
index 4444493..820a1ba 100644
--- a/Src/Myc.Fmx.Chart.Series.pas
+++ b/Src/Myc.Fmx.Chart.Series.pas
@@ -10,8 +10,7 @@ uses
     Myc.Mutable,
     Myc.Trade.Types,
     Myc.Trade.DataArray,
-    Myc.Trade.DataPoint,
-    Myc.Trade.DataPoint.Impl,
+    Myc.DataFlow,
     Myc.Fmx.Chart;
 
 type
diff --git a/Src/Myc.Fmx.Chart.pas b/Src/Myc.Fmx.Chart.pas
index 8484cbb..0444fa2 100644
--- a/Src/Myc.Fmx.Chart.pas
+++ b/Src/Myc.Fmx.Chart.pas
@@ -16,9 +16,9 @@ uses
     FMX.Graphics,
     FMX.Forms,
     Myc.Trade.Types,
-    Myc.Trade.DataPoint,
     Myc.Signals,
-    Myc.Mutable;
+    Myc.Mutable,
+    Myc.DataFlow;
 
 type
     TMycChart = class(TStyledControl)
diff --git a/Src/Myc.Trade.DataStream.pas b/Src/Myc.Trade.DataStream.pas
index 0ed1661..51473c2 100644
--- a/Src/Myc.Trade.DataStream.pas
+++ b/Src/Myc.Trade.DataStream.pas
@@ -12,7 +12,7 @@ uses
     Myc.Signals,
     Myc.Mutable,
     Myc.Trade.Types,
-    Myc.Trade.DataPoint,
+    Myc.DataFlow,
     Myc.Core.FileCache;
 
 type
diff --git a/Src/Myc.Trade.Node.pas b/Src/Myc.Trade.Node.pas
deleted file mode 100644
index 2aa9703..0000000
--- a/Src/Myc.Trade.Node.pas
+++ /dev/null
@@ -1,48 +0,0 @@
-unit Myc.Trade.Node;
-
-interface
-
-uses
-    System.SysUtils;
-
-type
-    // Base interface for all objects created by an INode factory.
-    ITradeObject = interface
-        ['{B8A29A67-272E-456A-A816-A19A76E43213}']
-    end;
-
-    // Represents a node in the trading graph, acting as a factory for a trade object.
-    INode = interface
-        ['{E879B5E4-3A4E-434A-8A4F-A9F71B0B7E1C}']
-        function GetCaption: string;
-        // Factory method to create the runtime object.
-        function CreateObject: ITradeObject;
-
-        property Caption: string read GetCaption;
-    end;
-
-    // Abstract base class for all node implementations.
-    TNodeBase = class abstract(TInterfacedObject, INode)
-    protected
-        fCaption: string;
-        function GetCaption: string;
-    public
-        constructor Create(const Caption: string);
-        function CreateObject: ITradeObject; virtual; abstract;
-    end;
-
-implementation
-
-{ TNodeBase }
-
-constructor TNodeBase.Create(const Caption: string);
-begin
-    fCaption := Caption;
-end;
-
-function TNodeBase.GetCaption: string;
-begin
-    result := fCaption;
-end;
-
-end.
diff --git a/Test/MycTests.dpr b/Test/MycTests.dpr
index 6c9b172..c7b1557 100644
--- a/Test/MycTests.dpr
+++ b/Test/MycTests.dpr
@@ -18,17 +18,11 @@ uses
     TestNotifier_Threading in 'TestNotifier_Threading.pas' {/TestNotifier_ChaosStress in 'TestNotifier_ChaosStress.pas',},
     TestNotifier_ChaosStress in 'TestNotifier_ChaosStress.pas',
     TestTasks in 'TestTasks.pas',
-    Myc.Futures in '..\Src\Myc.Futures.pas',
     TestCoreFutures in 'TestCoreFutures.pas',
-    Myc.TaskManager in '..\Src\Myc.TaskManager.pas',
     TestFutures in 'TestFutures.pas',
     Myc.Test.Core.Atomic in '..\Src\Myc.Test.Core.Atomic.pas',
     Myc.Test.Signals.Latch in '..\Src\Myc.Test.Signals.Latch.pas',
     Myc.Test.Signals.Dirty in '..\Src\Myc.Test.Signals.Dirty.pas',
-    Myc.Trade.DataPoint in '..\Src\Myc.Trade.DataPoint.pas',
-    Myc.Trade.Node in '..\Src\Myc.Trade.Node.pas',
-    Myc.Trade.DataStream in '..\Src\Myc.Trade.DataStream.pas',
-    Myc.Mutable in '..\Src\Myc.Mutable.pas',
     Test.Core.Mutable in 'Test.Core.Mutable.pas',
     TestDataRecord in 'TestDataRecord.pas',
     TestDataArray in 'TestDataArray.pas';
diff --git a/Test/MycTests.dproj b/Test/MycTests.dproj
index a39e1fe..ea13b28 100644
--- a/Test/MycTests.dproj
+++ b/Test/MycTests.dproj
@@ -119,17 +119,11 @@ $(PreBuildEvent)]]></PreBuildEvent>
         </DCCReference>
         <DCCReference Include="TestNotifier_ChaosStress.pas"/>
         <DCCReference Include="TestTasks.pas"/>
-        <DCCReference Include="..\Src\Myc.Futures.pas"/>
         <DCCReference Include="TestCoreFutures.pas"/>
-        <DCCReference Include="..\Src\Myc.TaskManager.pas"/>
         <DCCReference Include="TestFutures.pas"/>
         <DCCReference Include="..\Src\Myc.Test.Core.Atomic.pas"/>
         <DCCReference Include="..\Src\Myc.Test.Signals.Latch.pas"/>
         <DCCReference Include="..\Src\Myc.Test.Signals.Dirty.pas"/>
-        <DCCReference Include="..\Src\Myc.Trade.DataPoint.pas"/>
-        <DCCReference Include="..\Src\Myc.Trade.Node.pas"/>
-        <DCCReference Include="..\Src\Myc.Trade.DataStream.pas"/>
-        <DCCReference Include="..\Src\Myc.Mutable.pas"/>
         <DCCReference Include="Test.Core.Mutable.pas"/>
         <DCCReference Include="TestDataRecord.pas"/>
         <DCCReference Include="TestDataArray.pas"/>