More explicit organization of classes.