Restructured the layout and includes.