Refactoring
Path concept pulled up