Clean up CMake Files *DO NOT MERGE YET*

Cleaning up CMake files.
Don't merge yet, just comment.

I need to rebase first.