Restructuring of module.