Refactoring pathes