final commit that preserves old structure alongside revised structure, revision imminent