My first suggestion would be to work hard on the physical layer and then apply any political changes on separate layers. Isolate what doesn't change so you don't have to do it over again.