Reorganized everything under SurveyController with longer lasting persistence