Change data source hiearchy.
Clean up after PlainDataViewSource refactor.