Add mutable-match-lambda and reorganize