diff --git a/config_service.code-workspace b/config_service.code-workspace
index 362d7c2..5c1198a 100644
--- a/config_service.code-workspace
+++ b/config_service.code-workspace
@@ -2,6 +2,9 @@
 	"folders": [
 		{
 			"path": "."
+		},
+		{
+			"path": ".."
 		}
 	]
 }
\ No newline at end of file
diff --git a/data/admin/cvtt_hosts.cfg b/data/admin/cvtt_hosts.cfg
index ea62d5a..0050181 100644
--- a/data/admin/cvtt_hosts.cfg
+++ b/data/admin/cvtt_hosts.cfg
@@ -42,6 +42,11 @@
             "users": ["oleg", "cvtt"],
             "docker": "true",
         },
+        "cloud25": {
+            "type": "cloud",
+            "users": ["oleg"],
+            "docker": "true",
+        },
 
         // ----------- B a r e  M e t a l
         "homestore": {
@@ -140,12 +145,6 @@
             "users": ["oleg", "cvtt"],
             "docker": "true",
         },
-        "cvtt-prod-03": {
-            "type": "vm",
-            "users": ["oleg"],
-            "docker": "false",
-            "supervisor": "true",
-        },
         "cvtt-prod-eqty-01": {
             "type": "vm",
             "users": ["oleg", "cvtt"],
diff --git a/data/admin/cvtt_services.cfg b/data/admin/cvtt_services.cfg
index 02cdcec..d7bf261 100644
--- a/data/admin/cvtt_services.cfg
+++ b/data/admin/cvtt_services.cfg
@@ -1,16 +1,16 @@
 {
-    "WIKI": {
-        "to_check": "Yes",
-        "protocol": "http",
-        "host": "cloud11.cvtt.vpn",
-        "port": 8080
-    },
     "Mattermost": {
         "to_check": "Yes",
         "protocol": "https",
         "host": "mattermost.cryptovaltrading.com",
         "port": 443
     },
+    # "WIKI": {
+    #     "to_check": "Yes",
+    #     "protocol": "http",
+    #     "host": "cloud11.cvtt.vpn",
+    #     "port": 8080
+    # },
     "Gitea": {
         "to_check": "Yes",
         "protocol": "http",
diff --git a/data/admin/docker_images.cfg b/data/admin/docker_images.cfg
index 9da9cd8..d62d147 100644
--- a/data/admin/docker_images.cfg
+++ b/data/admin/docker_images.cfg
@@ -20,7 +20,25 @@
     , "Crypto Daily MD": {
         "image_name": "crypto_md_day",
         "docker_dev_path": "market_data/crypto_md_day",
-        "based_on_project": "ops"
+        "based_on_project": "cvttpy"
         # "additional_projects": []
     }
+    , "Market Data Recorder": {
+        "image_name": "md_recorder",
+        "docker_dev_path": "market_data/md_recorder",
+        "based_on_project": "cvttpy"
+        "additional_projects": ["ops"]
+    }
+    , "MD Rec MONITOR": {
+        "image_name": "md_recorder_monitor",
+        "docker_dev_path": "market_data/md_recorder_monitor",
+        "based_on_project": "cvttpy"
+        "additional_projects": ["ops"]
+    }
+    , "CONFIG SERVICE": {
+        "image_name": "config_service",
+        "docker_dev_path": "config_service",
+        "based_on_project": "cvttpy"
+        "additional_projects": ["ops"]
+    }
 }
\ No newline at end of file
diff --git a/data/refdata/exchanges.cfg b/data/refdata/exchanges.cfg
index a8ada3c..04480f5 100644
--- a/data/refdata/exchanges.cfg
+++ b/data/refdata/exchanges.cfg
@@ -39,7 +39,7 @@
             }
         }
         , "accounting": {
-            "class":  "cvttpy.exchanges.alpaca.account.AlpacaAccounting"
+            "class":  "cvttpy.exchanges.alpaca.acct_client.AlpacaAccounting"
 
             , "REST": {
                 "balances_url": ["GET", "https://api.alpaca.markets/v2/positions"]
@@ -116,7 +116,7 @@
             }
         }
         , "accounting": {
-            "class":  "cvttpy.exchanges.alpaca.account.AlpacaAccounting"
+            "class":  "cvttpy.exchanges.alpaca.acct_client.AlpacaAccounting"
 
             , "REST": {
                 "balances_url": ["GET", "https://paper-api.alpaca.markets/v2/positions"]
@@ -516,15 +516,15 @@
             , "channel_prefix": "MD_ALPACA_SNDBX"
         }
     }
