Require path resolver refactoring

@dchambers can you review please?