Use CMake to build the example, and provide glfw3 as prt of the build - simplifies running the tests.
Do a bit of reorg