diff --git a/vn.trader/VT_setting.json b/trader/VT_setting.json
similarity index 100%
rename from vn.trader/VT_setting.json
rename to trader/VT_setting.json
diff --git a/vn.trader/__init__.py b/trader/__init__.py
similarity index 100%
rename from vn.trader/__init__.py
rename to trader/__init__.py
diff --git a/vn.trader/ctaStrategy/__init__.py b/trader/app/__init__.py
similarity index 100%
rename from vn.trader/ctaStrategy/__init__.py
rename to trader/app/__init__.py
diff --git a/vn.trader/ctaStrategy/CTA_setting.json b/trader/app/ctaStrategy/CTA_setting.json
similarity index 100%
rename from vn.trader/ctaStrategy/CTA_setting.json
rename to trader/app/ctaStrategy/CTA_setting.json
diff --git a/vn.trader/ctaStrategy/language/chinese/__init__.py b/trader/app/ctaStrategy/__init__.py
similarity index 100%
rename from vn.trader/ctaStrategy/language/chinese/__init__.py
rename to trader/app/ctaStrategy/__init__.py
diff --git a/vn.trader/ctaStrategy/cache/README.md b/trader/app/ctaStrategy/cache/README.md
similarity index 100%
rename from vn.trader/ctaStrategy/cache/README.md
rename to trader/app/ctaStrategy/cache/README.md
diff --git a/vn.trader/ctaStrategy/ctaBacktesting.py b/trader/app/ctaStrategy/ctaBacktesting.py
similarity index 100%
rename from vn.trader/ctaStrategy/ctaBacktesting.py
rename to trader/app/ctaStrategy/ctaBacktesting.py
diff --git a/vn.trader/ctaStrategy/ctaBase.py b/trader/app/ctaStrategy/ctaBase.py
similarity index 100%
rename from vn.trader/ctaStrategy/ctaBase.py
rename to trader/app/ctaStrategy/ctaBase.py
diff --git a/vn.trader/ctaStrategy/ctaEngine.py b/trader/app/ctaStrategy/ctaEngine.py
similarity index 100%
rename from vn.trader/ctaStrategy/ctaEngine.py
rename to trader/app/ctaStrategy/ctaEngine.py
diff --git a/vn.trader/ctaStrategy/ctaGridTrade.py b/trader/app/ctaStrategy/ctaGridTrade.py
similarity index 100%
rename from vn.trader/ctaStrategy/ctaGridTrade.py
rename to trader/app/ctaStrategy/ctaGridTrade.py
diff --git a/vn.trader/ctaStrategy/ctaHistoryData.py b/trader/app/ctaStrategy/ctaHistoryData.py
similarity index 100%
rename from vn.trader/ctaStrategy/ctaHistoryData.py
rename to trader/app/ctaStrategy/ctaHistoryData.py
diff --git a/vn.trader/ctaStrategy/ctaLineBar.py b/trader/app/ctaStrategy/ctaLineBar.py
similarity index 100%
rename from vn.trader/ctaStrategy/ctaLineBar.py
rename to trader/app/ctaStrategy/ctaLineBar.py
diff --git a/vn.trader/ctaStrategy/ctaPolicy.py b/trader/app/ctaStrategy/ctaPolicy.py
similarity index 100%
rename from vn.trader/ctaStrategy/ctaPolicy.py
rename to trader/app/ctaStrategy/ctaPolicy.py
diff --git a/vn.trader/ctaStrategy/ctaPosition.py b/trader/app/ctaStrategy/ctaPosition.py
similarity index 100%
rename from vn.trader/ctaStrategy/ctaPosition.py
rename to trader/app/ctaStrategy/ctaPosition.py
diff --git a/vn.trader/ctaStrategy/ctaTemplate.py b/trader/app/ctaStrategy/ctaTemplate.py
similarity index 100%
rename from vn.trader/ctaStrategy/ctaTemplate.py
rename to trader/app/ctaStrategy/ctaTemplate.py
diff --git a/vn.trader/ctaStrategy/data/README.md b/trader/app/ctaStrategy/data/README.md
similarity index 100%
rename from vn.trader/ctaStrategy/data/README.md
rename to trader/app/ctaStrategy/data/README.md
diff --git a/vn.trader/ctaStrategy/datayes.json b/trader/app/ctaStrategy/datayes.json
similarity index 100%
rename from vn.trader/ctaStrategy/datayes.json
rename to trader/app/ctaStrategy/datayes.json
diff --git a/vn.trader/ctaStrategy/datayesClient.py b/trader/app/ctaStrategy/datayesClient.py
similarity index 100%
rename from vn.trader/ctaStrategy/datayesClient.py
rename to trader/app/ctaStrategy/datayesClient.py
diff --git a/vn.trader/ctaStrategy/language/__init__.py b/trader/app/ctaStrategy/language/__init__.py
similarity index 100%
rename from vn.trader/ctaStrategy/language/__init__.py
rename to trader/app/ctaStrategy/language/__init__.py
diff --git a/vn.trader/ctaStrategy/language/english/__init__.py b/trader/app/ctaStrategy/language/chinese/__init__.py
similarity index 100%
rename from vn.trader/ctaStrategy/language/english/__init__.py
rename to trader/app/ctaStrategy/language/chinese/__init__.py
diff --git a/vn.trader/ctaStrategy/language/chinese/text.py b/trader/app/ctaStrategy/language/chinese/text.py
similarity index 100%
rename from vn.trader/ctaStrategy/language/chinese/text.py
rename to trader/app/ctaStrategy/language/chinese/text.py
diff --git a/vn.trader/dataRecorder/__init__.py b/trader/app/ctaStrategy/language/english/__init__.py
similarity index 100%
rename from vn.trader/dataRecorder/__init__.py
rename to trader/app/ctaStrategy/language/english/__init__.py
diff --git a/vn.trader/ctaStrategy/language/english/text.py b/trader/app/ctaStrategy/language/english/text.py
similarity index 100%
rename from vn.trader/ctaStrategy/language/english/text.py
rename to trader/app/ctaStrategy/language/english/text.py
diff --git a/vn.trader/ctaStrategy/strategy/__init__.py b/trader/app/ctaStrategy/strategy/__init__.py
similarity index 100%
rename from vn.trader/ctaStrategy/strategy/__init__.py
rename to trader/app/ctaStrategy/strategy/__init__.py
diff --git a/vn.trader/ctaStrategy/strategy/strategyAtrRsi.py b/trader/app/ctaStrategy/strategy/strategyAtrRsi.py
similarity index 100%
rename from vn.trader/ctaStrategy/strategy/strategyAtrRsi.py
rename to trader/app/ctaStrategy/strategy/strategyAtrRsi.py
diff --git a/vn.trader/ctaStrategy/tools/README.md b/trader/app/ctaStrategy/tools/README.md
similarity index 100%
rename from vn.trader/ctaStrategy/tools/README.md
rename to trader/app/ctaStrategy/tools/README.md
diff --git a/vn.trader/gateway/ctpGateway/language/chinese/__init__.py b/trader/app/ctaStrategy/tools/__init__.py
similarity index 100%
rename from vn.trader/gateway/ctpGateway/language/chinese/__init__.py
rename to trader/app/ctaStrategy/tools/__init__.py
diff --git a/vn.trader/ctaStrategy/tools/ctaLineBar.py b/trader/app/ctaStrategy/tools/ctaLineBar.py
similarity index 100%
rename from vn.trader/ctaStrategy/tools/ctaLineBar.py
rename to trader/app/ctaStrategy/tools/ctaLineBar.py
diff --git a/vn.trader/ctaStrategy/tools/multiTimeFrame/Screen Shot 2016-11-08 at 9.08.47 PM.png b/trader/app/ctaStrategy/tools/multiTimeFrame/Screen Shot 2016-11-08 at 9.08.47 PM.png
similarity index 100%
rename from vn.trader/ctaStrategy/tools/multiTimeFrame/Screen Shot 2016-11-08 at 9.08.47 PM.png
rename to trader/app/ctaStrategy/tools/multiTimeFrame/Screen Shot 2016-11-08 at 9.08.47 PM.png
diff --git a/vn.trader/gateway/ctpGateway/language/english/__init__.py b/trader/app/ctaStrategy/tools/multiTimeFrame/__init__.py
similarity index 100%
rename from vn.trader/gateway/ctpGateway/language/english/__init__.py
rename to trader/app/ctaStrategy/tools/multiTimeFrame/__init__.py
diff --git a/vn.trader/ctaStrategy/tools/multiTimeFrame/ctaBacktestMultiTF.py b/trader/app/ctaStrategy/tools/multiTimeFrame/ctaBacktestMultiTF.py
similarity index 100%
rename from vn.trader/ctaStrategy/tools/multiTimeFrame/ctaBacktestMultiTF.py
rename to trader/app/ctaStrategy/tools/multiTimeFrame/ctaBacktestMultiTF.py
diff --git a/vn.trader/ctaStrategy/tools/multiTimeFrame/ctaStrategyMultiTF.py b/trader/app/ctaStrategy/tools/multiTimeFrame/ctaStrategyMultiTF.py
similarity index 100%
rename from vn.trader/ctaStrategy/tools/multiTimeFrame/ctaStrategyMultiTF.py
rename to trader/app/ctaStrategy/tools/multiTimeFrame/ctaStrategyMultiTF.py
diff --git a/vn.trader/ctaStrategy/tools/multiTimeFrame/strategyBreakOut.py b/trader/app/ctaStrategy/tools/multiTimeFrame/strategyBreakOut.py
similarity index 100%
rename from vn.trader/ctaStrategy/tools/multiTimeFrame/strategyBreakOut.py
rename to trader/app/ctaStrategy/tools/multiTimeFrame/strategyBreakOut.py
diff --git a/vn.trader/ctaStrategy/uiCtaWidget.py b/trader/app/ctaStrategy/uiCtaWidget.py
similarity index 99%
rename from vn.trader/ctaStrategy/uiCtaWidget.py
rename to trader/app/ctaStrategy/uiCtaWidget.py
index 03e9876b..0293b22f 100644
--- a/vn.trader/ctaStrategy/uiCtaWidget.py
+++ b/trader/app/ctaStrategy/uiCtaWidget.py
@@ -7,7 +7,7 @@ CTA模块相关的GUI控制组件
 import sys
 sys.path.append('..')
 
