Visual Studio 2017 and Path Variable Overrides

We are in the process of upgrading from VS 2013 to VS 2017. In VS 2013 the file structure on our Build Agent is:
D:\Builds\n\ReleaseName (where n=1-4 on Build Agent 1). Under that are 2 folders:
bin <-- files got built to here
src
I used Path Variable Overrides to resolve the folder structure difference between my development machine and the Build Agent

On the VS 2017 Build agent the folder structure is:
D:\Builds\1. Under that are:
--- a (artifacts)
--- b (binaries)
--- s (source)
------ Project Folders
------ bin
------ obj
------ etc

How have the rest of you handled this?
Do we just ditch the Path Variable Overrides?
Is there a way to make my 2017 Build Agent use a similar folder structure as VS 2013?

Thanks