Restructured classes, base/target role.