Reorganize tables by EventId