Separate runner from the main file. Add by class grouping