Start to convert to modern Xcode
More modernization