Moved nfindr.formula to its own file
Moved nfindr.default to its own file
Moved vca.formula to its own file
Moved vca.default to its own file
Updated collate