Modified the organization of the classes.