smal fixes
WIP redesign some classes
done upgrading WsEvent
still upgrading all classes
still upgrading all classes
still upgrading all classes
Main rework done