Modules first scratches, now adding the layout