Initial modular structure commit