Rearanged Files, Converted to CMake