That would be my understanding, but as I am not a qualified electrician, I was hoping someone could confirm it.
At the end of the day, I want the job done properly, but if moving the circuits requires a significant re-wire due to 17th ed physical protection changes, then it wont happen as we...