Shared code refactor - minor path amendments
2 files changed