KRACOEUS-6955 : common questionnaire 1

just moved some questionnaire classes around. It's not a big one:)