Further conversion to modular structure.