Move templates into indifivual files
Add support for Top Five extension
Fix tests for new events