Fixed building with CMake.

Commented out some unused variables to silence -Werror. Updated
CMakeLists.txt to reflect source file hierarchy changes.