Questionaire event added

small changes to other files and structure of the application