Added new module layout