How to Evolve Software for Minimum Disruptions: The Architect's Two Hats