Updated FaceAPI lib organization