CS fix: Added newlines before end of file.
Renamed modules.
Merge branch 'master' into master-routine
Event manager configuration.