Refactor: Move Questionnaire to activities package