[ros-diffs] [hbelusca] 61583: [NTVDM]: Start to organize the code...