Make components more modular.