Restructured the layout files.