CMS-1793 Move events to the modules where they are fired from
Moved space events