Exposing some options to CMake GUI, moving stuff around