diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/project.pbxproj
index f73ca69..3b3dfd4 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/project.pbxproj
@@ -10,11 +10,7 @@
 		E6AF49472511224F00000000 /* TodayViewController.m in ExtSources */ = {isa = PBXBuildFile; fileRef = 43D68C282511224F00000000 /* TodayViewController.m */; };
 		E6AF49473C553F8E00000000 /* main.m in src */ = {isa = PBXBuildFile; fileRef = 43D68C283C553F8E00000000 /* main.m */; };
 		E6AF49473C553F8E00000001 /* main.m in src */ = {isa = PBXBuildFile; fileRef = 43D68C283C553F8E00000000 /* main.m */; };
-		E6AF49473E03F31400000000 /* MyTodayExtension_entitlements.entitlements.c in tulsi_e2e_mac */ = {isa = PBXBuildFile; fileRef = 43D68C283E03F31400000000 /* MyTodayExtension_entitlements.entitlements.c */; };
 		E6AF494759FC82CA00000000 /* AppDelegate.m in src */ = {isa = PBXBuildFile; fileRef = 43D68C2859FC82CA00000000 /* AppDelegate.m */; };
-		E6AF4947B0DFE81200000000 /* MyCommandLineApp.merged_infoplist.infoplist_section.c in tulsi_e2e_mac */ = {isa = PBXBuildFile; fileRef = 43D68C28B0DFE81200000000 /* MyCommandLineApp.merged_infoplist.infoplist_section.c */; };
-		E6AF4947E3C31EC800000000 /* MyCommandLineApp_entitlements.entitlements.c in tulsi_e2e_mac */ = {isa = PBXBuildFile; fileRef = 43D68C28E3C31EC800000000 /* MyCommandLineApp_entitlements.entitlements.c */; };
-		E6AF4947F52B2FF400000000 /* MyMacOSApp_entitlements.entitlements.c in tulsi_e2e_mac */ = {isa = PBXBuildFile; fileRef = 43D68C28F52B2FF400000000 /* MyMacOSApp_entitlements.entitlements.c */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -33,20 +29,16 @@
 		43D68C2834A5AC2900000000 /* TodayViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = TodayViewController.xib; path = "tulsi-workspace/tulsi_e2e_mac/Resources/extensions/today/TodayViewController.xib"; sourceTree = "<group>"; };
 		43D68C283646FFE900000000 /* MyTodayExtension-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; name = "MyTodayExtension-Info.plist"; path = "tulsi-workspace/tulsi_e2e_mac/MyTodayExtension-Info.plist"; sourceTree = "<group>"; };
 		43D68C283C553F8E00000000 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = main.m; path = "tulsi-workspace/tulsi_e2e_mac/src/main.m"; sourceTree = "<group>"; };
-		43D68C283E03F31400000000 /* MyTodayExtension_entitlements.entitlements.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; name = MyTodayExtension_entitlements.entitlements.c; path = "blaze-bin/tulsi_e2e_mac/MyTodayExtension_entitlements.entitlements.c"; sourceTree = "<group>"; };
 		43D68C2859BF633C00000000 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = "tulsi-workspace/tulsi_e2e_mac/src/AppDelegate.h"; sourceTree = "<group>"; };
 		43D68C2859FC82CA00000000 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = "tulsi-workspace/tulsi_e2e_mac/src/AppDelegate.m"; sourceTree = "<group>"; };
 		43D68C286BE5C4F400000000 /* TodayViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = TodayViewController.h; path = "tulsi-workspace/tulsi_e2e_mac/src/extensions/today/TodayViewController.h"; sourceTree = "<group>"; };
 		43D68C2876BC0BC700000000 /* MyTodayExtension-Entitlements.entitlements */ = {isa = PBXFileReference; lastKnownFileType = "com.apple.xcode.entitlements-property-list"; name = "MyTodayExtension-Entitlements.entitlements"; path = "tulsi-workspace/tulsi_e2e_mac/MyTodayExtension-Entitlements.entitlements"; sourceTree = "<group>"; };
+		43D68C288A0F77F600000000 /* lib_idx_MyTodayExtensionSources_MyCommandLineAppSource_MyMacAppSources_F8389608.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; name = lib_idx_MyTodayExtensionSources_MyCommandLineAppSource_MyMacAppSources_F8389608.a; path = lib_idx_MyTodayExtensionSources_MyCommandLineAppSource_MyMacAppSources_F8389608.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		43D68C289199386500000000 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; name = Info.plist; path = "tulsi-workspace/tulsi_e2e_mac/Info.plist"; sourceTree = "<group>"; };
 		43D68C28936F558E00000000 /* MyTodayExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; name = MyTodayExtension.appex; path = MyTodayExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
-		43D68C28B0DFE81200000000 /* MyCommandLineApp.merged_infoplist.infoplist_section.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; name = MyCommandLineApp.merged_infoplist.infoplist_section.c; path = "blaze-bin/tulsi_e2e_mac/MyCommandLineApp.merged_infoplist.infoplist_section.c"; sourceTree = "<group>"; };
-		43D68C28CBA7C26800000000 /* lib_idx_MyTodayExtensionSources_MyCommandLineApp.apple_binary_MyCommandLineApp.merged_infoplist_lib_MyCommandLineAppSource_MyMacAppSources_MyMacOSApp.apple_binary_MyTodayExtension.appl_etc_39345AA1.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; name = lib_idx_MyTodayExtensionSources_MyCommandLineApp.apple_binary_MyCommandLineApp.merged_infoplist_lib_MyCommandLineAppSource_MyMacAppSources_MyMacOSApp.apple_binary_MyTodayExtension.appl_etc_39345AA1.a; path = lib_idx_MyTodayExtensionSources_MyCommandLineApp.apple_binary_MyCommandLineApp.merged_infoplist_lib_MyCommandLineAppSource_MyMacAppSources_MyMacOSApp.apple_binary_MyTodayExtension.appl_etc_39345AA1.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		43D68C28CBE52D2300000000 /* BUILD */ = {isa = PBXFileReference; lastKnownFileType = text; name = BUILD; path = tulsi_e2e_mac/BUILD; sourceTree = "<group>"; };
 		43D68C28DE68C70F00000000 /* Main.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Main.storyboard; path = "tulsi-workspace/tulsi_e2e_mac/Resources/Main.storyboard"; sourceTree = "<group>"; };
-		43D68C28E3C31EC800000000 /* MyCommandLineApp_entitlements.entitlements.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; name = MyCommandLineApp_entitlements.entitlements.c; path = "blaze-bin/tulsi_e2e_mac/MyCommandLineApp_entitlements.entitlements.c"; sourceTree = "<group>"; };
 		43D68C28F1794D7D00000000 /* MyCommandLineApp-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; name = "MyCommandLineApp-Info.plist"; path = "tulsi-workspace/tulsi_e2e_mac/MyCommandLineApp-Info.plist"; sourceTree = "<group>"; };
-		43D68C28F52B2FF400000000 /* MyMacOSApp_entitlements.entitlements.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; name = MyMacOSApp_entitlements.entitlements.c; path = "blaze-bin/tulsi_e2e_mac/MyMacOSApp_entitlements.entitlements.c"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXGroup section */
@@ -81,19 +73,11 @@
 				43D68C281E9E743E00000000 /* MyCommandLineApp */,
 				43D68C2810C8DA6C00000000 /* MyMacOSApp.app */,
 				43D68C28936F558E00000000 /* MyTodayExtension.appex */,
-				43D68C28CBA7C26800000000 /* lib_idx_MyTodayExtensionSources_MyCommandLineApp.apple_binary_MyCommandLineApp.merged_infoplist_lib_MyCommandLineAppSource_MyMacAppSources_MyMacOSApp.apple_binary_MyTodayExtension.appl_etc_39345AA1.a */,
+				43D68C288A0F77F600000000 /* lib_idx_MyTodayExtensionSources_MyCommandLineAppSource_MyMacAppSources_F8389608.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
-		966FB6DE2CEC8E5C00000000 /* blaze-bin */ = {
-			isa = PBXGroup;
-			children = (
-				966FB6DEA121610800000000 /* tulsi_e2e_mac */,
-			);
-			name = "blaze-bin";
-			sourceTree = "<group>";
-		};
 		966FB6DE97B5B88200000000 /* src */ = {
 			isa = PBXGroup;
 			children = (
@@ -116,17 +100,6 @@
 		966FB6DEA121610800000000 /* tulsi_e2e_mac */ = {
 			isa = PBXGroup;
 			children = (
-				43D68C28B0DFE81200000000 /* MyCommandLineApp.merged_infoplist.infoplist_section.c */,
-				43D68C28E3C31EC800000000 /* MyCommandLineApp_entitlements.entitlements.c */,
-				43D68C28F52B2FF400000000 /* MyMacOSApp_entitlements.entitlements.c */,
-				43D68C283E03F31400000000 /* MyTodayExtension_entitlements.entitlements.c */,
-			);
-			name = tulsi_e2e_mac;
-			sourceTree = "<group>";
-		};
-		966FB6DEA121610800000001 /* tulsi_e2e_mac */ = {
-			isa = PBXGroup;
-			children = (
 				43D68C28CBE52D2300000000 /* BUILD */,
 				43D68C289199386500000000 /* Info.plist */,
 				43D68C28F1794D7D00000000 /* MyCommandLineApp-Info.plist */,
@@ -159,8 +132,7 @@
 			isa = PBXGroup;
 			children = (
 				966FB6DE2BD1037D00000000 /* Products */,
-				966FB6DE2CEC8E5C00000000 /* blaze-bin */,
-				966FB6DEA121610800000001 /* tulsi_e2e_mac */,
+				966FB6DEA121610800000000 /* tulsi_e2e_mac */,
 			);
 			name = mainGroup;
 			path = ../..;
@@ -202,9 +174,9 @@
 			productReference = 43D68C281E9E743E00000000 /* MyCommandLineApp */;
 			productType = "com.apple.product-type.tool";
 		};
-		3D31C5E62F79D60800000000 /* _idx_MyTodayExtensionSources_MyCommandLineApp.apple_binary_MyCommandLineApp.merged_infoplist_lib_MyCommandLineAppSource_MyMacAppSources_MyMacOSApp.apple_binary_MyTodayExtension.appl_etc_39345AA1 */ = {
+		3D31C5E661E6A45C00000000 /* _idx_MyTodayExtensionSources_MyCommandLineAppSource_MyMacAppSources_F8389608 */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = DE475583AEB7EF4000000000 /* Build configuration list for PBXNativeTarget "_idx_MyTodayExtensionSources_MyCommandLineApp.apple_binary_MyCommandLineApp.merged_infoplist_lib_MyCommandLineAppSource_MyMacAppSources_MyMacOSApp.apple_binary_MyTodayExtension.appl_etc_39345AA1" */;
+			buildConfigurationList = DE475583A80AEECE00000000 /* Build configuration list for PBXNativeTarget "_idx_MyTodayExtensionSources_MyCommandLineAppSource_MyMacAppSources_F8389608" */;
 			buildPhases = (
 				605793E20000000000000000 /* Sources */,
 			);
@@ -213,9 +185,9 @@
 			dependencies = (
 				4DAD0B426921D83500000000 /* PBXTargetDependency */,
 			);
-			name = _idx_MyTodayExtensionSources_MyCommandLineApp.apple_binary_MyCommandLineApp.merged_infoplist_lib_MyCommandLineAppSource_MyMacAppSources_MyMacOSApp.apple_binary_MyTodayExtension.appl_etc_39345AA1;
-			productName = _idx_MyTodayExtensionSources_MyCommandLineApp.apple_binary_MyCommandLineApp.merged_infoplist_lib_MyCommandLineAppSource_MyMacAppSources_MyMacOSApp.apple_binary_MyTodayExtension.appl_etc_39345AA1;
-			productReference = 43D68C28CBA7C26800000000 /* lib_idx_MyTodayExtensionSources_MyCommandLineApp.apple_binary_MyCommandLineApp.merged_infoplist_lib_MyCommandLineAppSource_MyMacAppSources_MyMacOSApp.apple_binary_MyTodayExtension.appl_etc_39345AA1.a */;
+			name = _idx_MyTodayExtensionSources_MyCommandLineAppSource_MyMacAppSources_F8389608;
+			productName = _idx_MyTodayExtensionSources_MyCommandLineAppSource_MyMacAppSources_F8389608;
+			productReference = 43D68C288A0F77F600000000 /* lib_idx_MyTodayExtensionSources_MyCommandLineAppSource_MyMacAppSources_F8389608.a */;
 			productType = "com.apple.product-type.library.static";
 		};
 		3D31C5E665954B6A00000000 /* MyTodayExtension */ = {
@@ -272,7 +244,7 @@
 				3D31C5E6F53E4F0A00000000 /* MyMacOSApp */,
 				3D31C5E665954B6A00000000 /* MyTodayExtension */,
 				ECCC95946921D83400000000 /* _bazel_clean_ */,
-				3D31C5E62F79D60800000000 /* _idx_MyTodayExtensionSources_MyCommandLineApp.apple_binary_MyCommandLineApp.merged_infoplist_lib_MyCommandLineAppSource_MyMacAppSources_MyMacOSApp.apple_binary_MyTodayExtension.appl_etc_39345AA1 */,
+				3D31C5E661E6A45C00000000 /* _idx_MyTodayExtensionSources_MyCommandLineAppSource_MyMacAppSources_F8389608 */,
 			);
 		};
 /* End PBXProject section */
@@ -328,13 +300,9 @@
 			buildActionMask = 0;
 			files = (
 				E6AF49472511224F00000000 /* TodayViewController.m in ExtSources */,
-				E6AF4947E3C31EC800000000 /* MyCommandLineApp_entitlements.entitlements.c in tulsi_e2e_mac */,
-				E6AF4947B0DFE81200000000 /* MyCommandLineApp.merged_infoplist.infoplist_section.c in tulsi_e2e_mac */,
 				E6AF49473C553F8E00000000 /* main.m in src */,
 				E6AF494759FC82CA00000000 /* AppDelegate.m in src */,
 				E6AF49473C553F8E00000001 /* main.m in src */,
-				E6AF4947F52B2FF400000000 /* MyMacOSApp_entitlements.entitlements.c in tulsi_e2e_mac */,
-				E6AF49473E03F31400000000 /* MyTodayExtension_entitlements.entitlements.c in tulsi_e2e_mac */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -448,7 +416,7 @@
 				GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1";
 				HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 ";
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				PRODUCT_NAME = _idx_MyTodayExtensionSources_MyCommandLineApp.apple_binary_MyCommandLineApp.merged_infoplist_lib_MyCommandLineAppSource_MyMacAppSources_MyMacOSApp.apple_binary_MyTodayExtension.appl_etc_39345AA1;
+				PRODUCT_NAME = _idx_MyTodayExtensionSources_MyCommandLineAppSource_MyMacAppSources_F8389608;
 				SDKROOT = macosx;
 				VALID_ARCHS = x86_64;
 			};
@@ -555,7 +523,7 @@
 				GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1";
 				HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 ";
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				PRODUCT_NAME = _idx_MyTodayExtensionSources_MyCommandLineApp.apple_binary_MyCommandLineApp.merged_infoplist_lib_MyCommandLineAppSource_MyMacAppSources_MyMacOSApp.apple_binary_MyTodayExtension.appl_etc_39345AA1;
+				PRODUCT_NAME = _idx_MyTodayExtensionSources_MyCommandLineAppSource_MyMacAppSources_F8389608;
 				SDKROOT = macosx;
 				VALID_ARCHS = x86_64;
 			};
@@ -849,7 +817,7 @@
 			);
 			defaultConfigurationIsVisible = 0;
 		};
