Restructured classes.