Reorganized external configuration classes