Reorganize data. Swap NKA and NCC.

@kdtarrant Reorganize data. Swap NKA and NCC.

Edited by kdtarrant