-		DE475583AEB7EF4000000000 /* Build configuration list for PBXNativeTarget "_idx_MyTodayExtensionSources_MyCommandLineApp.apple_binary_MyCommandLineApp.merged_infoplist_lib_MyCommandLineAppSource_MyMacAppSources_MyMacOSApp.apple_binary_MyTodayExtension.appl_etc_39345AA1" */ = {
+		DE475583A80AEECE00000000 /* Build configuration list for PBXNativeTarget "_idx_MyTodayExtensionSources_MyCommandLineAppSource_MyMacAppSources_F8389608" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				44936BD67EED3C4D00000004 /* Debug */,
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/WatchProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/WatchProject.xcodeproj/project.pbxproj
index a0c4305..4ee4436 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/WatchProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/WatchProject.xcodeproj/project.pbxproj
@@ -7,10 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		E6AF49470E956A7800000000 /* WatchExtension_entitlements.entitlements.c in tulsi_e2e_watch */ = {isa = PBXBuildFile; fileRef = 43D68C280E956A7800000000 /* WatchExtension_entitlements.entitlements.c */; };
 		E6AF49473FF4EFB600000000 /* main.m in srcs */ = {isa = PBXBuildFile; fileRef = 43D68C283FF4EFB600000000 /* main.m */; };
 		E6AF49479ECDDEA400000000 /* watch2_extension_binary.m in srcs */ = {isa = PBXBuildFile; fileRef = 43D68C289ECDDEA400000000 /* watch2_extension_binary.m */; };
-		E6AF4947CAE1840C00000000 /* Application_entitlements.entitlements.c in tulsi_e2e_watch */ = {isa = PBXBuildFile; fileRef = 43D68C28CAE1840C00000000 /* Application_entitlements.entitlements.c */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -30,23 +28,20 @@
 
 /* Begin PBXFileReference section */
 		43D68C2806CBDC2C00000000 /* Interface.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Interface.storyboard; path = "tulsi-workspace/tulsi_e2e_watch/Watch2Extension/Interface.storyboard"; sourceTree = "<group>"; };
-		43D68C280E956A7800000000 /* WatchExtension_entitlements.entitlements.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; name = WatchExtension_entitlements.entitlements.c; path = "blaze-bin/tulsi_e2e_watch/WatchExtension_entitlements.entitlements.c"; sourceTree = "<group>"; };
+		43D68C2810C6D30200000000 /* lib_idx_WatchExtensionLibrary_6997976B.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; name = lib_idx_WatchExtensionLibrary_6997976B.a; path = lib_idx_WatchExtensionLibrary_6997976B.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		43D68C283686445A00000000 /* ext_resources.file */ = {isa = PBXFileReference; lastKnownFileType = dyn.age80q4pqqy; name = ext_resources.file; path = "tulsi-workspace/tulsi_e2e_watch/Watch2Extension/ext_resources.file"; sourceTree = "<group>"; };
 		43D68C283FF4EFB600000000 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = main.m; path = "tulsi-workspace/tulsi_e2e_watch/Library/srcs/main.m"; sourceTree = "<group>"; };
 		43D68C2849C0CECB00000000 /* BUILD */ = {isa = PBXFileReference; lastKnownFileType = text; name = BUILD; path = tulsi_e2e_watch/BUILD; sourceTree = "<group>"; };
 		43D68C284AC8D59B00000000 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; name = Info.plist; path = "tulsi-workspace/tulsi_e2e_watch/Watch2Extension/app_infoplists/Info.plist"; sourceTree = "<group>"; };
 		43D68C284E902D9E00000000 /* WatchApplication.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; name = WatchApplication.app; path = WatchApplication.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		43D68C285B0DEC7800000000 /* entitlements.entitlements */ = {isa = PBXFileReference; lastKnownFileType = "com.apple.xcode.entitlements-property-list"; name = entitlements.entitlements; path = "tulsi-workspace/tulsi_e2e_watch/Application/entitlements.entitlements"; sourceTree = "<group>"; };
