Change data order and migrate sections to includes