Further restructuring of modules