Updating CMake files

Updating CMake files to better organize the Visual Studio projects.