Mv test dir

Move compilation of gtest libs to before call to cmake;  Cmake call now builds both source and test.  Accommodate moved directories.