A case study in re-engineering to enforce architectural control flow and data sharing