rename/move classes
rename matchers in JFind to follow AX.with()..