structural changes in preparation for 3.2 vote

Changes based on DDISchemaCheck
https://github.com/DanSmith/DDISchemaCheck