Tidy up some parts of the codebase.
Put data source to its own package.
Prepare project for multiple packages.