-from uiBasicWidget import QtGui, QtCore, BasicCell
+from uiBasicWidget import QtGui, QtCore
 from eventEngine import *
 from language import text
 from time import sleep
diff --git a/vn.trader/ctaStrategy/utilArbTickLoader.py b/trader/app/ctaStrategy/utilArbTickLoader.py
similarity index 100%
rename from vn.trader/ctaStrategy/utilArbTickLoader.py
rename to trader/app/ctaStrategy/utilArbTickLoader.py
diff --git a/vn.trader/dataRecorder/DR_setting.json b/trader/app/dataRecorder/DR_setting.json
similarity index 100%
rename from vn.trader/dataRecorder/DR_setting.json
rename to trader/app/dataRecorder/DR_setting.json
diff --git a/vn.trader/gateway/ibGateway/language/chinese/__init__.py b/trader/app/dataRecorder/__init__.py
similarity index 100%
rename from vn.trader/gateway/ibGateway/language/chinese/__init__.py
rename to trader/app/dataRecorder/__init__.py
diff --git a/vn.trader/dataRecorder/drBase.py b/trader/app/dataRecorder/drBase.py
similarity index 100%
rename from vn.trader/dataRecorder/drBase.py
rename to trader/app/dataRecorder/drBase.py
diff --git a/vn.trader/dataRecorder/drEngine.py b/trader/app/dataRecorder/drEngine.py
similarity index 100%
rename from vn.trader/dataRecorder/drEngine.py
rename to trader/app/dataRecorder/drEngine.py
diff --git a/vn.trader/dataRecorder/uiDrWidget.py b/trader/app/dataRecorder/uiDrWidget.py
similarity index 100%
rename from vn.trader/dataRecorder/uiDrWidget.py
rename to trader/app/dataRecorder/uiDrWidget.py
diff --git a/vn.trader/riskManager/RM_setting.json b/trader/app/riskManager/RM_setting.json
similarity index 100%
rename from vn.trader/riskManager/RM_setting.json
rename to trader/app/riskManager/RM_setting.json
diff --git a/vn.trader/gateway/ibGateway/language/english/__init__.py b/trader/app/riskManager/__init__.py
similarity index 100%
rename from vn.trader/gateway/ibGateway/language/english/__init__.py
rename to trader/app/riskManager/__init__.py
diff --git a/vn.trader/riskManager/rmEngine.py b/trader/app/riskManager/rmEngine.py
similarity index 100%
rename from vn.trader/riskManager/rmEngine.py
rename to trader/app/riskManager/rmEngine.py
diff --git a/vn.trader/riskManager/uiRmWidget.py b/trader/app/riskManager/uiRmWidget.py
similarity index 100%
rename from vn.trader/riskManager/uiRmWidget.py
rename to trader/app/riskManager/uiRmWidget.py
diff --git a/vn.trader/eventEngine.py b/trader/eventEngine.py
similarity index 100%
rename from vn.trader/eventEngine.py
rename to trader/eventEngine.py
diff --git a/vn.trader/eventType.py b/trader/eventType.py
similarity index 100%
rename from vn.trader/eventType.py
rename to trader/eventType.py
diff --git a/vn.trader/gateway/__init__.py b/trader/gateway/__init__.py
similarity index 100%
rename from vn.trader/gateway/__init__.py
rename to trader/gateway/__init__.py
diff --git a/vn.trader/gateway/ctpGateway/CTP_connect.json b/trader/gateway/ctpGateway/CTP_connect.json
similarity index 100%
rename from vn.trader/gateway/ctpGateway/CTP_connect.json
rename to trader/gateway/ctpGateway/CTP_connect.json
diff --git a/vn.trader/gateway/ctpGateway/__init__.py b/trader/gateway/ctpGateway/__init__.py
similarity index 100%
rename from vn.trader/gateway/ctpGateway/__init__.py
rename to trader/gateway/ctpGateway/__init__.py
diff --git a/vn.trader/gateway/ctpGateway/ctpDataType.py b/trader/gateway/ctpGateway/ctpDataType.py
similarity index 100%
rename from vn.trader/gateway/ctpGateway/ctpDataType.py
rename to trader/gateway/ctpGateway/ctpDataType.py
diff --git a/vn.trader/gateway/ctpGateway/ctpGateway.py b/trader/gateway/ctpGateway/ctpGateway.py
similarity index 100%
rename from vn.trader/gateway/ctpGateway/ctpGateway.py
rename to trader/gateway/ctpGateway/ctpGateway.py
diff --git a/vn.trader/gateway/ctpGateway/language/__init__.py b/trader/gateway/ctpGateway/language/__init__.py
similarity index 100%
rename from vn.trader/gateway/ctpGateway/language/__init__.py
rename to trader/gateway/ctpGateway/language/__init__.py
diff --git a/vn.trader/language/chinese/__init__.py b/trader/gateway/ctpGateway/language/chinese/__init__.py
similarity index 100%
rename from vn.trader/language/chinese/__init__.py
rename to trader/gateway/ctpGateway/language/chinese/__init__.py
diff --git a/vn.trader/gateway/ctpGateway/language/chinese/text.py b/trader/gateway/ctpGateway/language/chinese/text.py
similarity index 100%
rename from vn.trader/gateway/ctpGateway/language/chinese/text.py
rename to trader/gateway/ctpGateway/language/chinese/text.py
diff --git a/vn.trader/language/english/__init__.py b/trader/gateway/ctpGateway/language/english/__init__.py
similarity index 100%
rename from vn.trader/language/english/__init__.py
rename to trader/gateway/ctpGateway/language/english/__init__.py
diff --git a/vn.trader/gateway/ctpGateway/language/english/text.py b/trader/gateway/ctpGateway/language/english/text.py
similarity index 100%
rename from vn.trader/gateway/ctpGateway/language/english/text.py
rename to trader/gateway/ctpGateway/language/english/text.py
diff --git a/vn.trader/gateway/ctpGateway/thostmduserapi.dll b/trader/gateway/ctpGateway/thostmduserapi.dll
similarity index 100%
rename from vn.trader/gateway/ctpGateway/thostmduserapi.dll
rename to trader/gateway/ctpGateway/thostmduserapi.dll
diff --git a/vn.trader/gateway/ctpGateway/thosttraderapi.dll b/trader/gateway/ctpGateway/thosttraderapi.dll
similarity index 100%
rename from vn.trader/gateway/ctpGateway/thosttraderapi.dll
rename to trader/gateway/ctpGateway/thosttraderapi.dll
diff --git a/vn.trader/gateway/ctpGateway/vnctpmd.pyd b/trader/gateway/ctpGateway/vnctpmd.pyd
similarity index 100%
rename from vn.trader/gateway/ctpGateway/vnctpmd.pyd
rename to trader/gateway/ctpGateway/vnctpmd.pyd
diff --git a/vn.trader/gateway/ctpGateway/vnctpmd.so b/trader/gateway/ctpGateway/vnctpmd.so
similarity index 100%
rename from vn.trader/gateway/ctpGateway/vnctpmd.so
rename to trader/gateway/ctpGateway/vnctpmd.so
diff --git a/vn.trader/gateway/ctpGateway/vnctptd.pyd b/trader/gateway/ctpGateway/vnctptd.pyd
similarity index 100%
rename from vn.trader/gateway/ctpGateway/vnctptd.pyd
rename to trader/gateway/ctpGateway/vnctptd.pyd
diff --git a/vn.trader/gateway/ctpGateway/vnctptd.so b/trader/gateway/ctpGateway/vnctptd.so
similarity index 100%
rename from vn.trader/gateway/ctpGateway/vnctptd.so
rename to trader/gateway/ctpGateway/vnctptd.so
diff --git a/vn.trader/gateway/femasGateway/FEMAS_connect.json b/trader/gateway/femasGateway/FEMAS_connect.json
similarity index 100%
rename from vn.trader/gateway/femasGateway/FEMAS_connect.json
rename to trader/gateway/femasGateway/FEMAS_connect.json
diff --git a/vn.trader/gateway/femasGateway/USTPmduserapi.dll b/trader/gateway/femasGateway/USTPmduserapi.dll
similarity index 100%
rename from vn.trader/gateway/femasGateway/USTPmduserapi.dll
rename to trader/gateway/femasGateway/USTPmduserapi.dll
diff --git a/vn.trader/gateway/femasGateway/USTPtraderapi.dll b/trader/gateway/femasGateway/USTPtraderapi.dll
similarity index 100%
rename from vn.trader/gateway/femasGateway/USTPtraderapi.dll
rename to trader/gateway/femasGateway/USTPtraderapi.dll
diff --git a/vn.trader/gateway/femasGateway/__init__.py b/trader/gateway/femasGateway/__init__.py
similarity index 100%
rename from vn.trader/gateway/femasGateway/__init__.py
rename to trader/gateway/femasGateway/__init__.py
diff --git a/vn.trader/gateway/femasGateway/femasDataType.py b/trader/gateway/femasGateway/femasDataType.py
similarity index 100%
rename from vn.trader/gateway/femasGateway/femasDataType.py
rename to trader/gateway/femasGateway/femasDataType.py
diff --git a/vn.trader/gateway/femasGateway/femasGateway.py b/trader/gateway/femasGateway/femasGateway.py
similarity index 100%
rename from vn.trader/gateway/femasGateway/femasGateway.py
rename to trader/gateway/femasGateway/femasGateway.py
diff --git a/vn.trader/gateway/femasGateway/vnfemasmd.pyd b/trader/gateway/femasGateway/vnfemasmd.pyd
similarity index 100%
rename from vn.trader/gateway/femasGateway/vnfemasmd.pyd
rename to trader/gateway/femasGateway/vnfemasmd.pyd
diff --git a/vn.trader/gateway/femasGateway/vnfemastd.pyd b/trader/gateway/femasGateway/vnfemastd.pyd
similarity index 100%
rename from vn.trader/gateway/femasGateway/vnfemastd.pyd
rename to trader/gateway/femasGateway/vnfemastd.pyd
diff --git a/vn.trader/gateway/huobiGateway/HUOBI_connect.json b/trader/gateway/huobiGateway/HUOBI_connect.json
similarity index 100%
rename from vn.trader/gateway/huobiGateway/HUOBI_connect.json
rename to trader/gateway/huobiGateway/HUOBI_connect.json
diff --git a/vn.trader/gateway/huobiGateway/__init__.py b/trader/gateway/huobiGateway/__init__.py
similarity index 100%
rename from vn.trader/gateway/huobiGateway/__init__.py
rename to trader/gateway/huobiGateway/__init__.py
diff --git a/vn.trader/gateway/huobiGateway/huobiGateway.py b/trader/gateway/huobiGateway/huobiGateway.py
similarity index 100%
rename from vn.trader/gateway/huobiGateway/huobiGateway.py
rename to trader/gateway/huobiGateway/huobiGateway.py
diff --git a/vn.trader/gateway/huobiGateway/vnhuobi.py b/trader/gateway/huobiGateway/vnhuobi.py
similarity index 100%
rename from vn.trader/gateway/huobiGateway/vnhuobi.py
rename to trader/gateway/huobiGateway/vnhuobi.py
diff --git a/vn.trader/gateway/ibGateway/IB_connect.json b/trader/gateway/ibGateway/IB_connect.json
similarity index 100%
rename from vn.trader/gateway/ibGateway/IB_connect.json
rename to trader/gateway/ibGateway/IB_connect.json
diff --git a/vn.trader/gateway/ibGateway/__init__.py b/trader/gateway/ibGateway/__init__.py
similarity index 100%
rename from vn.trader/gateway/ibGateway/__init__.py
rename to trader/gateway/ibGateway/__init__.py
diff --git a/vn.trader/gateway/ibGateway/ibGateway.py b/trader/gateway/ibGateway/ibGateway.py
similarity index 100%
rename from vn.trader/gateway/ibGateway/ibGateway.py
rename to trader/gateway/ibGateway/ibGateway.py
diff --git a/vn.trader/gateway/ibGateway/language/__init__.py b/trader/gateway/ibGateway/language/__init__.py
similarity index 100%
rename from vn.trader/gateway/ibGateway/language/__init__.py
rename to trader/gateway/ibGateway/language/__init__.py
diff --git a/vn.trader/riskManager/__init__.py b/trader/gateway/ibGateway/language/chinese/__init__.py
similarity index 100%
rename from vn.trader/riskManager/__init__.py
rename to trader/gateway/ibGateway/language/chinese/__init__.py
diff --git a/vn.trader/gateway/ibGateway/language/chinese/text.py b/trader/gateway/ibGateway/language/chinese/text.py
similarity index 100%
rename from vn.trader/gateway/ibGateway/language/chinese/text.py
rename to trader/gateway/ibGateway/language/chinese/text.py
diff --git a/trader/gateway/ibGateway/language/english/__init__.py b/trader/gateway/ibGateway/language/english/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/vn.trader/gateway/ibGateway/language/english/text.py b/trader/gateway/ibGateway/language/english/text.py
similarity index 100%
rename from vn.trader/gateway/ibGateway/language/english/text.py
rename to trader/gateway/ibGateway/language/english/text.py
diff --git a/vn.trader/gateway/ibGateway/vnib.pyd b/trader/gateway/ibGateway/vnib.pyd
similarity index 100%
rename from vn.trader/gateway/ibGateway/vnib.pyd
rename to trader/gateway/ibGateway/vnib.pyd
diff --git a/vn.trader/gateway/ibGateway/vnib.so b/trader/gateway/ibGateway/vnib.so
similarity index 100%
rename from vn.trader/gateway/ibGateway/vnib.so
rename to trader/gateway/ibGateway/vnib.so
diff --git a/vn.trader/gateway/ksgoldGateway/KSGOLD_connect.json b/trader/gateway/ksgoldGateway/KSGOLD_connect.json
similarity index 100%
rename from vn.trader/gateway/ksgoldGateway/KSGOLD_connect.json
rename to trader/gateway/ksgoldGateway/KSGOLD_connect.json
diff --git a/vn.trader/gateway/ksgoldGateway/KSInterMG.dll b/trader/gateway/ksgoldGateway/KSInterMG.dll
similarity index 100%
rename from vn.trader/gateway/ksgoldGateway/KSInterMG.dll
rename to trader/gateway/ksgoldGateway/KSInterMG.dll
diff --git a/vn.trader/gateway/ksgoldGateway/KSLOG.dll b/trader/gateway/ksgoldGateway/KSLOG.dll
similarity index 100%
rename from vn.trader/gateway/ksgoldGateway/KSLOG.dll
rename to trader/gateway/ksgoldGateway/KSLOG.dll
diff --git a/vn.trader/gateway/ksgoldGateway/KSRsaCrypto.dll b/trader/gateway/ksgoldGateway/KSRsaCrypto.dll
similarity index 100%
rename from vn.trader/gateway/ksgoldGateway/KSRsaCrypto.dll
rename to trader/gateway/ksgoldGateway/KSRsaCrypto.dll
diff --git a/vn.trader/gateway/ksgoldGateway/SLEdll/KSCA/KS_SafeEngine.dll b/trader/gateway/ksgoldGateway/SLEdll/KSCA/KS_SafeEngine.dll
similarity index 100%
rename from vn.trader/gateway/ksgoldGateway/SLEdll/KSCA/KS_SafeEngine.dll
rename to trader/gateway/ksgoldGateway/SLEdll/KSCA/KS_SafeEngine.dll
diff --git a/vn.trader/gateway/ksgoldGateway/SLEdll/KSCA/SLE_KSCA.dll b/trader/gateway/ksgoldGateway/SLEdll/KSCA/SLE_KSCA.dll
similarity index 100%
rename from vn.trader/gateway/ksgoldGateway/SLEdll/KSCA/SLE_KSCA.dll
rename to trader/gateway/ksgoldGateway/SLEdll/KSCA/SLE_KSCA.dll
diff --git a/vn.trader/gateway/ksgoldGateway/SLEdll/KSCA/ksca/client.crt b/trader/gateway/ksgoldGateway/SLEdll/KSCA/ksca/client.crt
similarity index 100%
rename from vn.trader/gateway/ksgoldGateway/SLEdll/KSCA/ksca/client.crt
rename to trader/gateway/ksgoldGateway/SLEdll/KSCA/ksca/client.crt
diff --git a/vn.trader/gateway/ksgoldGateway/SLEdll/KSCA/ksca/client.key b/trader/gateway/ksgoldGateway/SLEdll/KSCA/ksca/client.key
similarity index 100%
rename from vn.trader/gateway/ksgoldGateway/SLEdll/KSCA/ksca/client.key
rename to trader/gateway/ksgoldGateway/SLEdll/KSCA/ksca/client.key
diff --git a/vn.trader/gateway/ksgoldGateway/SLEdll/KSCA/ksca/ksca.crt b/trader/gateway/ksgoldGateway/SLEdll/KSCA/ksca/ksca.crt
similarity index 100%
rename from vn.trader/gateway/ksgoldGateway/SLEdll/KSCA/ksca/ksca.crt
rename to trader/gateway/ksgoldGateway/SLEdll/KSCA/ksca/ksca.crt
diff --git a/vn.trader/gateway/ksgoldGateway/SLEdll/KSCA/ksca/ksca.key b/trader/gateway/ksgoldGateway/SLEdll/KSCA/ksca/ksca.key
similarity index 100%
rename from vn.trader/gateway/ksgoldGateway/SLEdll/KSCA/ksca/ksca.key
rename to trader/gateway/ksgoldGateway/SLEdll/KSCA/ksca/ksca.key
diff --git a/vn.trader/gateway/ksgoldGateway/SLEdll/KSCA/ksca/server.crt b/trader/gateway/ksgoldGateway/SLEdll/KSCA/ksca/server.crt
similarity index 100%
rename from vn.trader/gateway/ksgoldGateway/SLEdll/KSCA/ksca/server.crt
rename to trader/gateway/ksgoldGateway/SLEdll/KSCA/ksca/server.crt
diff --git a/vn.trader/gateway/ksgoldGateway/SLEdll/KSCA/ksca/server.key b/trader/gateway/ksgoldGateway/SLEdll/KSCA/ksca/server.key
similarity index 100%
rename from vn.trader/gateway/ksgoldGateway/SLEdll/KSCA/ksca/server.key
rename to trader/gateway/ksgoldGateway/SLEdll/KSCA/ksca/server.key
diff --git a/vn.trader/gateway/ksgoldGateway/SLEdll/KSCA/libeay32.dll b/trader/gateway/ksgoldGateway/SLEdll/KSCA/libeay32.dll
similarity index 100%
rename from vn.trader/gateway/ksgoldGateway/SLEdll/KSCA/libeay32.dll
rename to trader/gateway/ksgoldGateway/SLEdll/KSCA/libeay32.dll
diff --git a/vn.trader/gateway/ksgoldGateway/SLEdll/KSCA/libssl32.dll b/trader/gateway/ksgoldGateway/SLEdll/KSCA/libssl32.dll
similarity index 100%
rename from vn.trader/gateway/ksgoldGateway/SLEdll/KSCA/libssl32.dll
rename to trader/gateway/ksgoldGateway/SLEdll/KSCA/libssl32.dll
diff --git a/vn.trader/gateway/ksgoldGateway/SLEdll/KSCA/ssleay32.dll b/trader/gateway/ksgoldGateway/SLEdll/KSCA/ssleay32.dll
similarity index 100%
rename from vn.trader/gateway/ksgoldGateway/SLEdll/KSCA/ssleay32.dll
rename to trader/gateway/ksgoldGateway/SLEdll/KSCA/ssleay32.dll
diff --git a/vn.trader/gateway/ksgoldGateway/SLEdll/SafeLoginEngine.ini b/trader/gateway/ksgoldGateway/SLEdll/SafeLoginEngine.ini
similarity index 100%
rename from vn.trader/gateway/ksgoldGateway/SLEdll/SafeLoginEngine.ini
rename to trader/gateway/ksgoldGateway/SLEdll/SafeLoginEngine.ini
diff --git a/vn.trader/gateway/ksgoldGateway/__init__.py b/trader/gateway/ksgoldGateway/__init__.py
similarity index 100%
rename from vn.trader/gateway/ksgoldGateway/__init__.py
rename to trader/gateway/ksgoldGateway/__init__.py
diff --git a/vn.trader/gateway/ksgoldGateway/goldtradeapi.dll b/trader/gateway/ksgoldGateway/goldtradeapi.dll
similarity index 100%
rename from vn.trader/gateway/ksgoldGateway/goldtradeapi.dll
rename to trader/gateway/ksgoldGateway/goldtradeapi.dll
diff --git a/vn.trader/gateway/ksgoldGateway/goldtradeapi.lib b/trader/gateway/ksgoldGateway/goldtradeapi.lib
similarity index 100%
rename from vn.trader/gateway/ksgoldGateway/goldtradeapi.lib
rename to trader/gateway/ksgoldGateway/goldtradeapi.lib
diff --git a/vn.trader/gateway/ksgoldGateway/ksSafeLoginEngineG.dll b/trader/gateway/ksgoldGateway/ksSafeLoginEngineG.dll
similarity index 100%
rename from vn.trader/gateway/ksgoldGateway/ksSafeLoginEngineG.dll
rename to trader/gateway/ksgoldGateway/ksSafeLoginEngineG.dll
diff --git a/vn.trader/gateway/ksgoldGateway/ksgoldDataType.py b/trader/gateway/ksgoldGateway/ksgoldDataType.py
similarity index 100%
rename from vn.trader/gateway/ksgoldGateway/ksgoldDataType.py
rename to trader/gateway/ksgoldGateway/ksgoldDataType.py
diff --git a/vn.trader/gateway/ksgoldGateway/ksgoldGateway.py b/trader/gateway/ksgoldGateway/ksgoldGateway.py
similarity index 100%
rename from vn.trader/gateway/ksgoldGateway/ksgoldGateway.py
rename to trader/gateway/ksgoldGateway/ksgoldGateway.py
diff --git a/vn.trader/gateway/ksgoldGateway/sTrader.ini b/trader/gateway/ksgoldGateway/sTrader.ini
similarity index 100%
rename from vn.trader/gateway/ksgoldGateway/sTrader.ini
rename to trader/gateway/ksgoldGateway/sTrader.ini
diff --git a/vn.trader/gateway/ksgoldGateway/vnksgoldtd.pyd b/trader/gateway/ksgoldGateway/vnksgoldtd.pyd
similarity index 100%
rename from vn.trader/gateway/ksgoldGateway/vnksgoldtd.pyd
rename to trader/gateway/ksgoldGateway/vnksgoldtd.pyd
diff --git a/vn.trader/gateway/ksgoldGateway/xSafeEngine.dll b/trader/gateway/ksgoldGateway/xSafeEngine.dll
similarity index 100%
rename from vn.trader/gateway/ksgoldGateway/xSafeEngine.dll
rename to trader/gateway/ksgoldGateway/xSafeEngine.dll
diff --git a/vn.trader/gateway/ksotpGateway/KSOTP_connect.json b/trader/gateway/ksotpGateway/KSOTP_connect.json
similarity index 100%
rename from vn.trader/gateway/ksotpGateway/KSOTP_connect.json
rename to trader/gateway/ksotpGateway/KSOTP_connect.json
diff --git a/vn.trader/gateway/ksotpGateway/SSPXEncode.dll b/trader/gateway/ksotpGateway/SSPXEncode.dll
similarity index 100%
rename from vn.trader/gateway/ksotpGateway/SSPXEncode.dll
rename to trader/gateway/ksotpGateway/SSPXEncode.dll
diff --git a/vn.trader/gateway/ksotpGateway/__init__.py b/trader/gateway/ksotpGateway/__init__.py
similarity index 100%
rename from vn.trader/gateway/ksotpGateway/__init__.py
rename to trader/gateway/ksotpGateway/__init__.py
diff --git a/vn.trader/gateway/ksotpGateway/ksPortalAPI.dll b/trader/gateway/ksotpGateway/ksPortalAPI.dll
similarity index 100%
rename from vn.trader/gateway/ksotpGateway/ksPortalAPI.dll
rename to trader/gateway/ksotpGateway/ksPortalAPI.dll
diff --git a/vn.trader/gateway/ksotpGateway/ksotpDataType.py b/trader/gateway/ksotpGateway/ksotpDataType.py
similarity index 100%
rename from vn.trader/gateway/ksotpGateway/ksotpDataType.py
rename to trader/gateway/ksotpGateway/ksotpDataType.py
diff --git a/vn.trader/gateway/ksotpGateway/ksotpGateway.py b/trader/gateway/ksotpGateway/ksotpGateway.py
similarity index 100%
rename from vn.trader/gateway/ksotpGateway/ksotpGateway.py
rename to trader/gateway/ksotpGateway/ksotpGateway.py
diff --git a/vn.trader/gateway/ksotpGateway/ksotpmarketdataapi.dll b/trader/gateway/ksotpGateway/ksotpmarketdataapi.dll
similarity index 100%
rename from vn.trader/gateway/ksotpGateway/ksotpmarketdataapi.dll
rename to trader/gateway/ksotpGateway/ksotpmarketdataapi.dll
diff --git a/vn.trader/gateway/ksotpGateway/ksotptraderapi.dll b/trader/gateway/ksotpGateway/ksotptraderapi.dll
similarity index 100%
rename from vn.trader/gateway/ksotpGateway/ksotptraderapi.dll
rename to trader/gateway/ksotpGateway/ksotptraderapi.dll
diff --git a/vn.trader/gateway/ksotpGateway/lkcdll.dll b/trader/gateway/ksotpGateway/lkcdll.dll
similarity index 100%
rename from vn.trader/gateway/ksotpGateway/lkcdll.dll
rename to trader/gateway/ksotpGateway/lkcdll.dll
diff --git a/vn.trader/gateway/ksotpGateway/vnksotpmd.pyd b/trader/gateway/ksotpGateway/vnksotpmd.pyd
similarity index 100%
rename from vn.trader/gateway/ksotpGateway/vnksotpmd.pyd
rename to trader/gateway/ksotpGateway/vnksotpmd.pyd
diff --git a/vn.trader/gateway/ksotpGateway/vnksotptd.pyd b/trader/gateway/ksotpGateway/vnksotptd.pyd
similarity index 100%
rename from vn.trader/gateway/ksotpGateway/vnksotptd.pyd
rename to trader/gateway/ksotpGateway/vnksotptd.pyd
diff --git a/vn.trader/gateway/lhangGateway/LHANG_connect.json b/trader/gateway/lhangGateway/LHANG_connect.json
similarity index 100%
rename from vn.trader/gateway/lhangGateway/LHANG_connect.json
rename to trader/gateway/lhangGateway/LHANG_connect.json
diff --git a/vn.trader/gateway/lhangGateway/__init__.py b/trader/gateway/lhangGateway/__init__.py
similarity index 100%
rename from vn.trader/gateway/lhangGateway/__init__.py
rename to trader/gateway/lhangGateway/__init__.py
diff --git a/vn.trader/gateway/lhangGateway/lhangGateway.py b/trader/gateway/lhangGateway/lhangGateway.py
similarity index 100%
rename from vn.trader/gateway/lhangGateway/lhangGateway.py
rename to trader/gateway/lhangGateway/lhangGateway.py
diff --git a/vn.trader/gateway/lhangGateway/vnlhang.py b/trader/gateway/lhangGateway/vnlhang.py
similarity index 100%
rename from vn.trader/gateway/lhangGateway/vnlhang.py
rename to trader/gateway/lhangGateway/vnlhang.py
diff --git a/vn.trader/gateway/ltsGateway/LTS_connect.json b/trader/gateway/ltsGateway/LTS_connect.json
similarity index 100%
rename from vn.trader/gateway/ltsGateway/LTS_connect.json
rename to trader/gateway/ltsGateway/LTS_connect.json
diff --git a/vn.trader/gateway/ltsGateway/__init__.py b/trader/gateway/ltsGateway/__init__.py
similarity index 100%
rename from vn.trader/gateway/ltsGateway/__init__.py
rename to trader/gateway/ltsGateway/__init__.py
diff --git a/vn.trader/gateway/ltsGateway/ltsDataType.py b/trader/gateway/ltsGateway/ltsDataType.py
similarity index 100%
rename from vn.trader/gateway/ltsGateway/ltsDataType.py
rename to trader/gateway/ltsGateway/ltsDataType.py
diff --git a/vn.trader/gateway/ltsGateway/ltsGateway.py b/trader/gateway/ltsGateway/ltsGateway.py
similarity index 100%
rename from vn.trader/gateway/ltsGateway/ltsGateway.py
rename to trader/gateway/ltsGateway/ltsGateway.py
diff --git a/vn.trader/gateway/ltsGateway/securitymduserapi.dll b/trader/gateway/ltsGateway/securitymduserapi.dll
similarity index 100%
rename from vn.trader/gateway/ltsGateway/securitymduserapi.dll
rename to trader/gateway/ltsGateway/securitymduserapi.dll
diff --git a/vn.trader/gateway/ltsGateway/securityqueryapi.dll b/trader/gateway/ltsGateway/securityqueryapi.dll
similarity index 100%
rename from vn.trader/gateway/ltsGateway/securityqueryapi.dll
rename to trader/gateway/ltsGateway/securityqueryapi.dll
diff --git a/vn.trader/gateway/ltsGateway/securitytraderapi.dll b/trader/gateway/ltsGateway/securitytraderapi.dll
similarity index 100%
rename from vn.trader/gateway/ltsGateway/securitytraderapi.dll
rename to trader/gateway/ltsGateway/securitytraderapi.dll
diff --git a/vn.trader/gateway/ltsGateway/vnltsmd.pyd b/trader/gateway/ltsGateway/vnltsmd.pyd
similarity index 100%
rename from vn.trader/gateway/ltsGateway/vnltsmd.pyd
rename to trader/gateway/ltsGateway/vnltsmd.pyd
diff --git a/vn.trader/gateway/ltsGateway/vnltsmd.so b/trader/gateway/ltsGateway/vnltsmd.so
similarity index 100%
rename from vn.trader/gateway/ltsGateway/vnltsmd.so
rename to trader/gateway/ltsGateway/vnltsmd.so
diff --git a/vn.trader/gateway/ltsGateway/vnltsqry.pyd b/trader/gateway/ltsGateway/vnltsqry.pyd
similarity index 100%
rename from vn.trader/gateway/ltsGateway/vnltsqry.pyd
rename to trader/gateway/ltsGateway/vnltsqry.pyd
diff --git a/vn.trader/gateway/ltsGateway/vnltsqry.so b/trader/gateway/ltsGateway/vnltsqry.so
similarity index 100%
rename from vn.trader/gateway/ltsGateway/vnltsqry.so
rename to trader/gateway/ltsGateway/vnltsqry.so
diff --git a/vn.trader/gateway/ltsGateway/vnltstd.pyd b/trader/gateway/ltsGateway/vnltstd.pyd
similarity index 100%
rename from vn.trader/gateway/ltsGateway/vnltstd.pyd
rename to trader/gateway/ltsGateway/vnltstd.pyd
diff --git a/vn.trader/gateway/ltsGateway/vnltstd.so b/trader/gateway/ltsGateway/vnltstd.so
similarity index 100%
rename from vn.trader/gateway/ltsGateway/vnltstd.so
rename to trader/gateway/ltsGateway/vnltstd.so
diff --git a/vn.trader/gateway/oandaGateway/OANDA_connect.json b/trader/gateway/oandaGateway/OANDA_connect.json
similarity index 100%
rename from vn.trader/gateway/oandaGateway/OANDA_connect.json
rename to trader/gateway/oandaGateway/OANDA_connect.json
diff --git a/vn.trader/gateway/oandaGateway/__init__.py b/trader/gateway/oandaGateway/__init__.py
similarity index 100%
rename from vn.trader/gateway/oandaGateway/__init__.py
rename to trader/gateway/oandaGateway/__init__.py
diff --git a/vn.trader/gateway/oandaGateway/oandaGateway.py b/trader/gateway/oandaGateway/oandaGateway.py
similarity index 100%
rename from vn.trader/gateway/oandaGateway/oandaGateway.py
rename to trader/gateway/oandaGateway/oandaGateway.py
diff --git a/vn.trader/gateway/oandaGateway/vnoanda.py b/trader/gateway/oandaGateway/vnoanda.py
similarity index 100%
rename from vn.trader/gateway/oandaGateway/vnoanda.py
rename to trader/gateway/oandaGateway/vnoanda.py
diff --git a/vn.trader/gateway/okcoinGateway/OKCOIN_connect.json b/trader/gateway/okcoinGateway/OKCOIN_connect.json
similarity index 100%
rename from vn.trader/gateway/okcoinGateway/OKCOIN_connect.json
rename to trader/gateway/okcoinGateway/OKCOIN_connect.json
diff --git a/vn.trader/gateway/okcoinGateway/__init__.py b/trader/gateway/okcoinGateway/__init__.py
similarity index 100%
rename from vn.trader/gateway/okcoinGateway/__init__.py
rename to trader/gateway/okcoinGateway/__init__.py
diff --git a/vn.trader/gateway/okcoinGateway/okcoinGateway.py b/trader/gateway/okcoinGateway/okcoinGateway.py
similarity index 100%
rename from vn.trader/gateway/okcoinGateway/okcoinGateway.py
rename to trader/gateway/okcoinGateway/okcoinGateway.py
diff --git a/vn.trader/gateway/okcoinGateway/vnokcoin.py b/trader/gateway/okcoinGateway/vnokcoin.py
similarity index 100%
rename from vn.trader/gateway/okcoinGateway/vnokcoin.py
rename to trader/gateway/okcoinGateway/vnokcoin.py
diff --git a/vn.trader/gateway/qdpGateway/QDP_connect.json b/trader/gateway/qdpGateway/QDP_connect.json
similarity index 100%
rename from vn.trader/gateway/qdpGateway/QDP_connect.json
rename to trader/gateway/qdpGateway/QDP_connect.json
diff --git a/vn.trader/gateway/qdpGateway/__init__.py b/trader/gateway/qdpGateway/__init__.py
similarity index 100%
rename from vn.trader/gateway/qdpGateway/__init__.py
rename to trader/gateway/qdpGateway/__init__.py
diff --git a/vn.trader/gateway/qdpGateway/qdpDataType.py b/trader/gateway/qdpGateway/qdpDataType.py
similarity index 100%
rename from vn.trader/gateway/qdpGateway/qdpDataType.py
rename to trader/gateway/qdpGateway/qdpDataType.py
diff --git a/vn.trader/gateway/qdpGateway/qdpGateway.py b/trader/gateway/qdpGateway/qdpGateway.py
similarity index 100%
rename from vn.trader/gateway/qdpGateway/qdpGateway.py
rename to trader/gateway/qdpGateway/qdpGateway.py
diff --git a/vn.trader/gateway/qdpGateway/qdpmdapi.dll b/trader/gateway/qdpGateway/qdpmdapi.dll
similarity index 100%
rename from vn.trader/gateway/qdpGateway/qdpmdapi.dll
rename to trader/gateway/qdpGateway/qdpmdapi.dll
diff --git a/vn.trader/gateway/qdpGateway/qdptraderapi.dll b/trader/gateway/qdpGateway/qdptraderapi.dll
similarity index 100%
rename from vn.trader/gateway/qdpGateway/qdptraderapi.dll
rename to trader/gateway/qdpGateway/qdptraderapi.dll
diff --git a/vn.trader/gateway/qdpGateway/vnqdpmd.pyd b/trader/gateway/qdpGateway/vnqdpmd.pyd
similarity index 100%
rename from vn.trader/gateway/qdpGateway/vnqdpmd.pyd
rename to trader/gateway/qdpGateway/vnqdpmd.pyd
diff --git a/vn.trader/gateway/qdpGateway/vnqdptd.pyd b/trader/gateway/qdpGateway/vnqdptd.pyd
similarity index 100%
rename from vn.trader/gateway/qdpGateway/vnqdptd.pyd
rename to trader/gateway/qdpGateway/vnqdptd.pyd
diff --git a/vn.trader/gateway/sgitGateway/SGIT_connect.json b/trader/gateway/sgitGateway/SGIT_connect.json
similarity index 100%
rename from vn.trader/gateway/sgitGateway/SGIT_connect.json
rename to trader/gateway/sgitGateway/SGIT_connect.json
diff --git a/vn.trader/gateway/sgitGateway/__init__.py b/trader/gateway/sgitGateway/__init__.py
similarity index 100%
rename from vn.trader/gateway/sgitGateway/__init__.py
rename to trader/gateway/sgitGateway/__init__.py
diff --git a/vn.trader/gateway/sgitGateway/sgitDataType.py b/trader/gateway/sgitGateway/sgitDataType.py
similarity index 100%
rename from vn.trader/gateway/sgitGateway/sgitDataType.py
rename to trader/gateway/sgitGateway/sgitDataType.py
diff --git a/vn.trader/gateway/sgitGateway/sgitGateway.py b/trader/gateway/sgitGateway/sgitGateway.py
similarity index 100%
rename from vn.trader/gateway/sgitGateway/sgitGateway.py
rename to trader/gateway/sgitGateway/sgitGateway.py
diff --git a/vn.trader/gateway/sgitGateway/sgitquotapi.dll b/trader/gateway/sgitGateway/sgitquotapi.dll
similarity index 100%
rename from vn.trader/gateway/sgitGateway/sgitquotapi.dll
rename to trader/gateway/sgitGateway/sgitquotapi.dll
diff --git a/vn.trader/gateway/sgitGateway/sgittradeapi.dll b/trader/gateway/sgitGateway/sgittradeapi.dll
similarity index 100%
rename from vn.trader/gateway/sgitGateway/sgittradeapi.dll
rename to trader/gateway/sgitGateway/sgittradeapi.dll
diff --git a/vn.trader/gateway/sgitGateway/vnsgitmd.pyd b/trader/gateway/sgitGateway/vnsgitmd.pyd
similarity index 100%
rename from vn.trader/gateway/sgitGateway/vnsgitmd.pyd
rename to trader/gateway/sgitGateway/vnsgitmd.pyd
diff --git a/vn.trader/gateway/sgitGateway/vnsgittd.pyd b/trader/gateway/sgitGateway/vnsgittd.pyd
similarity index 100%
rename from vn.trader/gateway/sgitGateway/vnsgittd.pyd
rename to trader/gateway/sgitGateway/vnsgittd.pyd
diff --git a/vn.trader/gateway/shzdGateway/SHZD_connect.json b/trader/gateway/shzdGateway/SHZD_connect.json
similarity index 100%
rename from vn.trader/gateway/shzdGateway/SHZD_connect.json
rename to trader/gateway/shzdGateway/SHZD_connect.json
diff --git a/vn.trader/gateway/shzdGateway/ShZdTradeLib.dll b/trader/gateway/shzdGateway/ShZdTradeLib.dll
similarity index 100%
rename from vn.trader/gateway/shzdGateway/ShZdTradeLib.dll
rename to trader/gateway/shzdGateway/ShZdTradeLib.dll
diff --git a/vn.trader/gateway/shzdGateway/__init__.py b/trader/gateway/shzdGateway/__init__.py
similarity index 100%
rename from vn.trader/gateway/shzdGateway/__init__.py
rename to trader/gateway/shzdGateway/__init__.py
diff --git a/vn.trader/gateway/shzdGateway/shzdGateway.py b/trader/gateway/shzdGateway/shzdGateway.py
similarity index 100%
rename from vn.trader/gateway/shzdGateway/shzdGateway.py
rename to trader/gateway/shzdGateway/shzdGateway.py
diff --git a/vn.trader/gateway/shzdGateway/vnshzd.pyd b/trader/gateway/shzdGateway/vnshzd.pyd
similarity index 100%
rename from vn.trader/gateway/shzdGateway/vnshzd.pyd
rename to trader/gateway/shzdGateway/vnshzd.pyd
diff --git a/vn.trader/gateway/windGateway/__init__.py b/trader/gateway/windGateway/__init__.py
similarity index 100%
rename from vn.trader/gateway/windGateway/__init__.py
rename to trader/gateway/windGateway/__init__.py
diff --git a/vn.trader/gateway/windGateway/windGateway.py b/trader/gateway/windGateway/windGateway.py
similarity index 100%
rename from vn.trader/gateway/windGateway/windGateway.py
rename to trader/gateway/windGateway/windGateway.py
diff --git a/vn.trader/gateway/xspeedGateway/DFITCMdApi.dll b/trader/gateway/xspeedGateway/DFITCMdApi.dll
similarity index 100%
rename from vn.trader/gateway/xspeedGateway/DFITCMdApi.dll
rename to trader/gateway/xspeedGateway/DFITCMdApi.dll
diff --git a/vn.trader/gateway/xspeedGateway/DFITCTraderApi.dll b/trader/gateway/xspeedGateway/DFITCTraderApi.dll
similarity index 100%
rename from vn.trader/gateway/xspeedGateway/DFITCTraderApi.dll
rename to trader/gateway/xspeedGateway/DFITCTraderApi.dll
diff --git a/vn.trader/gateway/xspeedGateway/XSPEED_connect.json b/trader/gateway/xspeedGateway/XSPEED_connect.json
similarity index 100%
rename from vn.trader/gateway/xspeedGateway/XSPEED_connect.json
rename to trader/gateway/xspeedGateway/XSPEED_connect.json
diff --git a/vn.trader/gateway/xspeedGateway/__init__.py b/trader/gateway/xspeedGateway/__init__.py
similarity index 100%
rename from vn.trader/gateway/xspeedGateway/__init__.py
rename to trader/gateway/xspeedGateway/__init__.py
diff --git a/vn.trader/gateway/xspeedGateway/vnxspeedmd.pyd b/trader/gateway/xspeedGateway/vnxspeedmd.pyd
similarity index 100%
rename from vn.trader/gateway/xspeedGateway/vnxspeedmd.pyd
rename to trader/gateway/xspeedGateway/vnxspeedmd.pyd
diff --git a/vn.trader/gateway/xspeedGateway/vnxspeedtd.pyd b/trader/gateway/xspeedGateway/vnxspeedtd.pyd
similarity index 100%
rename from vn.trader/gateway/xspeedGateway/vnxspeedtd.pyd
rename to trader/gateway/xspeedGateway/vnxspeedtd.pyd
diff --git a/vn.trader/gateway/xspeedGateway/xspeedDataType.py b/trader/gateway/xspeedGateway/xspeedDataType.py
similarity index 100%
rename from vn.trader/gateway/xspeedGateway/xspeedDataType.py
rename to trader/gateway/xspeedGateway/xspeedDataType.py
diff --git a/vn.trader/gateway/xspeedGateway/xspeedGateway.py b/trader/gateway/xspeedGateway/xspeedGateway.py
similarity index 100%
rename from vn.trader/gateway/xspeedGateway/xspeedGateway.py
rename to trader/gateway/xspeedGateway/xspeedGateway.py
diff --git a/vn.trader/language/__init__.py b/trader/language/__init__.py
similarity index 100%
rename from vn.trader/language/__init__.py
rename to trader/language/__init__.py
diff --git a/trader/language/chinese/__init__.py b/trader/language/chinese/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/vn.trader/language/chinese/constant.py b/trader/language/chinese/constant.py
similarity index 100%
rename from vn.trader/language/chinese/constant.py
rename to trader/language/chinese/constant.py
diff --git a/vn.trader/language/chinese/text.py b/trader/language/chinese/text.py
similarity index 100%
rename from vn.trader/language/chinese/text.py
rename to trader/language/chinese/text.py
diff --git a/trader/language/english/__init__.py b/trader/language/english/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/vn.trader/language/english/constant.py b/trader/language/english/constant.py
similarity index 100%
rename from vn.trader/language/english/constant.py
rename to trader/language/english/constant.py
diff --git a/vn.trader/language/english/text.py b/trader/language/english/text.py
similarity index 100%
rename from vn.trader/language/english/text.py
rename to trader/language/english/text.py
diff --git a/trader/logs/README.md b/trader/logs/README.md
new file mode 100644
index 00000000..8ae091c4
--- /dev/null
+++ b/trader/logs/README.md
@@ -0,0 +1 @@
+存放运行日志
\ No newline at end of file
diff --git a/vn.trader/noUiMain.py b/trader/noUiMain.py
similarity index 96%
rename from vn.trader/noUiMain.py
rename to trader/noUiMain.py
index da8111e5..b818dc5a 100644
--- a/vn.trader/noUiMain.py
+++ b/trader/noUiMain.py
@@ -2,18 +2,10 @@
 
 
 import os
