Offload default directory handling to separate class