Refactor, moving DS file