Moved data downloading to a service
Cleaned up content provider