Create separate classes for data display
Rename DataDisplay to DataSources
Add referrers
Merge branch 'refs/heads/refactor'