Refactoring: "local" and "remote" folders naming introduced