Organizational Changes

Make changes in the organization of the program.