-		43D68C2877C8468600000000 /* WatchApplication_entitlements.entitlements.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; name = WatchApplication_entitlements.entitlements.c; path = "blaze-bin/tulsi_e2e_watch/WatchApplication_entitlements.entitlements.c"; sourceTree = "<group>"; };
-		43D68C2879CDE3DC00000000 /* lib_idx_WatchExtensionLibrary_WatchExtension.apple_binary_34715D29.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; name = lib_idx_WatchExtensionLibrary_WatchExtension.apple_binary_34715D29.a; path = lib_idx_WatchExtensionLibrary_WatchExtension.apple_binary_34715D29.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		43D68C289E265EE800000000 /* ext_structured_resources.file */ = {isa = PBXFileReference; lastKnownFileType = dyn.age80q4pqqy; name = ext_structured_resources.file; path = "tulsi-workspace/tulsi_e2e_watch/Watch2Extension/ext_structured_resources.file"; sourceTree = "<group>"; };
 		43D68C289ECDDEA400000000 /* watch2_extension_binary.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = watch2_extension_binary.m; path = "tulsi-workspace/tulsi_e2e_watch/Watch2ExtensionBinary/srcs/watch2_extension_binary.m"; sourceTree = "<group>"; };
 		43D68C28AFD9A63E00000000 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; name = Info.plist; path = "tulsi-workspace/tulsi_e2e_watch/Application/Info.plist"; sourceTree = "<group>"; };
 		43D68C28B713E4AE00000000 /* structured_resources.file1 */ = {isa = PBXFileReference; lastKnownFileType = dyn.age80q4pqqy2u; name = structured_resources.file1; path = "tulsi-workspace/tulsi_e2e_watch/Application/structured_resources.file1"; sourceTree = "<group>"; };
 		43D68C28BBC8EE6A00000000 /* WatchExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; name = WatchExtension.appex; path = WatchExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
 		43D68C28C6BEF59A00000000 /* Application-MergedInfo.plist */ = {isa = PBXFileReference; explicitFileType = text.plist; name = "Application-MergedInfo.plist"; path = "blaze-bin/tulsi_e2e_watch/Application-MergedInfo.plist"; sourceTree = "<group>"; };
