Move bonus questions to separate file