TreeGrid and TreeDataProvider - migration from Vaadin 7 to Vaadin 8 (or 10)

Flow
1

In my Vaadin 7 Application I have:

public TreeTable initBaseStructureTable() {
		final TreeTable baseStructure = new TreeTable();
		baseStructure.setSizeFull();
		baseStructure.setSelectable(true);

		HierarchicalContainerOrderedWrapper hc = createHierarchicalContainer();
		baseStructure.setContainerDataSource(hc);
		populateWithHierarchicalData(baseStructure);
		baseStructure.setColumnReorderingAllowed(true);
		baseStructure.setColumnCollapsingAllowed(true);
		baseStructure.setColumnCollapsed(propertyId1, false);
		baseStructure.setColumnCollapsed(propertyId2, false);
		baseStructure.setColumnCollapsed(propertyId3, true);
		baseStructure.setColumnCollapsed(proportyId4, true);

		return baseStructure;
	}


	private HierarchicalContainerOrderedWrapper createHierarchicalContainer() {
		ContainerHierarchicalWrapper containerHierarchicalWrapper = new ContainerHierarchicalWrapper(
				new IndexedContainer());
		HierarchicalContainerOrderedWrapper hc = new HierarchicalContainerOrderedWrapper(containerHierarchicalWrapper);
		hc.addContainerProperty(propertyId1, String.class, "");
		hc.addContainerProperty(propertyId2, String.class, "");
		hc.addContainerProperty(propertyId3, String.class, "");
		hc.addContainerProperty(propertyId4, String.class, "");
		hc.addContainerProperty(propertyId5, Integer.class, "");
		hc.addContainerProperty(propertyId6, String.class, "");
		hc.addContainerProperty(propertyId7, Integer.class, "");

		return hc;
	}

What can I use in Vaadin 8 or Vaadin 10? Do I think that I will have to replace TreeTable on TreeGrid and new ContainerHierarchicalWrapper (new IndexedContainer ()) on TreeDataProvider