Restructured classes