Refactor survey import to use OO