nf10-newnic: some reorganization