Fixing build; moving predicates to subfolder to allow for reslover examples