#317 Reordered CMake Options to use a better layout