-		43D68C28CAE1840C00000000 /* Application_entitlements.entitlements.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; name = Application_entitlements.entitlements.c; path = "blaze-bin/tulsi_e2e_watch/Application_entitlements.entitlements.c"; sourceTree = "<group>"; };
-		43D68C28E17B56BE00000000 /* lib_idx_ApplicationLibrary_Application.apple_binary_5F1AA3D3.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; name = lib_idx_ApplicationLibrary_Application.apple_binary_5F1AA3D3.a; path = lib_idx_ApplicationLibrary_Application.apple_binary_5F1AA3D3.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		43D68C28E38ADF0600000000 /* lib_idx_ApplicationLibrary_06BBE256.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; name = lib_idx_ApplicationLibrary_06BBE256.a; path = lib_idx_ApplicationLibrary_06BBE256.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		43D68C28EFD4953600000000 /* ext_entitlements.entitlements */ = {isa = PBXFileReference; lastKnownFileType = "com.apple.xcode.entitlements-property-list"; name = ext_entitlements.entitlements; path = "tulsi-workspace/tulsi_e2e_watch/Watch2Extension/ext_entitlements.entitlements"; sourceTree = "<group>"; };
 		43D68C28F49055A600000000 /* Application.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; name = Application.app; path = Application.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		43D68C28FC1765AB00000000 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; name = Info.plist; path = "tulsi-workspace/tulsi_e2e_watch/Watch2Extension/ext_infoplists/Info.plist"; sourceTree = "<group>"; };
@@ -64,16 +59,6 @@
 		966FB6DE099EE73000000001 /* tulsi_e2e_watch */ = {
 			isa = PBXGroup;
 			children = (
-				43D68C28CAE1840C00000000 /* Application_entitlements.entitlements.c */,
-				43D68C2877C8468600000000 /* WatchApplication_entitlements.entitlements.c */,
-				43D68C280E956A7800000000 /* WatchExtension_entitlements.entitlements.c */,
-			);
-			name = tulsi_e2e_watch;
-			sourceTree = "<group>";
-		};
-		966FB6DE099EE73000000002 /* tulsi_e2e_watch */ = {
-			isa = PBXGroup;
-			children = (
 				966FB6DEB58A255E00000000 /* Application */,
 				43D68C2849C0CECB00000000 /* BUILD */,
 				966FB6DE94E444FD00000000 /* Library */,
@@ -103,8 +88,8 @@
 				43D68C284E902D9E00000000 /* WatchApplication.app */,
 				43D68C28BBC8EE6A00000000 /* WatchExtension.appex */,
 				966FB6DE2CEC8E5C00000000 /* blaze-bin */,
-				43D68C28E17B56BE00000000 /* lib_idx_ApplicationLibrary_Application.apple_binary_5F1AA3D3.a */,
-				43D68C2879CDE3DC00000000 /* lib_idx_WatchExtensionLibrary_WatchExtension.apple_binary_34715D29.a */,
+				43D68C28E38ADF0600000000 /* lib_idx_ApplicationLibrary_06BBE256.a */,
+				43D68C2810C6D30200000000 /* lib_idx_WatchExtensionLibrary_6997976B.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -117,14 +102,6 @@
 			name = "blaze-bin";
 			sourceTree = "<group>";
 		};
-		966FB6DE2CEC8E5C00000001 /* blaze-bin */ = {
-			isa = PBXGroup;
-			children = (
-				966FB6DE099EE73000000001 /* tulsi_e2e_watch */,
-			);
-			name = "blaze-bin";
-			sourceTree = "<group>";
-		};
 		966FB6DE5B9D018E00000000 /* srcs */ = {
 			isa = PBXGroup;
 			children = (
@@ -179,8 +156,7 @@
 			isa = PBXGroup;
 			children = (
 				966FB6DE2BD1037D00000000 /* Products */,
-				966FB6DE2CEC8E5C00000001 /* blaze-bin */,
-				966FB6DE099EE73000000002 /* tulsi_e2e_watch */,
+				966FB6DE099EE73000000001 /* tulsi_e2e_watch */,
 			);
 			name = mainGroup;
 			path = ../..;
@@ -231,9 +207,9 @@
 			productReference = 43D68C284E902D9E00000000 /* WatchApplication.app */;
 			productType = "com.apple.product-type.application.watchapp2";
 		};
-		3D31C5E6310F9D2400000000 /* _idx_ApplicationLibrary_Application.apple_binary_5F1AA3D3 */ = {
+		3D31C5E631A95E1E00000000 /* _idx_ApplicationLibrary_06BBE256 */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = DE475583905AC4F500000000 /* Build configuration list for PBXNativeTarget "_idx_ApplicationLibrary_Application.apple_binary_5F1AA3D3" */;
+			buildConfigurationList = DE47558357363AEC00000000 /* Build configuration list for PBXNativeTarget "_idx_ApplicationLibrary_06BBE256" */;
 			buildPhases = (
 				605793E20000000000000000 /* Sources */,
 			);
@@ -242,9 +218,9 @@
 			dependencies = (
 				4DAD0B426921D83500000000 /* PBXTargetDependency */,
 			);
-			name = _idx_ApplicationLibrary_Application.apple_binary_5F1AA3D3;
-			productName = _idx_ApplicationLibrary_Application.apple_binary_5F1AA3D3;
-			productReference = 43D68C28E17B56BE00000000 /* lib_idx_ApplicationLibrary_Application.apple_binary_5F1AA3D3.a */;
+			name = _idx_ApplicationLibrary_06BBE256;
+			productName = _idx_ApplicationLibrary_06BBE256;
+			productReference = 43D68C28E38ADF0600000000 /* lib_idx_ApplicationLibrary_06BBE256.a */;
 			productType = "com.apple.product-type.library.static";
 		};
 		3D31C5E66B144ABC00000000 /* Application */ = {
@@ -263,9 +239,9 @@
 			productReference = 43D68C28F49055A600000000 /* Application.app */;
 			productType = "com.apple.product-type.application";
 		};
-		3D31C5E67780A66A00000000 /* _idx_WatchExtensionLibrary_WatchExtension.apple_binary_34715D29 */ = {
+		3D31C5E6760C62B800000000 /* _idx_WatchExtensionLibrary_6997976B */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = DE4755837C09C6E100000000 /* Build configuration list for PBXNativeTarget "_idx_WatchExtensionLibrary_WatchExtension.apple_binary_34715D29" */;
+			buildConfigurationList = DE4755830DA25C2A00000000 /* Build configuration list for PBXNativeTarget "_idx_WatchExtensionLibrary_6997976B" */;
 			buildPhases = (
 				605793E20000000000000001 /* Sources */,
 			);
@@ -274,9 +250,9 @@
 			dependencies = (
 				4DAD0B426921D83500000000 /* PBXTargetDependency */,
 			);
-			name = _idx_WatchExtensionLibrary_WatchExtension.apple_binary_34715D29;
-			productName = _idx_WatchExtensionLibrary_WatchExtension.apple_binary_34715D29;
-			productReference = 43D68C2879CDE3DC00000000 /* lib_idx_WatchExtensionLibrary_WatchExtension.apple_binary_34715D29.a */;
+			name = _idx_WatchExtensionLibrary_6997976B;
+			productName = _idx_WatchExtensionLibrary_6997976B;
+			productReference = 43D68C2810C6D30200000000 /* lib_idx_WatchExtensionLibrary_6997976B.a */;
 			productType = "com.apple.product-type.library.static";
 		};
 		3D31C5E6CD47F3C600000000 /* WatchExtension */ = {
@@ -317,8 +293,8 @@
 				3D31C5E61E7C5AB400000000 /* WatchApplication */,
 				3D31C5E6CD47F3C600000000 /* WatchExtension */,
 				ECCC95946921D83400000000 /* _bazel_clean_ */,
-				3D31C5E6310F9D2400000000 /* _idx_ApplicationLibrary_Application.apple_binary_5F1AA3D3 */,
-				3D31C5E67780A66A00000000 /* _idx_WatchExtensionLibrary_WatchExtension.apple_binary_34715D29 */,
+				3D31C5E631A95E1E00000000 /* _idx_ApplicationLibrary_06BBE256 */,
+				3D31C5E6760C62B800000000 /* _idx_WatchExtensionLibrary_6997976B */,
 			);
 		};
 /* End PBXProject section */
@@ -374,7 +350,6 @@
 			buildActionMask = 0;
 			files = (
 				E6AF49473FF4EFB600000000 /* main.m in srcs */,
-				E6AF4947CAE1840C00000000 /* Application_entitlements.entitlements.c in tulsi_e2e_watch */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -383,7 +358,6 @@
 			buildActionMask = 0;
 			files = (
 				E6AF49479ECDDEA400000000 /* watch2_extension_binary.m in srcs */,
-				E6AF49470E956A7800000000 /* WatchExtension_entitlements.entitlements.c in tulsi_e2e_watch */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -501,7 +475,7 @@
 				GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1";
 				HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_WR)/tulsi_e2e_watch/Library/includes/one/include $(TULSI_WR)/tulsi-includes/x/x/tulsi_e2e_watch/Library/includes/one/include $(TULSI_BWRS)/tulsi_e2e_watch/Library/includes/one/include $(TULSI_BWRS)/tulsi-includes/x/x/tulsi_e2e_watch/Library/includes/one/include $(TULSI_BWRS)/tools/cpp/gcc3 ";
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
-				PRODUCT_NAME = _idx_ApplicationLibrary_Application.apple_binary_5F1AA3D3;
+				PRODUCT_NAME = _idx_ApplicationLibrary_06BBE256;
 				SDKROOT = iphonesimulator;
 				VALID_ARCHS = x86_64;
 			};
@@ -513,7 +487,7 @@
 				ARCHS = x86_64;
 				GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1";
 				HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 ";
-				PRODUCT_NAME = _idx_WatchExtensionLibrary_WatchExtension.apple_binary_34715D29;
+				PRODUCT_NAME = _idx_WatchExtensionLibrary_6997976B;
 				SDKROOT = watchsimulator;
 				VALID_ARCHS = x86_64;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
@@ -621,7 +595,7 @@
 				GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1";
 				HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_WR)/tulsi_e2e_watch/Library/includes/one/include $(TULSI_WR)/tulsi-includes/x/x/tulsi_e2e_watch/Library/includes/one/include $(TULSI_BWRS)/tulsi_e2e_watch/Library/includes/one/include $(TULSI_BWRS)/tulsi-includes/x/x/tulsi_e2e_watch/Library/includes/one/include $(TULSI_BWRS)/tools/cpp/gcc3 ";
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
-				PRODUCT_NAME = _idx_ApplicationLibrary_Application.apple_binary_5F1AA3D3;
+				PRODUCT_NAME = _idx_ApplicationLibrary_06BBE256;
 				SDKROOT = iphonesimulator;
 				VALID_ARCHS = x86_64;
 			};
