Merge branch 'craigtracey-incremental'
Addressing some import locations

There were 2 imports that were requested to be moved in a previous PR.
Updating these files to match those requests.