early phase of converting to more modular architecture