Made a variable to hold the cc files that will be converted to object files during compilation.  This allows the ability to conditionally add files given certain CMake or configure flags. Secretly I just wanted to touch a bunch of files.
Fixed include paths that were missed when moving files to the old directories.