Organized facades, swapped illuminate facades for DI, structuring plugin system