GM: restructuring of modules