Add overridable move filename method and refactor previous commit