Closer alignment between international and UK data structures

Technical
5

As requested by some, I’ve created a separate thread US and UK Alignment and version control for work just starting in this area.