Refactoring from -web to -core, for forthcoming new NSF exporter