diff --git a/data/refdata/exchanges.cfg b/data/refdata/exchanges.cfg
index 5fd4c31..6a7e102 100644
--- a/data/refdata/exchanges.cfg
+++ b/data/refdata/exchanges.cfg
@@ -12,7 +12,7 @@
         , "cred_key":  "ALPACA_PROD"
 
         , "order_entry": {
-            "class":  "cvttpy.exchanges.alpaca.oe_client.AlpacaOrderEntryClient"
+            "class":  "cvttpy_trading.exchanges.alpaca.oe_client.AlpacaOrderEntryClient"
 
             # D E P R E C A T E D
             , "REST": {
@@ -39,7 +39,7 @@
             }
         }
         , "mktdata" : {
-            "class":           "cvttpy.exchanges.alpaca.mkt_data.AlpacaStockFeed"
+            "class":           "cvttpy_trading.exchanges.alpaca.mkt_data.AlpacaStockFeed"
             , "reconnect_secs": 2.0
 
             # D E P R E C A T E D
@@ -70,7 +70,7 @@
             }
         }
         , "accounting": {
-            "class":  "cvttpy.exchanges.alpaca.acct_client.AlpacaAccounting"
+            "class":  "cvttpy_trading.exchanges.alpaca.acct_client.AlpacaAccounting"
 
             # D E P R E C A T E D
             , "REST": {
@@ -98,7 +98,7 @@
         , "cred_key":  "ALPACA_SANDBOX"
 
         , "order_entry": {
-            "class":  "cvttpy.exchanges.alpaca.oe_client.AlpacaOrderEntryClient"
+            "class":  "cvttpy_trading.exchanges.alpaca.oe_client.AlpacaOrderEntryClient"
 
             # D E P R E C A T E D
             , "REST": {
@@ -125,7 +125,7 @@
             }
         }
         , "mktdata" : {
-            "class":           "cvttpy.exchanges.alpaca.mkt_data.AlpacaMdFeed"
+            "class":           "cvttpy_trading.exchanges.alpaca.mkt_data.AlpacaMdFeed"
             , "reconnect_secs": 2.0
 
             # D E P R E C A T E D
@@ -155,7 +155,7 @@
             }
         }
         , "accounting": {
-            "class":  "cvttpy.exchanges.alpaca.acct_client.AlpacaAccounting"
+            "class":  "cvttpy_trading.exchanges.alpaca.acct_client.AlpacaAccounting"
 
             # D E P R E C A T E D
             , "REST": {
@@ -184,7 +184,7 @@
         , "connector_class"     : "MdOnlyExchangeConnector"
 
         , "mktdata" : {
-            "class":          "cvttpy.exchanges.bitstamp.mkt_data.BitstampMdFeed"
+            "class":          "cvttpy_trading.exchanges.bitstamp.mkt_data.BitstampMdFeed"
             , "reconnect_secs": 2
 
             # D E P R E C A T E D
@@ -204,7 +204,7 @@
         , "type":               "FUTURES"
 
         , "mktdata" : {
-            "class":           "cvttpy.exchanges.binance.futures.mkt_data.BnbFutMktDataFeed"
+            "class":           "cvttpy_trading.exchanges.binance.futures.mkt_data.BnbFutMktDataFeed"
             , "max_connections": 10
             , "reconnect_secs": 2.0
 
@@ -234,7 +234,7 @@
         , "type":               "SPOT"
 
         , "mktdata" : {
-            "class": "cvttpy.exchanges.binance.spot.mkt_data.BnbSpotMktDataFeed"
+            "class": "cvttpy_trading.exchanges.binance.spot.mkt_data.BnbSpotMktDataFeed"
             , "max_connections": 10
             , "reconnect_secs": 2.0
 
@@ -265,7 +265,7 @@
         , "type":               "SPOT"
 
         , "mktdata" : {
-            "class": "cvttpy.exchanges.binance.spot.mkt_data.BnbSpotMktDataFeed"
+            "class": "cvttpy_trading.exchanges.binance.spot.mkt_data.BnbSpotMktDataFeed"
             , "reconnect_secs": 10
 
             # D E P R E C A T E D
@@ -293,7 +293,7 @@
         , "type":               "SPOT"
 
         , "order_entry": {
-            "class":  "cvttpy.exchanges.coinbase.spot.oe_client.CoinbaseSpotOEClient"
+            "class":  "cvttpy_trading.exchanges.coinbase.spot.oe_client.CoinbaseSpotOEClient"
 
             # D E P R E C A T E D
             # , "ws_url": ["WSS", "wss://advanced-trade-ws.coinbase.com"]
@@ -317,7 +317,7 @@
         }
 
         , "accounting": {
-            "class":  "cvttpy.exchanges.coinbase.spot.account.CoinbaseSpotAccounting"
+            "class":  "cvttpy_trading.exchanges.coinbase.spot.account.CoinbaseSpotAccounting"
 
             # D E P R E C A T E D
             # , "REST": {
@@ -337,7 +337,7 @@
         }
 
         , "mktdata" : {
-            "class":  "cvttpy.exchanges.coinbase.spot.mkt_data.CoinbaseMdFeed"
+            "class":  "cvttpy_trading.exchanges.coinbase.spot.mkt_data.CoinbaseMdFeed"
 
             , "reconnect_secs": 2
             , "max_connections": 10
@@ -368,7 +368,7 @@
         , "connector_class"     : "MdOnlyExchangeConnector"
 
         , "mktdata" : {
-            "class": "cvttpy.exchanges.gemini.mkt_data.GeminiMdFeed"
+            "class": "cvttpy_trading.exchanges.gemini.mkt_data.GeminiMdFeed"
             , "reconnect_secs": 1
 
             # D E P R E C A T E D
@@ -393,7 +393,7 @@
         , "connector_class"     : "MdOnlyExchangeConnector"
 
         , "mktdata" : {
-            "class": "cvttpy.exchanges.gemini.mkt_data.GeminiMdFeed"
+            "class": "cvttpy_trading.exchanges.gemini.mkt_data.GeminiMdFeed"
             , "reconnect_secs": 1
 
             # D E P R E C A T E D
@@ -422,7 +422,7 @@
             }
         }
         , "accounting": {
-            "class": "cvttpy.exchanges.gemini.account.GeminiExchAccounting"
+            "class": "cvttpy_trading.exchanges.gemini.account.GeminiExchAccounting"
             # D E P R E C A T E D
             , "REST": {
                 "open_orders_url": ["POST",  "https://api.sandbox.gemini.com/v1/orders"]
@@ -455,7 +455,7 @@
         , "type":               "SPOT"
 
         , "mktdata" : {
-            "class":           "cvttpy.exchanges.kraken.mkt_data.KrakenMdFeed"
+            "class":           "cvttpy_trading.exchanges.kraken.mkt_data.KrakenMdFeed"
             , "max_connections": 10
             , "reconnect_secs": 2.0
 
@@ -480,7 +480,7 @@
         , "type":               "SPOT"
 
         , "mktdata" : {
-            "class":           "cvttpy.exchanges.okx.mkt_data.OkxMdFeed"
+            "class":           "cvttpy_trading.exchanges.okx.mkt_data.OkxMdFeed"
             , "max_connections": 10
             , "reconnect_secs": 2.0
 
@@ -508,12 +508,12 @@
 
 
     #     , "mktdata" : {
-    #         "class":  "cvttpy.exchanges.mkt_simulator.md_client.MktSimMdClientFeed"
+    #         "class":  "cvttpy_trading.exchanges.mkt_simulator.md_client.MktSimMdClientFeed"
     #         "ws_url": ["WS", "ws://localhost:10180/ws"]
     #     }
 
     #     , "order_entry": {
-    #         "class":  "cvttpy.exchanges.mkt_simulator.oe_client.MarketSimulatorOEClient"
+    #         "class":  "cvttpy_trading.exchanges.mkt_simulator.oe_client.MarketSimulatorOEClient"
 
     #         , "REST": {
     #             "new_order_url": ["POST", "http://localhost:10182/order"]
@@ -525,7 +525,7 @@
     #         "ws_url": ["WSS", "ws://localhost:10181/ws"]
     #     }
     #     , "accounting": {
-    #         "class":  "cvttpy.exchanges.mkt_simulator.acct_client.MktSimAccounting"
+    #         "class":  "cvttpy_trading.exchanges.mkt_simulator.acct_client.MktSimAccounting"
     #         , "REST": {
     #                 "positions_url": ["GET", "http://localhost:10083/positions"]
     #                 , "trades_url": ["GET", "http://localhost:10083/trades"]
@@ -540,12 +540,12 @@
 
 
     #     , "mktdata" : {
-    #         "class":  "cvttpy.exchanges.mkt_simulator.md_client.MktSimMdClientFeed"
+    #         "class":  "cvttpy_trading.exchanges.mkt_simulator.md_client.MktSimMdClientFeed"
     #         "ws_url": ["WS", "ws://localhost:8080/ws"]
     #     }
 
     #     , "order_entry": {
-    #         "class":  "cvttpy.exchanges.mkt_simulator.oe_client.MarketSimulatorOEClient"
+    #         "class":  "cvttpy_trading.exchanges.mkt_simulator.oe_client.MarketSimulatorOEClient"
 
     #         , "REST": {
     #             "new_order_url": ["POST", "http://localhost:8181/order"]
@@ -557,7 +557,7 @@
     #         "ws_url": ["WSS", "ws://localhost:8180/ws"]
     #     }
     #     , "accounting": {
-    #         "class":  "cvttpy.exchanges.mkt_simulator.acct_client.MktSimAccounting"
+    #         "class":  "cvttpy_trading.exchanges.mkt_simulator.acct_client.MktSimAccounting"
     #         , "REST": {
     #                 "positions_url": ["GET", "http://localhost:8182/positions"]
     #                 , "trades_url": ["GET", "http://localhost:8182/trades"]