Move return, throw and expression matchers to simple.js
move not, and, or matchers to logic.js
Split matcher
Move call matcher to call.js