Tidy up the promotions config and move the 'results' classes into their own files.