Split NormalizedTrading and TradingAdapter