Move the predicates to a "predicates" package, to simplify the structure. This is purely mechanical change. Better documentation for the package will come next, as well as a few other changes.