Break out into more modular structure.