-    , "MD_GATEWAY": {
-        "exchange_id":          "MD_GATEWAY"
-        , "name":               "MD Portal (proxy)"
-        , "type":               "PROXY"
+    # , "MD_GATEWAY": {
+    #     "exchange_id":          "MD_GATEWAY"
+    #     , "name":               "MD Portal (proxy)"
+    #     , "type":               "PROXY"
 
-        , "mktdata" : {
-            "class": "cvttpy.exchanges.proxies.md_gateway_clnt.mkt_data.MktDataGatewayFeed"
-        }
-    }
+    #     , "mktdata" : {
+    #         "class": "cvttpy.exchanges.proxies.md_gateway_clnt.mkt_data.MktDataGatewayFeed"
+    #     }
+    # }
     , "MD_PORTAL_ALPACA_03": {
         "exchange_id":          "MD_PORTAL"
         , "name":               "MD Portal (proxy)"
diff --git a/run/docker-compose.yml b/run/docker-compose.yml
deleted file mode 100644
index 5dc1308..0000000
--- a/run/docker-compose.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-version: "3.8"
-#==================================================
-services:
-    config_service:
-        image: cloud21.cvtt.vpn:5500/config_service:latest
-        container_name: cvtt_config_service
-        restart: unless-stopped
-        volumes:
-            - /home/cvtt/prod/config_service/data:/app/data
-            - /home/cvtt/prod/logs:/logs
-        ports:
-            - 6789:6789
-
diff --git a/run/restart.sh b/run/restart.sh
deleted file mode 100755
index cf4142f..0000000
--- a/run/restart.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-cd $(dirname ${0})
-docker compose down 
-docker compose up -d --pull=always
diff --git a/run/start.sh b/run/start.sh
deleted file mode 100755
index 79d8d44..0000000
--- a/run/start.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cd $(dirname ${0})
-docker compose up -d --pull=always
diff --git a/run/stop.sh b/run/stop.sh
deleted file mode 100755
index 7e4c8bd..0000000
--- a/run/stop.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cd $(dirname ${0})
-docker compose down
diff --git a/run_relative_liquidity/docker-compose.yml b/run_relative_liquidity/docker-compose.yml
deleted file mode 100644
index c7dd110..0000000
--- a/run_relative_liquidity/docker-compose.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-version: "3.8"
-#==================================================
-services:
-    relative_liquidity:
-        image: cloud21.cvtt.vpn:5500/relative_liquidity:latest
-        container_name: relative_liquidity_svc
-        restart: unless-stopped
-        volumes:
-            - /home/cvtt/prod/data:/app/data
-            - /home/cvtt/prod/logs:/logs
-        ports:
-            - 5678:5678
-
diff --git a/run_relative_liquidity/restart.sh b/run_relative_liquidity/restart.sh
deleted file mode 100755
index cf4142f..0000000
--- a/run_relative_liquidity/restart.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-cd $(dirname ${0})
-docker compose down 
-docker compose up -d --pull=always
diff --git a/run_relative_liquidity/start.sh b/run_relative_liquidity/start.sh
deleted file mode 100755
index 79d8d44..0000000
--- a/run_relative_liquidity/start.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cd $(dirname ${0})
-docker compose up -d --pull=always
diff --git a/run_relative_liquidity/stop.sh b/run_relative_liquidity/stop.sh
deleted file mode 100755
index 7e4c8bd..0000000
--- a/run_relative_liquidity/stop.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cd $(dirname ${0})
-docker compose down
diff --git a/run_trading_calendar/docker-compose.yml b/run_trading_calendar/docker-compose.yml
deleted file mode 100644
index ab11188..0000000
--- a/run_trading_calendar/docker-compose.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-version: "3.8"
-#==================================================
-services:
-    trading_calendar:
-        image: apptasticsoftware/trading-calendar
-        container_name: trading-calendar
-        restart: unless-stopped
-        ports:
-            - 8000:80
-
diff --git a/run_trading_calendar/restart.sh b/run_trading_calendar/restart.sh
deleted file mode 100755
index cf4142f..0000000
--- a/run_trading_calendar/restart.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-cd $(dirname ${0})
-docker compose down 
-docker compose up -d --pull=always
diff --git a/run_trading_calendar/start.sh b/run_trading_calendar/start.sh
deleted file mode 100755
index 79d8d44..0000000
--- a/run_trading_calendar/start.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cd $(dirname ${0})
-docker compose up -d --pull=always
diff --git a/run_trading_calendar/stop.sh b/run_trading_calendar/stop.sh
deleted file mode 100755
index 7e4c8bd..0000000
--- a/run_trading_calendar/stop.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cd $(dirname ${0})
-docker compose down