Cleanup detached handler in more-data-source.
Reorganize more-data into multiple files.
Add conflicting providers to demo.html