Moved all questionnaire and report stuff into diagnosis folder, code clean up and refactoring