Move to another file EventsWeaverCreator