Make restructured NDFD the normal config.

Remove testing config.