moving stuff here and fixing the predicate munchars
adding some unit tests
moving these files