Updated package description and file list
Refactoring of PredicateProvider