NextWave re-organizes business