Migrating to a more modular design