package refactor
content provider fixes