Fixed module layout after move