Reorg'd. Added CMake build-scripts for lib, test.