Redo event namespaces, put them into one, removed unused, dead code and comments
upped version