Fix:maps:CMake refactoring (wrap lines, more logical order)