Modularized the engine.