Move all DataSource related of of the things to core
Merge pull request #72 from anchor/wip-move-data-source-to-core

Move all DataSource related of of the things to core