Reorganized builder classes.