Moved EVA Module add and events to new file