@@ -633,7 +607,7 @@
 				ARCHS = x86_64;
 				GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1";
 				HEADER_SEARCH_PATHS = "$(inherited) $(TULSI_BWRS)/tools/cpp/gcc3 ";
-				PRODUCT_NAME = _idx_WatchExtensionLibrary_WatchExtension.apple_binary_34715D29;
+				PRODUCT_NAME = _idx_WatchExtensionLibrary_6997976B;
 				SDKROOT = watchsimulator;
 				VALID_ARCHS = x86_64;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
@@ -888,6 +862,14 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
+		DE4755830DA25C2A00000000 /* Build configuration list for PBXNativeTarget "_idx_WatchExtensionLibrary_6997976B" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				44936BD67EED3C4D00000005 /* Debug */,
+				44936BD6A3D45CE900000005 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+		};
 		DE4755830DB9CDD900000000 /* Build configuration list for PBXNativeTarget "WatchExtension" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@@ -908,15 +890,7 @@
 			);
 			defaultConfigurationIsVisible = 0;
 		};
-		DE4755837C09C6E100000000 /* Build configuration list for PBXNativeTarget "_idx_WatchExtensionLibrary_WatchExtension.apple_binary_34715D29" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				44936BD67EED3C4D00000005 /* Debug */,
-				44936BD6A3D45CE900000005 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-		};
-		DE475583905AC4F500000000 /* Build configuration list for PBXNativeTarget "_idx_ApplicationLibrary_Application.apple_binary_5F1AA3D3" */ = {
+		DE47558357363AEC00000000 /* Build configuration list for PBXNativeTarget "_idx_ApplicationLibrary_06BBE256" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				44936BD67EED3C4D00000004 /* Debug */,