Change module layout and add context module.