Restructuring for modules