moved Comparison, Var, Predicate, and Script to Merchandise.Types.Script