Refactor advert, football, and story modules