Removing Components, redesigning architecture for composition rather than hierarchies