Some module layout files corrections