Group Organisation Structure on Power BI

Hello there,

I'm trying to map out my organisation structure on BI. The reporting lines are all split by different levels, so I just start at the botom and do manual groupings. The issue I'm facing is as follows:

1st question

For example. Person 1, 2 and 3(layer/column 1) reports to Manager A. I group them together at layer 1. Manager A, B and C (layer/column 2) report to Director A.  I group them together at layer 2. All 3 managers report to a director and that forms the HR department. So I can combine all at layer 2 and get everyone in HR, except the director as that's layer 3. How would I include the director?

2nd question

At layer 3, there is director A and B. In the data, they report to the same VP. but in reality, I want to map director B and all her reportees into VP 2 instead. How would I do that?

Thanks!