Modularizing, restructuring components