Files inside agil-data>stream are in correct paths right now and mixed, this should be moved. But also this files should be re-done depending on the TODO based of the Selectors