Refactored structure; added basic supported data sources to test; updated todo