Stateful Strategies handled. Strategies moved to strategy namespace. Members moved to separate struct.