Updated the structure of the program.