Add DataStream Selection
Move public folder