-import sys
-import ctypes
-from datetime import datetime, timedelta, date
-from time import sleep
 
-from eventType import *
-from vtEngine import MainEngine
-from ctaStrategy.strategy import STRATEGY_CLASS
-from threading import Thread
-
-from simple_monitor import *
 from setup_logger import setup_logger
+from simple_monitor import *
+from vtEngine import MainEngine
 
 setup_logger(debug=True)
 # ----------------------------------------------------------------------
diff --git a/vn.trader/orders/README.md b/trader/orders/README.md
similarity index 100%
rename from vn.trader/orders/README.md
rename to trader/orders/README.md
diff --git a/vn.trader/setup_logger.py b/trader/setup_logger.py
similarity index 100%
rename from vn.trader/setup_logger.py
rename to trader/setup_logger.py
diff --git a/vn.trader/simple_monitor.py b/trader/simple_monitor.py
similarity index 100%
rename from vn.trader/simple_monitor.py
rename to trader/simple_monitor.py
diff --git a/vn.trader/uiBasicWidget.py b/trader/uiBasicWidget.py
similarity index 100%
rename from vn.trader/uiBasicWidget.py
rename to trader/uiBasicWidget.py
diff --git a/vn.trader/uiMainWindow.py b/trader/uiMainWindow.py
similarity index 98%
rename from vn.trader/uiMainWindow.py
rename to trader/uiMainWindow.py
index bb662ce9..46cbb201 100644
--- a/vn.trader/uiMainWindow.py
+++ b/trader/uiMainWindow.py
@@ -1,15 +1,14 @@
 # encoding: UTF-8
 
