Survey: Renamed Survey to Survey2D
Survey: Fixed imports broken by last commit
Survey: Make survey3D similar to Survey2D