He and his colleagues, senior software engineers Paul Janson and Pepijn Kramer, are, in cooperation with TNO-ESI, using Model Driven Engineering (MDE) tools to restructure legacy code. Together they have used MDE tooling to analyze and successfully restructure 30,000 lines of code. They modularized the software design by introducing interfaces between internal components, separating the algorithms from the infrastructure introduced interfaces, and added a test harness. Because of these good results, Andrei and his team are currently scaling up these techniques to the over 3 million lines of source code. They are simplifying the interface design, disentangling wrong dependencies that have occurred over time and reducing the design complexity.