Add one file per question, remove useless