Mv test dir

- Accommodate change in directory structure
- Higher level CMakeLists builds both source and test
- Move gtest library build to earlier in build script