diff --git a/Projects/ProjectsSchema.json b/Projects/ProjectsSchema.json
index d3cd211a9..8d63b4eb8 100644
--- a/Projects/ProjectsSchema.json
+++ b/Projects/ProjectsSchema.json
@@ -492,6 +492,27 @@
                     "functionName": "newSuperalgosBotModulesSingleMarketSensorBot",
                     "fileName": "SingleMarketSensorBot.js",
                     "folderName": "Sensor-Bot"
+                },
+                {
+                    "name": "Single Market Indicator Bot",
+                    "propertyName": "singleMarketIndicatorBot",
+                    "functionName": "newSuperalgosBotModulesSingleMarketIndicatorBot",
+                    "fileName": "SingleMarketIndicatorBot.js",
+                    "folderName": "Indicator-Bot"
+                },
+                {
+                    "name": "Multi Period Market",
+                    "propertyName": "multiPeriodMarket",
+                    "functionName": "newSuperalgosBotModulesMultiPeriodMarket",
+                    "fileName": "MultiPeriodMarket.js",
+                    "folderName": "Indicator-Bot"
+                },
+                {
+                    "name": "Multi Period Daily",
+                    "propertyName": "multiPeriodDaily",
+                    "functionName": "newSuperalgosBotModulesMultiPeriodDaily",
+                    "fileName": "MultiPeriodDaily.js",
+                    "folderName": "Indicator-Bot"
                 }
             ]
         },
diff --git a/TaskServer/MultiPeriodDaily.js b/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/MultiPeriodDaily.js
similarity index 99%
rename from TaskServer/MultiPeriodDaily.js
rename to Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/MultiPeriodDaily.js
index fc2bde825..3ca39df2d 100644
--- a/TaskServer/MultiPeriodDaily.js
+++ b/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/MultiPeriodDaily.js
@@ -1,4 +1,4 @@
-exports.newMultiPeriodDaily = function (processIndex) {
+exports.newSuperalgosBotModulesMultiPeriodDaily = function (processIndex) {
     const MODULE_NAME = "Multi Period Daily";
     const GMT_SECONDS = ':00.000 GMT+0000';
 
diff --git a/TaskServer/MultiPeriodMarket.js b/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/MultiPeriodMarket.js
similarity index 99%
rename from TaskServer/MultiPeriodMarket.js
rename to Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/MultiPeriodMarket.js
index d7cd15775..654ada9e7 100644
--- a/TaskServer/MultiPeriodMarket.js
+++ b/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/MultiPeriodMarket.js
@@ -1,4 +1,4 @@
-exports.newMultiPeriodMarket = function (processIndex) {
+exports.newSuperalgosBotModulesMultiPeriodMarket = function (processIndex) {
     const MODULE_NAME = "Multi Period Market";
     thisObject = {
         initialize: initialize,
diff --git a/TaskServer/IndicatorBot.js b/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/SingleMarketIndicatorBot.js
similarity index 99%
rename from TaskServer/IndicatorBot.js
rename to Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/SingleMarketIndicatorBot.js
index 7eda018d7..1645ab8a1 100644
--- a/TaskServer/IndicatorBot.js
+++ b/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/SingleMarketIndicatorBot.js
@@ -1,13 +1,10 @@
-exports.newIndicatorBot = function newIndicatorBot(processIndex) {
+exports.newSuperalgosBotModulesSingleMarketIndicatorBot = function (processIndex) {
 
     const MODULE_NAME = "Indicator Bot";
 
     let USER_BOT_MODULE;
     let COMMONS_MODULE;
 
-    const MULTI_PERIOD_MARKET = require(TS.projects.superalgos.globals.nodeJSConstants.REQUIRE_ROOT_DIR + 'MultiPeriodMarket');
-    const MULTI_PERIOD_DAILY = require(TS.projects.superalgos.globals.nodeJSConstants.REQUIRE_ROOT_DIR + 'MultiPeriodDaily');
-    
     let fileStorage = TS.projects.superalgos.taskModules.fileStorage.newFileStorage(processIndex);
 
     let nextLoopTimeoutHandle;
@@ -285,12 +282,12 @@
 
                                             switch (processConfig.framework.name) {
                                                 case 'Multi-Period-Market': {
-                                                    processFramework = MULTI_PERIOD_MARKET.newMultiPeriodMarket(processIndex);
+                                                    processFramework = TS.projects.superalgos.botModules.multiPeriodMarket.newSuperalgosBotModulesMultiPeriodMarket(processIndex);
                                                     intitializeProcessFramework();
                                                     break;
                                                 }
                                                 case 'Multi-Period-Daily': {
-                                                    processFramework = MULTI_PERIOD_DAILY.newMultiPeriodDaily(processIndex);
+                                                    processFramework = TS.projects.superalgos.botModules.multiPeriodDaily.newSuperalgosBotModulesMultiPeriodDaily(processIndex);
                                                     intitializeProcessFramework();
                                                     break;
                                                 }
diff --git a/TaskServer/ProcessInstance.js b/TaskServer/ProcessInstance.js
index a2a615923..f0ab6efb4 100644
--- a/TaskServer/ProcessInstance.js
+++ b/TaskServer/ProcessInstance.js
@@ -14,7 +14,6 @@
         try {
             /* Process Loops Declarations. */
 
-            const INDICATOR_BOT_MODULE = require('./IndicatorBot');
             const TRADING_BOT_MODULE = require('./TradingBot');
 
             let botInstance
@@ -107,7 +106,7 @@
                 try {
                     TS.projects.superalgos.globals.processVariables.TOTAL_PROCESS_INSTANCES_CREATED++
 
-                    botInstance = INDICATOR_BOT_MODULE.newIndicatorBot(processIndex);
+                    botInstance = TS.projects.superalgos.botModules.singleMarketIndicatorBot.newSuperalgosBotModulesSingleMarketIndicatorBot(processIndex);
                     botInstance.initialize(processConfig, onInitializeReady);
 
                 }