changes TradeModelHandler to make methods and fields components of class; makes DescriptorFactory a singleton; renames descriptor package -> descriptors