diff --git a/Projects/ProjectsSchema.json b/Projects/ProjectsSchema.json
index 87f008863..4335784e5 100644
--- a/Projects/ProjectsSchema.json
+++ b/Projects/ProjectsSchema.json
@@ -533,6 +533,27 @@
                     "functionName": "newSuperalgosBotModulesSingleMarketTradingBot",
                     "fileName": "SingleMarketTradingBot.js",
                     "folderName": "Trading-Bot"
+                },
+                {
+                    "name": "Trading Session",
+                    "propertyName": "tradingSession",
+                    "functionName": "newSuperalgosBotModulesTradingSession",
+                    "fileName": "TradingSession.js",
+                    "folderName": "Trading-Bot"
+                },
+                {
+                    "name": "Social Bots",
+                    "propertyName": "socialBots",
+                    "functionName": "newSuperalgosBotModulesSocialBots",
+                    "fileName": "SocialBots.js",
+                    "folderName": "Trading-Bot/Announcements"
+                },
+                {
+                    "name": "Telegram Bot",
+                    "propertyName": "telegramBot",
+                    "functionName": "newSuperalgosBotModulesTelegramBot",
+                    "fileName": "TelegramBot.js",
+                    "folderName": "Trading-Bot/Announcements"
                 }
             ]
         },
diff --git a/TaskServer/SocialBots.js b/Projects/Superalgos/TS/Bot-Modules/Trading-Bot/Announcements/SocialBots.js
similarity index 100%
rename from TaskServer/SocialBots.js
rename to Projects/Superalgos/TS/Bot-Modules/Trading-Bot/Announcements/SocialBots.js
diff --git a/TaskServer/TelegramBot.js b/Projects/Superalgos/TS/Bot-Modules/Trading-Bot/Announcements/TelegramBot.js
similarity index 100%
rename from TaskServer/TelegramBot.js
rename to Projects/Superalgos/TS/Bot-Modules/Trading-Bot/Announcements/TelegramBot.js
diff --git a/Projects/Superalgos/TS/Bot-Modules/Trading-Bot/SingleMarketTradingBot.js b/Projects/Superalgos/TS/Bot-Modules/Trading-Bot/SingleMarketTradingBot.js
index f1ce6a00a..7f663a553 100644
--- a/Projects/Superalgos/TS/Bot-Modules/Trading-Bot/SingleMarketTradingBot.js
+++ b/Projects/Superalgos/TS/Bot-Modules/Trading-Bot/SingleMarketTradingBot.js
@@ -1,15 +1,9 @@
 exports.newSuperalgosBotModulesSingleMarketTradingBot = function (processIndex) {
 
     const MODULE_NAME = "Trading Bot";
-    const FULL_LOG = true;
-
     const TRADING_PROCESS_MODULE = require(TS.projects.superalgos.globals.nodeJSConstants.REQUIRE_ROOT_DIR + '/LowFrequencyTrading/TradingProcess.js');
     
-    const SESSION = require(TS.projects.superalgos.globals.nodeJSConstants.REQUIRE_ROOT_DIR + 'TradingSession');
-
-    let fileStorage = TS.projects.superalgos.taskModules.fileStorage.newFileStorage(processIndex);
-    let session = SESSION.newTradingSession(processIndex)
-
+    let session = TS.projects.superalgos.botModules.tradingSession.newSuperalgosBotModulesTradingSession(processIndex)
     let nextLoopTimeoutHandle;
 
     let thisObject = {
diff --git a/TaskServer/TradingSession.js b/Projects/Superalgos/TS/Bot-Modules/Trading-Bot/TradingSession.js
similarity index 99%
rename from TaskServer/TradingSession.js
rename to Projects/Superalgos/TS/Bot-Modules/Trading-Bot/TradingSession.js
index 16622b827..201543938 100644
--- a/TaskServer/TradingSession.js
+++ b/Projects/Superalgos/TS/Bot-Modules/Trading-Bot/TradingSession.js
@@ -1,4 +1,4 @@
-exports.newTradingSession = function (processIndex) {
+exports.newSuperalgosBotModulesTradingSession = function (processIndex) {
 
     const MODULE_NAME = "Trading Session"