NGCP reshuffle + utils + fixes