Added structure to the layout modules