+# from uiFullMonitorWidget import MonitorWidget
+# from uiKChartWidget import CandleForm
+
 import psutil
 
+from trader.app.ctaStrategy.uiCtaWidget import CtaEngineManager
+from trader.app.dataRecorder.uiDrWidget import DrEngineManager
+from trader.app.riskManager.uiRmWidget import RmEngineManager
 from uiBasicWidget import *
-from ctaStrategy.uiCtaWidget import CtaEngineManager
-from dataRecorder.uiDrWidget import DrEngineManager
-from riskManager.uiRmWidget import RmEngineManager
-#from uiFullMonitorWidget import MonitorWidget
-#from uiKChartWidget import CandleForm
-
-import os
 
 ########################################################################
 class MainWindow(QtGui.QMainWindow):
diff --git a/vn.trader/utilSinaClient.py b/trader/utilSinaClient.py
similarity index 99%
rename from vn.trader/utilSinaClient.py
rename to trader/utilSinaClient.py
index 8b92de2d..d9e609fa 100644
--- a/vn.trader/utilSinaClient.py
+++ b/trader/utilSinaClient.py
@@ -4,10 +4,9 @@ from __future__ import print_function
 
 '''一个简单的SINA数据客户端，主要使用requests开发'''
 import requests
-from time import sleep
 import execjs
 from datetime import datetime, timedelta
