update Makefile.orig for builds of libgtest, and moved files