Move predicates into html sub-modules