Reorganized program structure