Restructured builder classes and modules