Moved matchit into bundle, and some more cleanup