Darwin: Tidy up Xcode project file and header naming

- Add missing header files to the project file and sort groups
- Align group names / paths better with the file system
- Consistently use "_Internal.h" for internal slice of a header (but only if the base header exists)

src/darwin/Framework/CHIP/MTRBaseClustersCpp_Internal.h → src/darwin/Framework/CHIP/MTRBaseClusterUtils.h

@@ -16,8 +16,8 @@
 #import <Foundation/Foundation.h>
 
 #import "MTRBaseDevice.h"
-#import "MTRCluster_internal.h"
-#import "zap-generated/MTRCallbackBridge_internal.h"
+#import "MTRCallbackBridge.h"
+#import "MTRCluster_Internal.h"
 
 #include <app/CommandSender.h>
 #include <app/ReadClient.h>

src/darwin/Framework/CHIP/MTRBaseDevice.mm

@@ -18,10 +18,10 @@
 #import "MTRAttributeTLVValueDecoder_Internal.h"
 #import "MTRBaseDevice_Internal.h"
 #import "MTRBaseSubscriptionCallback.h"
-#import "MTRCallbackBridgeBase_internal.h"
+#import "MTRCallbackBridgeBase.h"
 #import "MTRCluster.h"
 #import "MTRClusterStateCacheContainer_Internal.h"
-#import "MTRCluster_internal.h"
+#import "MTRCluster_Internal.h"
 #import "MTRError_Internal.h"
 #import "MTREventTLVValueDecoder_Internal.h"
 #import "MTRLogging_Internal.h"

src/darwin/Framework/CHIP/MTRCluster.mm

@@ -16,7 +16,7 @@
  */
 
 #import "MTRBaseDevice.h"
-#import "MTRCluster_internal.h"
+#import "MTRCluster_Internal.h"
 #import "NSDataSpanConversion.h"
 #import "NSStringSpanConversion.h"
 

src/darwin/Framework/CHIP/templates/MTRBaseClusters-src.zapt

@@ -2,15 +2,14 @@
 
 #import <Foundation/Foundation.h>
 
-#import "MTRClusterStateCacheContainer_Internal.h"
-#import "MTRBaseClusters_internal.h"
-#import "MTRBaseDevice.h"
+#import "MTRBaseClusters_Internal.h"
+#import "MTRBaseClusterUtils.h"
 #import "MTRBaseDevice_Internal.h"
-#import "MTRCallbackBridge_internal.h"
-#import "MTRCluster_internal.h"
-#import "MTRStructsObjc.h"
+#import "MTRCallbackBridge.h"
+#import "MTRCluster_Internal.h"
+#import "MTRClusterStateCacheContainer_Internal.h"
 #import "MTRCommandPayloadsObjc.h"
-#import "MTRBaseClustersCpp_Internal.h"
+#import "MTRStructsObjc.h"
 
 #include <lib/support/CHIPListUtils.h>
 #include <platform/CHIPDeviceLayer.h>

src/darwin/Framework/CHIP/templates/MTRCallbackBridge-src.zapt

@@ -1,6 +1,6 @@
 {{> header excludeZapComment=true}}
 
-#import "MTRCallbackBridge_internal.h"
+#import "MTRCallbackBridge.h"
 #import "MTRStructsObjc.h"
 #import "MTRCommandPayloadsObjc.h"
 

src/darwin/Framework/CHIP/templates/MTRCallbackBridge_internal.zapt → src/darwin/Framework/CHIP/templates/MTRCallbackBridge.zapt

@@ -1,7 +1,7 @@
 {{> header excludeZapComment=true}}
 
 #import <Foundation/Foundation.h>
-#import "MTRCallbackBridgeBase_internal.h"
+#import "MTRCallbackBridgeBase.h"
 
 #include <app/data-model/DecodableList.h>
 #include <app/util/im-client-callbacks.h>

src/darwin/Framework/CHIP/templates/MTRClusters-src.zapt

@@ -3,13 +3,12 @@
 #import <Foundation/Foundation.h>
 
 #import "MTRAsyncCallbackWorkQueue.h"
-#import "MTRBaseDevice_internal.h"
+#import "MTRBaseDevice_Internal.h"
 #import "MTRClusterConstants.h"
-#import "MTRClusters_internal.h"
-#import "MTRDevice.h"
+#import "MTRClusters_Internal.h"
 #import "MTRDevice_Internal.h"
-#import "MTRCallbackBridge_internal.h"
-#import "MTRCluster_internal.h"
+#import "MTRCallbackBridge.h"
+#import "MTRCluster_Internal.h"
 #import "MTRStructsObjc.h"
 #import "MTRCommandPayloadsObjc.h"
 #import "MTRLogging_Internal.h"

src/darwin/Framework/CHIP/templates/templates.json

@@ -48,19 +48,19 @@
  ],
  "templates": [
  {
- "path": "MTRCallbackBridge_internal.zapt",
- "name": "Objc MTRCallbackBridge Internal header",
- "output": "src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge_internal.h"
+ "path": "MTRCallbackBridge.zapt",
+ "name": "Objc MTRCallbackBridge header",
+ "output": "src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h"
  },
  {
  "path": "MTRCallbackBridge-src.zapt",
  "name": "Objc MTRCallbackBridge",
  "output": "src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm"
  },
  {
- "path": "MTRBaseClusters_internal.zapt",
+ "path": "MTRBaseClusters_Internal.zapt",
  "name": "Objc ZCL asynchronous API Internal Header",
- "output": "src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters_internal.h"
+ "output": "src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters_Internal.h"
  },
  {
  "path": "MTRBaseClusters.zapt",
@@ -73,9 +73,9 @@
  "output": "src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm"
  },
  {
- "path": "MTRClusters_internal.zapt",
+ "path": "MTRClusters_Internal.zapt",
  "name": "Objc ZCL synchronous API Internal Header",
- "output": "src/darwin/Framework/CHIP/zap-generated/MTRClusters_internal.h"
+ "output": "src/darwin/Framework/CHIP/zap-generated/MTRClusters_Internal.h"
  },
  {
  "path": "MTRClusters.zapt",