updates to code structure related to PR-862