reorganize Data + nbs