EventStore and Storage separated, renamed, breaking