I discussed yesterday with @GregSutcliffe and decided simply changing the modules path would be easier. Would it be better to just merge the first 3 commits and making a local modules directory available in a later PR?