Moving the SurveyData class to a new package
Fixing some broken references