Adding JSON files to CMakeLists.txt.  Also, fixing subdirectories in CMakeLists so that our #include statements don't need to be stupid.