[Change] Move event state class to separate folder