code reorg and nfdata impl
starting an analysis of perf issues