Update to new class path
Merge in refactor-path