Made strategies reusable
changed filename for xstream

Signed-off-by: Jens <Jens@FPT>