Refactor face/faceHD to 2d/3d