move questionnaire to other class