Layout/Structure split code has been updated with all updates from main branch. Integration is apparently functional.