Renamed classes to remove "TradeStrategy" (redundant).  Changing
BasicExpression to prep for persistence.