Layout change, restructuring the includes