Restructure
Added EventStream classifiers