Organise models/badges/ into question type subfolders (e.g., questions)
Remove trailing whitespace Steph shouldn't have committed