Fix layout options
Combine XCB-Util cmake modules into single module with components
Remove LibFindMacros
Move cmake/Modules/ -> cmake/