Refactoring: use constant DS as directory separator