moves classes into packages; adds TradeModelHandler