-from ctaStrategy.ctaBase import CtaBarData, CtaTickData
+from trader.app.ctaStrategy.ctaBase import CtaBarData, CtaTickData
 
 class UtilSinaClient(object):
 
diff --git a/vn.trader/vnpy.ico b/trader/vnpy.ico
similarity index 100%
rename from vn.trader/vnpy.ico
rename to trader/vnpy.ico
diff --git a/vn.trader/vtClient.py b/trader/vtClient.py
similarity index 97%
rename from vn.trader/vtClient.py
rename to trader/vtClient.py
index d5c38cfa..597af65e 100644
--- a/vn.trader/vtClient.py
+++ b/trader/vtClient.py
@@ -1,21 +1,15 @@
 # encoding: utf-8
 
-import sys
-import os
 import ctypes
 import platform
+import sys
 
-import vtPath
-from uiMainWindow import *
-
-from eventEngine import *
 from vnrpc import RpcClient
 
-from ctaStrategy.ctaEngine import CtaEngine
-from dataRecorder.drEngine import DrEngine
-from riskManager.rmEngine import RmEngine
-
-
+from trader.app.ctaStrategy.ctaEngine import CtaEngine
+from trader.app.dataRecorder.drEngine import DrEngine
+from trader.app.riskManager.rmEngine import RmEngine
+from uiMainWindow import *
 
 # 文件路径名
 path = os.path.abspath(os.path.dirname(__file__))    
