#46 JSON Re-Structure

Survey JSON is now properly parsed to match the JSON received from the
server