add survey associations
clean-up/re-organize routes