minor cleanup, move matchit to its own bundle dir