Fixed path references after refactoring.