SFM: Renamed nearest neighbor files
SFM: New bundler features, almost working!