2.3/feature psr streams

Better folder structure