TOOLS-222 move code to correct subpath within repo
tools-222 update test configs to use new code path