last ...

Experts/x-test-xxx.mq5

@@ -21,11 +21,7 @@
 
 //
 // Imports ...
-#include "../Libraries/x-saherelm.draw.lib.mq5"
-#include "../Classes/x-saherelm.xalert.class.mq5"
-#include "../Classes/x-saherelm.xtrade.class.mq5"
-#include "../Libraries/x-saherelm.common.lib.mq5"
-#include "../Classes/x-saherelm.x121.setup.class.mq5"
+#include "../Classes/x-saherelm.x121.setup.xea.mq5"
 
 //
 #define ShortName "XTESTXXX"
@@ -53,15 +49,7 @@ int eaReuiredVerifications = 1; // Required Verifications for Signals
 // Local Variables ...
 
 //
-XSCAlert *mAlert;
-XSCTrade *mTrader;
-
-//
-XSCX121Setup *mSetup;
-X121SignalGenerator mSignalGenerator;
-
-//
-XBarTracker xBarTracker;
+XSCX121SetupEA *mEA;
 
 //
 // Event Handlers ...
@@ -219,14 +207,13 @@ bool InitialEA()
     //
     TesterHideIndicators(true);
 
-    //
-    mAlert = new XSCAlert();
-    mAlert.SetLogAlerts(true);
-    mAlert.SetPrefix(ShortName);
-    mAlert.SetEnableAlerts(true);
-    mAlert.SetPushAlerts(false);
-    mAlert.SetMailAlerts(false);
-    mAlert.SetTerminalAlerts(false);
+    //    
+    SetLogAlerts(true);
+    SetPrefix(ShortName);
+    SetEnableAlerts(true);
+    SetPushAlerts(false);
+    SetMailAlerts(false);
+    SetTerminalAlerts(false);
 
     //
     mTrader = new XSCTrade(