Renamed files.
Renamed survey to clv_survey.
Inclusion of module clv_base.
Merge branch '7.0-survey' into 7.0