diff --git a/vn.trader/vtConstant.py b/trader/vtConstant.py
similarity index 100%
rename from vn.trader/vtConstant.py
rename to trader/vtConstant.py
diff --git a/vn.trader/vtEngine.py b/trader/vtEngine.py
similarity index 98%
rename from vn.trader/vtEngine.py
rename to trader/vtEngine.py
index 1832f768..ad713c37 100644
--- a/vn.trader/vtEngine.py
+++ b/trader/vtEngine.py
@@ -2,22 +2,18 @@
 
 import shelve
 from collections import OrderedDict
-from datetime import datetime
 
 from pymongo import MongoClient
 from pymongo.errors import ConnectionFailure
 
-from eventEngine import *
-from vtGateway import *
-from vtFunction import loadMongoSetting
-from language import text
-
 from gateway import GATEWAY_DICT
-from ctaStrategy.ctaEngine import CtaEngine
-from dataRecorder.drEngine import DrEngine
-from riskManager.rmEngine import RmEngine
+from language import text
+from trader.app.ctaStrategy.ctaEngine import CtaEngine
+from trader.app.dataRecorder.drEngine import DrEngine
+from trader.app.riskManager.rmEngine import RmEngine
+from vtFunction import loadMongoSetting
+from vtGateway import *
 
-import logging
 
 ########################################################################
 class MainEngine(object):
diff --git a/vn.trader/vtFunction.py b/trader/vtFunction.py
similarity index 100%
rename from vn.trader/vtFunction.py
rename to trader/vtFunction.py
diff --git a/vn.trader/vtGateway.py b/trader/vtGateway.py
similarity index 100%
rename from vn.trader/vtGateway.py
rename to trader/vtGateway.py
diff --git a/vn.trader/vtMain.py b/trader/vtMain.py
similarity index 100%
rename from vn.trader/vtMain.py
rename to trader/vtMain.py
diff --git a/vn.trader/vtPath.py b/trader/vtPath.py
similarity index 100%
rename from vn.trader/vtPath.py
rename to trader/vtPath.py
diff --git a/vn.trader/vtServer.py b/trader/vtServer.py
similarity index 100%
rename from vn.trader/vtServer.py
rename to trader/vtServer.py
diff --git a/vn.trader/vtText.py b/trader/vtText.py
similarity index 100%
rename from vn.trader/vtText.py
rename to trader/vtText.py