Update to XMP SDK CC 2013.06

102 files changed, 1659 insertions, 1847 deletions

diff --git a/XMPFilesPlugins/PDF_Handler/.DS_Store b/XMPFilesPlugins/PDF_Handler/.DS_Store
deleted file mode 100644
index 5008ddf..0000000
--- a/XMPFilesPlugins/PDF_Handler/.DS_Store
+++ /dev/null
diff --git a/XMPFilesPlugins/PDF_Handler/i80386linux/gcc4.1.2/PDF_Handler.xpi b/XMPFilesPlugins/PDF_Handler/i80386linux/gcc4.1.2/PDF_Handler.xpi
deleted file mode 100644
index dd6f164..0000000
--- a/XMPFilesPlugins/PDF_Handler/i80386linux/gcc4.1.2/PDF_Handler.xpi
+++ /dev/null
diff --git a/XMPFilesPlugins/PDF_Handler/i80386linux/gcc4.1.2_x64/PDF_Handler.xpi b/XMPFilesPlugins/PDF_Handler/i80386linux/gcc4.1.2_x64/PDF_Handler.xpi
deleted file mode 100644
index be10ac0..0000000
--- a/XMPFilesPlugins/PDF_Handler/i80386linux/gcc4.1.2_x64/PDF_Handler.xpi
+++ /dev/null
diff --git a/XMPFilesPlugins/PDF_Handler/i80386linux/gcc4.1.2/PDF_Handler.resources/MODULE_IDENTIFIER.txt b/XMPFilesPlugins/PDF_Handler/i80386linux/i80386linux/PDF_Handler.resources/MODULE_IDENTIFIER.txt
index f7feb37..f7feb37 100644
--- a/XMPFilesPlugins/PDF_Handler/i80386linux/gcc4.1.2/PDF_Handler.resources/MODULE_IDENTIFIER.txt
+++ b/XMPFilesPlugins/PDF_Handler/i80386linux/i80386linux/PDF_Handler.resources/MODULE_IDENTIFIER.txt
diff --git a/XMPFilesPlugins/PDF_Handler/i80386linux/gcc4.1.2/PDF_Handler.resources/XMPPLUGINUIDS.txt b/XMPFilesPlugins/PDF_Handler/i80386linux/i80386linux/PDF_Handler.resources/XMPPLUGINUIDS.txt
index 2d9886c..91d2a23 100644
--- a/XMPFilesPlugins/PDF_Handler/i80386linux/gcc4.1.2/PDF_Handler.resources/XMPPLUGINUIDS.txt
+++ b/XMPFilesPlugins/PDF_Handler/i80386linux/i80386linux/PDF_Handler.resources/XMPPLUGINUIDS.txt
@@ -22,6 +22,7 @@
 			<HandlerFlag Name="kXMPFiles_ReturnsRawPacket" />
 			<HandlerFlag Name="kXMPFiles_HandlerOwnsFile" />
 			<HandlerFlag Name="kXMPFiles_AllowsSafeUpdate" />
+			<HandlerFlag Name="kXMPFiles_NeedsPreloading" />
 		</HandlerFlags>
 		<SerializeOptions>
 			<SerializeOption Name="kXMP_OmitPacketWrapper" />
diff --git a/XMPFilesPlugins/PDF_Handler/i80386linux/i80386linux/PDF_Handler.xpi b/XMPFilesPlugins/PDF_Handler/i80386linux/i80386linux/PDF_Handler.xpi
new file mode 100644
index 0000000..a001d6b
--- /dev/null
+++ b/XMPFilesPlugins/PDF_Handler/i80386linux/i80386linux/PDF_Handler.xpi
diff --git a/XMPFilesPlugins/PDF_Handler/i80386linux/gcc4.1.2/libMiniPDFL.so b/XMPFilesPlugins/PDF_Handler/i80386linux/i80386linux/libMiniPDFL.so
index f1c0ca0..f1c0ca0 100644
--- a/XMPFilesPlugins/PDF_Handler/i80386linux/gcc4.1.2/libMiniPDFL.so
+++ b/XMPFilesPlugins/PDF_Handler/i80386linux/i80386linux/libMiniPDFL.so
diff --git a/XMPFilesPlugins/PDF_Handler/i80386linux/gcc4.1.2_x64/PDF_Handler.resources/MODULE_IDENTIFIER.txt b/XMPFilesPlugins/PDF_Handler/i80386linux/i80386linux_x64/PDF_Handler.resources/MODULE_IDENTIFIER.txt
index f7feb37..f7feb37 100644
--- a/XMPFilesPlugins/PDF_Handler/i80386linux/gcc4.1.2_x64/PDF_Handler.resources/MODULE_IDENTIFIER.txt
+++ b/XMPFilesPlugins/PDF_Handler/i80386linux/i80386linux_x64/PDF_Handler.resources/MODULE_IDENTIFIER.txt
diff --git a/XMPFilesPlugins/PDF_Handler/i80386linux/gcc4.1.2_x64/PDF_Handler.resources/XMPPLUGINUIDS.txt b/XMPFilesPlugins/PDF_Handler/i80386linux/i80386linux_x64/PDF_Handler.resources/XMPPLUGINUIDS.txt
index 46a96d3..4f1d470 100644
--- a/XMPFilesPlugins/PDF_Handler/i80386linux/gcc4.1.2_x64/PDF_Handler.resources/XMPPLUGINUIDS.txt
+++ b/XMPFilesPlugins/PDF_Handler/i80386linux/i80386linux_x64/PDF_Handler.resources/XMPPLUGINUIDS.txt
@@ -22,6 +22,7 @@
 			<HandlerFlag Name="kXMPFiles_ReturnsRawPacket" />
 			<HandlerFlag Name="kXMPFiles_HandlerOwnsFile" />
 			<HandlerFlag Name="kXMPFiles_AllowsSafeUpdate" />
+			<HandlerFlag Name="kXMPFiles_NeedsPreloading" />
 		</HandlerFlags>
 		<SerializeOptions>
 			<SerializeOption Name="kXMP_OmitPacketWrapper" />
diff --git a/XMPFilesPlugins/PDF_Handler/i80386linux/i80386linux_x64/PDF_Handler.xpi b/XMPFilesPlugins/PDF_Handler/i80386linux/i80386linux_x64/PDF_Handler.xpi
new file mode 100644
index 0000000..983da8b
--- /dev/null
+++ b/XMPFilesPlugins/PDF_Handler/i80386linux/i80386linux_x64/PDF_Handler.xpi
diff --git a/XMPFilesPlugins/PDF_Handler/i80386linux/gcc4.1.2_x64/libMiniPDFL.so b/XMPFilesPlugins/PDF_Handler/i80386linux/i80386linux_x64/libMiniPDFL.so
index 14f7c97..3cbe555 100644
--- a/XMPFilesPlugins/PDF_Handler/i80386linux/gcc4.1.2_x64/libMiniPDFL.so
+++ b/XMPFilesPlugins/PDF_Handler/i80386linux/i80386linux_x64/libMiniPDFL.so
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/PDF_Handler b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/PDF_Handler
index 3b78e73..f561ba7 100644..120000
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/PDF_Handler
+++ b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/PDF_Handler
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Resources b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Resources
new file mode 120000
index 0000000..953ee36
--- /dev/null
+++ b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Resources
@@ -0,0 +1 @@
+Versions/Current/Resources
\ No newline at end of file
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Resources/MODULE_IDENTIFIER.txt b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Resources/MODULE_IDENTIFIER.txt
deleted file mode 100644
index f7feb37..0000000
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Resources/MODULE_IDENTIFIER.txt
+++ /dev/null
@@ -1 +0,0 @@
-com.adobe.XMP.plugins.MiniPDFL
\ No newline at end of file
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Resources/MiniPDFL.framework/MiniPDFL b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Resources/MiniPDFL.framework/MiniPDFL
deleted file mode 100644
index e2ccca0..0000000
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Resources/MiniPDFL.framework/MiniPDFL
+++ /dev/null
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Resources/MiniPDFL.framework/Versions/A/MiniPDFL b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Resources/MiniPDFL.framework/Versions/A/MiniPDFL
deleted file mode 100644
index e2ccca0..0000000
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Resources/MiniPDFL.framework/Versions/A/MiniPDFL
+++ /dev/null
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Resources/MiniPDFL.framework/Versions/Current/MiniPDFL b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Resources/MiniPDFL.framework/Versions/Current/MiniPDFL
deleted file mode 100644
index e2ccca0..0000000
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Resources/MiniPDFL.framework/Versions/Current/MiniPDFL
+++ /dev/null
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Resources/XMPPLUGINUIDS.txt b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Resources/XMPPLUGINUIDS.txt
deleted file mode 100644
index 3a8f7a9..0000000
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Resources/XMPPLUGINUIDS.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PluginResource>
-	<Handler
-		Name="adobe.coretech.xmp.minipdfl"
-		Version="1.00"
-		HandlerType="OwningHandler"
-		>
-		<CheckFormat
-			Offset="0"
-			Length="4"
-			ByteSeq="%PDF"
-		/>
-		<Extensions>
-			<Extension Name="pdf" />
-			<Extension Name="pdfl" />
-		</Extensions>
-		<HandlerFlags>
-			<HandlerFlag Name="kXMPFiles_CanInjectXMP" />
-			<HandlerFlag Name="kXMPFiles_CanExpand" />
-			<HandlerFlag Name="kXMPFiles_CanRewrite" />
-			<HandlerFlag Name="kXMPFiles_AllowsOnlyXMP" />
-			<HandlerFlag Name="kXMPFiles_ReturnsRawPacket" />
-			<HandlerFlag Name="kXMPFiles_HandlerOwnsFile" />
-			<HandlerFlag Name="kXMPFiles_AllowsSafeUpdate" />
-		</HandlerFlags>
-		<SerializeOptions>
-			<SerializeOption Name="kXMP_OmitPacketWrapper" />
-		</SerializeOptions>
-	</Handler>
-</PluginResource>
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/PDF_Handler b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/PDF_Handler
index 3b78e73..5bace6b 100644..100755
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/PDF_Handler
+++ b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/PDF_Handler
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/Resources/Info.plist b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/Resources/Info.plist
new file mode 100755
index 0000000..5f9f27b
--- /dev/null
+++ b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/Resources/Info.plist
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildMachineOSBuild</key>
+	<string>12C60</string>
+	<key>CFBundleExecutable</key>
+	<string>PDF_Handler</string>
+	<key>CFBundleGetInfoString</key>
+	<string>PDF Handler 1.0, Copyright (c) 2002, Adobe Systems Incorporated</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.xmp.PDF_Handler</string>
+	<key>CFBundleName</key>
+	<string>PDF_Handler</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>PDF Handler 1.0</string>
+	<key>CFBundleSignature</key>
+	<string>XMP </string>
+	<key>Configuration</key>
+	<string>Release</string>
+	<key>DTCompiler</key>
+	<string>com.apple.compilers.llvm.clang.1_0</string>
+	<key>DTPlatformBuild</key>
+	<string>4H1003</string>
+	<key>DTPlatformVersion</key>
+	<string>GM</string>
+	<key>DTSDKBuild</key>
+	<string>11E52</string>
+	<key>DTSDKName</key>
+	<string>macosx10.7</string>
+	<key>DTXcode</key>
+	<string>0462</string>
+	<key>DTXcodeBuild</key>
+	<string>4H1003</string>
+	<key>FileVersion</key>
+	<string>1.0</string>
+	<key>ProductName</key>
+	<string>PDF Handler</string>
+	<key>ProductVersion</key>
+	<string>1.0</string>
+</dict>
+</plist>
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/Resources/MODULE_IDENTIFIER.txt b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/Resources/MODULE_IDENTIFIER.txt
index f7feb37..f7feb37 100644..100755
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/Resources/MODULE_IDENTIFIER.txt
+++ b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/Resources/MODULE_IDENTIFIER.txt
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/MiniPDFL b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/MiniPDFL
index e2ccca0..1987270 100644..120000
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/MiniPDFL
+++ b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/MiniPDFL
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/Versions/A/MiniPDFL b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/Versions/A/MiniPDFL
index e2ccca0..03671e3 100644..100755
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/Versions/A/MiniPDFL
+++ b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/Versions/A/MiniPDFL
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/Versions/A/Resources/Info.plist b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/Versions/A/Resources/Info.plist
new file mode 100755
index 0000000..a6802d8
--- /dev/null
+++ b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/Versions/A/Resources/Info.plist
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>AcrobatCL</key>
+	<string>448391</string>
+	<key>BuildDate</key>
+	<string>0000/00/00-00:00:00</string>
+	<key>BuildID</key>
+	<string>1</string>
+	<key>BuildVersion</key>
+	<string>1.00000</string>
+	<key>CFBundleGetInfoString</key>
+	<string>MiniPDFL 1.0.0.1, © 1987-2012 Adobe Systems Incorporated.
+ All Rights Reserved.</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.adobe.PDFL</string>
+	<key>CFBundleName</key>
+	<string>MiniPDFL</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0.0</string>
+	<key>CFBundleVersion</key>
+	<string>1.0.0.1</string>
+	<key>PDFL_IPID</key>
+	<string>&lt;AdobeIP#0000583&gt;</string>
+	<key>ReleaseCL</key>
+	<string>0</string>
+	<key>CFBundleExecutable</key>
+	<string>MiniPDFL</string>
+</dict>
+</plist>
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/Versions/A/_CodeSignature/CodeResources b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/Versions/A/_CodeSignature/CodeResources
new file mode 100755
index 0000000..1a6dbbe
--- /dev/null
+++ b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/Versions/A/_CodeSignature/CodeResources
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>files</key>
+	<dict>
+		<key>Resources/Info.plist</key>
+		<data>
+		KBfTLqg0rGVKlSJbAITSqWlk+rA=
+		</data>
+	</dict>
+	<key>rules</key>
+	<dict>
+		<key>^Resources/</key>
+		<true/>
+		<key>^Resources/.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^Resources/.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^version.plist$</key>
+		<true/>
+	</dict>
+</dict>
+</plist>
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/Versions/Current b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/Versions/Current
new file mode 120000
index 0000000..8c7e5a6
--- /dev/null
+++ b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/Versions/Current
@@ -0,0 +1 @@
+A
\ No newline at end of file
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/Versions/Current/MiniPDFL b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/Versions/Current/MiniPDFL
deleted file mode 100644
index e2ccca0..0000000
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/Versions/Current/MiniPDFL
+++ /dev/null
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/Resources/XMPPLUGINUIDS.txt b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/Resources/XMPPLUGINUIDS.txt
index 3a8f7a9..4b1d4ec 100644..100755
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/Resources/XMPPLUGINUIDS.txt
+++ b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/Resources/XMPPLUGINUIDS.txt
@@ -1,30 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PluginResource>
-	<Handler
-		Name="adobe.coretech.xmp.minipdfl"
-		Version="1.00"
-		HandlerType="OwningHandler"
-		>
-		<CheckFormat
-			Offset="0"
-			Length="4"
-			ByteSeq="%PDF"
-		/>
-		<Extensions>
-			<Extension Name="pdf" />
-			<Extension Name="pdfl" />
-		</Extensions>
-		<HandlerFlags>
-			<HandlerFlag Name="kXMPFiles_CanInjectXMP" />
-			<HandlerFlag Name="kXMPFiles_CanExpand" />
-			<HandlerFlag Name="kXMPFiles_CanRewrite" />
-			<HandlerFlag Name="kXMPFiles_AllowsOnlyXMP" />
-			<HandlerFlag Name="kXMPFiles_ReturnsRawPacket" />
-			<HandlerFlag Name="kXMPFiles_HandlerOwnsFile" />
-			<HandlerFlag Name="kXMPFiles_AllowsSafeUpdate" />
-		</HandlerFlags>
-		<SerializeOptions>
-			<SerializeOption Name="kXMP_OmitPacketWrapper" />
-		</SerializeOptions>
-	</Handler>
-</PluginResource>
+<?xml version="1.0" encoding="UTF-8"?>

+<PluginResource Architecture="x86">

+	<Handler

+		Name="adobe.coretech.xmp.minipdfl"

+		Version="1.00"

+		HandlerType="OwningHandler"

+		>

+		<CheckFormat

+			Offset="0"

+			Length="4"

+			ByteSeq="%PDF"

+		/>

+		<Extensions>

+			<Extension Name="pdf" />

+			<Extension Name="pdfl" />

+		</Extensions>

+		<HandlerFlags>

+			<HandlerFlag Name="kXMPFiles_CanInjectXMP" />

+			<HandlerFlag Name="kXMPFiles_CanExpand" />

+			<HandlerFlag Name="kXMPFiles_CanRewrite" />

+			<HandlerFlag Name="kXMPFiles_AllowsOnlyXMP" />

+			<HandlerFlag Name="kXMPFiles_ReturnsRawPacket" />

+			<HandlerFlag Name="kXMPFiles_HandlerOwnsFile" />

+			<HandlerFlag Name="kXMPFiles_AllowsSafeUpdate" />

+			<HandlerFlag Name="kXMPFiles_NeedsPreloading" />

+		</HandlerFlags>

+		<SerializeOptions>

+			<SerializeOption Name="kXMP_OmitPacketWrapper" />

+		</SerializeOptions>

+	</Handler>

+</PluginResource>

diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/_CodeSignature/CodeResources b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/_CodeSignature/CodeResources
new file mode 100755
index 0000000..a5c1f01
--- /dev/null
+++ b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/A/_CodeSignature/CodeResources
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>files</key>
+	<dict>
+		<key>Resources/Info.plist</key>
+		<data>
+		cxBH0mqNlfVocAleoSEP8L3ySkE=
+		</data>
+		<key>Resources/MODULE_IDENTIFIER.txt</key>
+		<data>
+		eJbkRFTOj20cUgbc17vH6f5HfH0=
+		</data>
+		<key>Resources/MiniPDFL.framework/Versions/A/MiniPDFL</key>
+		<data>
+		RKdiJuITB2zaiRmKt9XB9MDyQYA=
+		</data>
+		<key>Resources/MiniPDFL.framework/Versions/A/Resources/Info.plist</key>
+		<data>
+		KBfTLqg0rGVKlSJbAITSqWlk+rA=
+		</data>
+		<key>Resources/MiniPDFL.framework/Versions/A/_CodeSignature/CodeResources</key>
+		<data>
+		JFkyleZIQx5jP7+V9uiS94Mbtio=
+		</data>
+		<key>Resources/XMPPLUGINUIDS.txt</key>
+		<data>
+		9tipFnbZzgT7QqeYrIBfqqf4hZs=
+		</data>
+	</dict>
+	<key>rules</key>
+	<dict>
+		<key>^Resources/</key>
+		<true/>
+		<key>^Resources/.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^Resources/.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^version.plist$</key>
+		<true/>
+	</dict>
+</dict>
+</plist>
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/Current b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/Current
new file mode 120000
index 0000000..8c7e5a6
--- /dev/null
+++ b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/Current
@@ -0,0 +1 @@
+A
\ No newline at end of file
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/Current/PDF_Handler b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/Current/PDF_Handler
deleted file mode 100644
index 3b78e73..0000000
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/Current/PDF_Handler
+++ /dev/null
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/Current/Resources/MODULE_IDENTIFIER.txt b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/Current/Resources/MODULE_IDENTIFIER.txt
deleted file mode 100644
index f7feb37..0000000
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/Current/Resources/MODULE_IDENTIFIER.txt
+++ /dev/null
@@ -1 +0,0 @@
-com.adobe.XMP.plugins.MiniPDFL
\ No newline at end of file
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/Current/Resources/MiniPDFL.framework/MiniPDFL b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/Current/Resources/MiniPDFL.framework/MiniPDFL
deleted file mode 100644
index e2ccca0..0000000
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/Current/Resources/MiniPDFL.framework/MiniPDFL
+++ /dev/null
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/Current/Resources/MiniPDFL.framework/Versions/A/MiniPDFL b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/Current/Resources/MiniPDFL.framework/Versions/A/MiniPDFL
deleted file mode 100644
index e2ccca0..0000000
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/Current/Resources/MiniPDFL.framework/Versions/A/MiniPDFL
+++ /dev/null
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/Current/Resources/MiniPDFL.framework/Versions/Current/MiniPDFL b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/Current/Resources/MiniPDFL.framework/Versions/Current/MiniPDFL
deleted file mode 100644
index e2ccca0..0000000
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/Current/Resources/MiniPDFL.framework/Versions/Current/MiniPDFL
+++ /dev/null
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/Current/Resources/XMPPLUGINUIDS.txt b/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/Current/Resources/XMPPLUGINUIDS.txt
deleted file mode 100644
index 3a8f7a9..0000000
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel/PDF_Handler.xpi/Versions/Current/Resources/XMPPLUGINUIDS.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PluginResource>
-	<Handler
-		Name="adobe.coretech.xmp.minipdfl"
-		Version="1.00"
-		HandlerType="OwningHandler"
-		>
-		<CheckFormat
-			Offset="0"
-			Length="4"
-			ByteSeq="%PDF"
-		/>
-		<Extensions>
-			<Extension Name="pdf" />
-			<Extension Name="pdfl" />
-		</Extensions>
-		<HandlerFlags>
-			<HandlerFlag Name="kXMPFiles_CanInjectXMP" />
-			<HandlerFlag Name="kXMPFiles_CanExpand" />
-			<HandlerFlag Name="kXMPFiles_CanRewrite" />
-			<HandlerFlag Name="kXMPFiles_AllowsOnlyXMP" />
-			<HandlerFlag Name="kXMPFiles_ReturnsRawPacket" />
-			<HandlerFlag Name="kXMPFiles_HandlerOwnsFile" />
-			<HandlerFlag Name="kXMPFiles_AllowsSafeUpdate" />
-		</HandlerFlags>
-		<SerializeOptions>
-			<SerializeOption Name="kXMP_OmitPacketWrapper" />
-		</SerializeOptions>
-	</Handler>
-</PluginResource>
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/PDF_Handler b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/PDF_Handler
index 6be8a04..f561ba7 100644..120000
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/PDF_Handler
+++ b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/PDF_Handler
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Resources b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Resources
new file mode 120000
index 0000000..953ee36
--- /dev/null
+++ b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Resources
@@ -0,0 +1 @@
+Versions/Current/Resources
\ No newline at end of file
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Resources/MODULE_IDENTIFIER.txt b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Resources/MODULE_IDENTIFIER.txt
deleted file mode 100644
index f7feb37..0000000
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Resources/MODULE_IDENTIFIER.txt
+++ /dev/null
@@ -1 +0,0 @@
-com.adobe.XMP.plugins.MiniPDFL
\ No newline at end of file
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Resources/MiniPDFL.framework/MiniPDFL b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Resources/MiniPDFL.framework/MiniPDFL
deleted file mode 100644
index fcbf308..0000000
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Resources/MiniPDFL.framework/MiniPDFL
+++ /dev/null
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Resources/MiniPDFL.framework/Versions/A/MiniPDFL b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Resources/MiniPDFL.framework/Versions/A/MiniPDFL
deleted file mode 100644
index fcbf308..0000000
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Resources/MiniPDFL.framework/Versions/A/MiniPDFL
+++ /dev/null
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Resources/MiniPDFL.framework/Versions/Current/MiniPDFL b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Resources/MiniPDFL.framework/Versions/Current/MiniPDFL
deleted file mode 100644
index fcbf308..0000000
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Resources/MiniPDFL.framework/Versions/Current/MiniPDFL
+++ /dev/null
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Resources/XMPPLUGINUIDS.txt b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Resources/XMPPLUGINUIDS.txt
deleted file mode 100644
index 3a8f7a9..0000000
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Resources/XMPPLUGINUIDS.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PluginResource>
-	<Handler
-		Name="adobe.coretech.xmp.minipdfl"
-		Version="1.00"
-		HandlerType="OwningHandler"
-		>
-		<CheckFormat
-			Offset="0"
-			Length="4"
-			ByteSeq="%PDF"
-		/>
-		<Extensions>
-			<Extension Name="pdf" />
-			<Extension Name="pdfl" />
-		</Extensions>
-		<HandlerFlags>
-			<HandlerFlag Name="kXMPFiles_CanInjectXMP" />
-			<HandlerFlag Name="kXMPFiles_CanExpand" />
-			<HandlerFlag Name="kXMPFiles_CanRewrite" />
-			<HandlerFlag Name="kXMPFiles_AllowsOnlyXMP" />
-			<HandlerFlag Name="kXMPFiles_ReturnsRawPacket" />
-			<HandlerFlag Name="kXMPFiles_HandlerOwnsFile" />
-			<HandlerFlag Name="kXMPFiles_AllowsSafeUpdate" />
-		</HandlerFlags>
-		<SerializeOptions>
-			<SerializeOption Name="kXMP_OmitPacketWrapper" />
-		</SerializeOptions>
-	</Handler>
-</PluginResource>
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/PDF_Handler b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/PDF_Handler
index 6be8a04..f86a8f2 100644..100755
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/PDF_Handler
+++ b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/PDF_Handler
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/Resources/Info.plist b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/Resources/Info.plist
new file mode 100755
index 0000000..5f9f27b
--- /dev/null
+++ b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/Resources/Info.plist
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildMachineOSBuild</key>
+	<string>12C60</string>
+	<key>CFBundleExecutable</key>
+	<string>PDF_Handler</string>
+	<key>CFBundleGetInfoString</key>
+	<string>PDF Handler 1.0, Copyright (c) 2002, Adobe Systems Incorporated</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.xmp.PDF_Handler</string>
+	<key>CFBundleName</key>
+	<string>PDF_Handler</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>PDF Handler 1.0</string>
+	<key>CFBundleSignature</key>
+	<string>XMP </string>
+	<key>Configuration</key>
+	<string>Release</string>
+	<key>DTCompiler</key>
+	<string>com.apple.compilers.llvm.clang.1_0</string>
+	<key>DTPlatformBuild</key>
+	<string>4H1003</string>
+	<key>DTPlatformVersion</key>
+	<string>GM</string>
+	<key>DTSDKBuild</key>
+	<string>11E52</string>
+	<key>DTSDKName</key>
+	<string>macosx10.7</string>
+	<key>DTXcode</key>
+	<string>0462</string>
+	<key>DTXcodeBuild</key>
+	<string>4H1003</string>
+	<key>FileVersion</key>
+	<string>1.0</string>
+	<key>ProductName</key>
+	<string>PDF Handler</string>
+	<key>ProductVersion</key>
+	<string>1.0</string>
+</dict>
+</plist>
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/Resources/MODULE_IDENTIFIER.txt b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/Resources/MODULE_IDENTIFIER.txt
index f7feb37..f7feb37 100644..100755
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/Resources/MODULE_IDENTIFIER.txt
+++ b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/Resources/MODULE_IDENTIFIER.txt
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/MiniPDFL b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/MiniPDFL
index fcbf308..1987270 100644..120000
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/MiniPDFL
+++ b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/MiniPDFL
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/Versions/A/MiniPDFL b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/Versions/A/MiniPDFL
index fcbf308..0a7ade0 100644..100755
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/Versions/A/MiniPDFL
+++ b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/Versions/A/MiniPDFL
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/Versions/A/Resources/Info.plist b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/Versions/A/Resources/Info.plist
new file mode 100755
index 0000000..a6802d8
--- /dev/null
+++ b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/Versions/A/Resources/Info.plist
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>AcrobatCL</key>
+	<string>448391</string>
+	<key>BuildDate</key>
+	<string>0000/00/00-00:00:00</string>
+	<key>BuildID</key>
+	<string>1</string>
+	<key>BuildVersion</key>
+	<string>1.00000</string>
+	<key>CFBundleGetInfoString</key>
+	<string>MiniPDFL 1.0.0.1, © 1987-2012 Adobe Systems Incorporated.
+ All Rights Reserved.</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.adobe.PDFL</string>
+	<key>CFBundleName</key>
+	<string>MiniPDFL</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0.0</string>
+	<key>CFBundleVersion</key>
+	<string>1.0.0.1</string>
+	<key>PDFL_IPID</key>
+	<string>&lt;AdobeIP#0000583&gt;</string>
+	<key>ReleaseCL</key>
+	<string>0</string>
+	<key>CFBundleExecutable</key>
+	<string>MiniPDFL</string>
+</dict>
+</plist>
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/Versions/A/_CodeSignature/CodeResources b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/Versions/A/_CodeSignature/CodeResources
new file mode 100755
index 0000000..1a6dbbe
--- /dev/null
+++ b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/Versions/A/_CodeSignature/CodeResources
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>files</key>
+	<dict>
+		<key>Resources/Info.plist</key>
+		<data>
+		KBfTLqg0rGVKlSJbAITSqWlk+rA=
+		</data>
+	</dict>
+	<key>rules</key>
+	<dict>
+		<key>^Resources/</key>
+		<true/>
+		<key>^Resources/.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^Resources/.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^version.plist$</key>
+		<true/>
+	</dict>
+</dict>
+</plist>
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/Versions/Current b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/Versions/Current
new file mode 120000
index 0000000..8c7e5a6
--- /dev/null
+++ b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/Versions/Current
@@ -0,0 +1 @@
+A
\ No newline at end of file
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/Versions/Current/MiniPDFL b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/Versions/Current/MiniPDFL
deleted file mode 100644
index fcbf308..0000000
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/Resources/MiniPDFL.framework/Versions/Current/MiniPDFL
+++ /dev/null
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/Resources/XMPPLUGINUIDS.txt b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/Resources/XMPPLUGINUIDS.txt
index 3a8f7a9..9524754 100644..100755
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/Resources/XMPPLUGINUIDS.txt
+++ b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/Resources/XMPPLUGINUIDS.txt
@@ -1,30 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PluginResource>
-	<Handler
-		Name="adobe.coretech.xmp.minipdfl"
-		Version="1.00"
-		HandlerType="OwningHandler"
-		>
-		<CheckFormat
-			Offset="0"
-			Length="4"
-			ByteSeq="%PDF"
-		/>
-		<Extensions>
-			<Extension Name="pdf" />
-			<Extension Name="pdfl" />
-		</Extensions>
-		<HandlerFlags>
-			<HandlerFlag Name="kXMPFiles_CanInjectXMP" />
-			<HandlerFlag Name="kXMPFiles_CanExpand" />
-			<HandlerFlag Name="kXMPFiles_CanRewrite" />
-			<HandlerFlag Name="kXMPFiles_AllowsOnlyXMP" />
-			<HandlerFlag Name="kXMPFiles_ReturnsRawPacket" />
-			<HandlerFlag Name="kXMPFiles_HandlerOwnsFile" />
-			<HandlerFlag Name="kXMPFiles_AllowsSafeUpdate" />
-		</HandlerFlags>
-		<SerializeOptions>
-			<SerializeOption Name="kXMP_OmitPacketWrapper" />
-		</SerializeOptions>
-	</Handler>
-</PluginResource>
+<?xml version="1.0" encoding="UTF-8"?>

+<PluginResource Architecture="x64">

+	<Handler

+		Name="adobe.coretech.xmp.minipdfl"

+		Version="1.00"

+		HandlerType="OwningHandler"

+		>

+		<CheckFormat

+			Offset="0"

+			Length="4"

+			ByteSeq="%PDF"

+		/>

+		<Extensions>

+			<Extension Name="pdf" />

+			<Extension Name="pdfl" />

+		</Extensions>

+		<HandlerFlags>

+			<HandlerFlag Name="kXMPFiles_CanInjectXMP" />

+			<HandlerFlag Name="kXMPFiles_CanExpand" />

+			<HandlerFlag Name="kXMPFiles_CanRewrite" />

+			<HandlerFlag Name="kXMPFiles_AllowsOnlyXMP" />

+			<HandlerFlag Name="kXMPFiles_ReturnsRawPacket" />

+			<HandlerFlag Name="kXMPFiles_HandlerOwnsFile" />

+			<HandlerFlag Name="kXMPFiles_AllowsSafeUpdate" />

+			<HandlerFlag Name="kXMPFiles_NeedsPreloading" />

+		</HandlerFlags>

+		<SerializeOptions>

+			<SerializeOption Name="kXMP_OmitPacketWrapper" />

+		</SerializeOptions>

+	</Handler>

+</PluginResource>

diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/_CodeSignature/CodeResources b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/_CodeSignature/CodeResources
new file mode 100755
index 0000000..46899d4
--- /dev/null
+++ b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/A/_CodeSignature/CodeResources
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>files</key>
+	<dict>
+		<key>Resources/Info.plist</key>
+		<data>
+		cxBH0mqNlfVocAleoSEP8L3ySkE=
+		</data>
+		<key>Resources/MODULE_IDENTIFIER.txt</key>
+		<data>
+		eJbkRFTOj20cUgbc17vH6f5HfH0=
+		</data>
+		<key>Resources/MiniPDFL.framework/Versions/A/MiniPDFL</key>
+		<data>
+		IClNNaLjTqAjuNGn7uH8JKs42r4=
+		</data>
+		<key>Resources/MiniPDFL.framework/Versions/A/Resources/Info.plist</key>
+		<data>
+		KBfTLqg0rGVKlSJbAITSqWlk+rA=
+		</data>
+		<key>Resources/MiniPDFL.framework/Versions/A/_CodeSignature/CodeResources</key>
+		<data>
+		JFkyleZIQx5jP7+V9uiS94Mbtio=
+		</data>
+		<key>Resources/XMPPLUGINUIDS.txt</key>
+		<data>
+		y2yLBMTDcHYtCJjuYnCa1hEtl+c=
+		</data>
+	</dict>
+	<key>rules</key>
+	<dict>
+		<key>^Resources/</key>
+		<true/>
+		<key>^Resources/.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^Resources/.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^version.plist$</key>
+		<true/>
+	</dict>
+</dict>
+</plist>
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/Current b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/Current
new file mode 120000
index 0000000..8c7e5a6
--- /dev/null
+++ b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/Current
@@ -0,0 +1 @@
+A
\ No newline at end of file
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/Current/PDF_Handler b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/Current/PDF_Handler
deleted file mode 100644
index 6be8a04..0000000
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/Current/PDF_Handler
+++ /dev/null
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/Current/Resources/MODULE_IDENTIFIER.txt b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/Current/Resources/MODULE_IDENTIFIER.txt
deleted file mode 100644
index f7feb37..0000000
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/Current/Resources/MODULE_IDENTIFIER.txt
+++ /dev/null
@@ -1 +0,0 @@
-com.adobe.XMP.plugins.MiniPDFL
\ No newline at end of file
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/Current/Resources/MiniPDFL.framework/MiniPDFL b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/Current/Resources/MiniPDFL.framework/MiniPDFL
deleted file mode 100644
index fcbf308..0000000
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/Current/Resources/MiniPDFL.framework/MiniPDFL
+++ /dev/null
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/Current/Resources/MiniPDFL.framework/Versions/A/MiniPDFL b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/Current/Resources/MiniPDFL.framework/Versions/A/MiniPDFL
deleted file mode 100644
index fcbf308..0000000
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/Current/Resources/MiniPDFL.framework/Versions/A/MiniPDFL
+++ /dev/null
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/Current/Resources/MiniPDFL.framework/Versions/Current/MiniPDFL b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/Current/Resources/MiniPDFL.framework/Versions/Current/MiniPDFL
deleted file mode 100644
index fcbf308..0000000
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/Current/Resources/MiniPDFL.framework/Versions/Current/MiniPDFL
+++ /dev/null
diff --git a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/Current/Resources/XMPPLUGINUIDS.txt b/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/Current/Resources/XMPPLUGINUIDS.txt
deleted file mode 100644
index 3a8f7a9..0000000
--- a/XMPFilesPlugins/PDF_Handler/macintosh/intel_64/PDF_Handler.xpi/Versions/Current/Resources/XMPPLUGINUIDS.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PluginResource>
-	<Handler
-		Name="adobe.coretech.xmp.minipdfl"
-		Version="1.00"
-		HandlerType="OwningHandler"
-		>
-		<CheckFormat
-			Offset="0"
-			Length="4"
-			ByteSeq="%PDF"
-		/>
-		<Extensions>
-			<Extension Name="pdf" />
-			<Extension Name="pdfl" />
-		</Extensions>
-		<HandlerFlags>
-			<HandlerFlag Name="kXMPFiles_CanInjectXMP" />
-			<HandlerFlag Name="kXMPFiles_CanExpand" />
-			<HandlerFlag Name="kXMPFiles_CanRewrite" />
-			<HandlerFlag Name="kXMPFiles_AllowsOnlyXMP" />
-			<HandlerFlag Name="kXMPFiles_ReturnsRawPacket" />
-			<HandlerFlag Name="kXMPFiles_HandlerOwnsFile" />
-			<HandlerFlag Name="kXMPFiles_AllowsSafeUpdate" />
-		</HandlerFlags>
-		<SerializeOptions>
-			<SerializeOption Name="kXMP_OmitPacketWrapper" />
-		</SerializeOptions>
-	</Handler>
-</PluginResource>
diff --git a/XMPFilesPlugins/PDF_Handler/windows/windows/MiniPDFL.dll b/XMPFilesPlugins/PDF_Handler/windows/windows/MiniPDFL.dll
index 375cf35..52f57e5 100644
--- a/XMPFilesPlugins/PDF_Handler/windows/windows/MiniPDFL.dll
+++ b/XMPFilesPlugins/PDF_Handler/windows/windows/MiniPDFL.dll
diff --git a/XMPFilesPlugins/PDF_Handler/windows/windows/PDF_Handler.xpi b/XMPFilesPlugins/PDF_Handler/windows/windows/PDF_Handler.xpi
index cf15486..24ee503 100644
--- a/XMPFilesPlugins/PDF_Handler/windows/windows/PDF_Handler.xpi
+++ b/XMPFilesPlugins/PDF_Handler/windows/windows/PDF_Handler.xpi
diff --git a/XMPFilesPlugins/PDF_Handler/windows/windows_x64/MiniPDFL.dll b/XMPFilesPlugins/PDF_Handler/windows/windows_x64/MiniPDFL.dll
index ffff6f8..b176a35 100644
--- a/XMPFilesPlugins/PDF_Handler/windows/windows_x64/MiniPDFL.dll
+++ b/XMPFilesPlugins/PDF_Handler/windows/windows_x64/MiniPDFL.dll
diff --git a/XMPFilesPlugins/PDF_Handler/windows/windows_x64/PDF_Handler.xpi b/XMPFilesPlugins/PDF_Handler/windows/windows_x64/PDF_Handler.xpi
index a74a17d..0947fea 100644
--- a/XMPFilesPlugins/PDF_Handler/windows/windows_x64/PDF_Handler.xpi
+++ b/XMPFilesPlugins/PDF_Handler/windows/windows_x64/PDF_Handler.xpi
diff --git a/XMPFilesPlugins/PluginTemplate/build/CMakeLists.txt b/XMPFilesPlugins/PluginTemplate/build/CMakeLists.txt
new file mode 100644
index 0000000..d403202
--- /dev/null
+++ b/XMPFilesPlugins/PluginTemplate/build/CMakeLists.txt
@@ -0,0 +1,185 @@
+# =================================================================================================
+# ADOBE SYSTEMS INCORPORATED
+# Copyright 2013 Adobe Systems Incorporated
+# All Rights Reserved
+#
+# NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
+# of the Adobe license agreement accompanying it.
+# =================================================================================================
+
+# ==============================================================================
+# define minimum cmake version
+cmake_minimum_required(VERSION 2.8.6)
+
+SET(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Configurations" FORCE)
+# Enable folder grouping of projects in IDEs
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
+# ==============================================================================
+# This project
+# ==============================================================================
+set(PRODUCT_NAME PluginTemplate)
+set(TARGET_NAME ${PRODUCT_NAME})
+
+if(CMAKE_CL_64)
+	project(${TARGET_NAME}64)
+    set(BITS 64)
+else()
+	project(${TARGET_NAME})
+    set(BITS 32)
+endif()
+
+# ==============================================================================
+# Shared config
+# ==============================================================================
+# setup some values before calling shared config
+set(XMP_THIS_PROJECT_RELATIVEPATH "../../..")
+
+include(${CMAKE_CURRENT_SOURCE_DIR}/${XMP_THIS_PROJECT_RELATIVEPATH}/build/XMP_Config.cmake)
+
+# ==============================================================================
+# Add or overwite shared config variables
+# ==============================================================================
+# Windows specific
+if(WIN32)
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_WINDOWS")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WINDOWS")
+	SET(CMAKE_EXE_LINKER_FLAGS /NODEFAULTLIB:LIBCMT)
+endif()
+
+# all platform
+set(CXX_FLAGS_DEBUG "-D_DEBUG=1 -DDEBUG=1")
+set(CXX_FLAGS_RELEASE "-DNDEBUG=1")
+
+# ==============================================================================
+# Locations
+# ==============================================================================
+SetPluginOutputPath()
+
+# ==============================================================================
+# For convenience we define the sources as a variable. You can add 
+# header files and cpp/c files and CMake will sort them out
+# ==============================================================================
+
+AddPluginApiFiles("../../..")
+
+list (APPEND COMMON_SOURCE_FILES ${XMPROOT_DIR}/source/UnicodeConversions.cpp)
+list (APPEND COMMON_SOURCE_FILES ${XMPROOT_DIR}/source/PerfUtils.cpp)
+list (APPEND COMMON_SOURCE_FILES ${XMPROOT_DIR}/source/XMP_ProgressTracker.cpp)
+if(UNIX)
+	list(APPEND COMMON_SOURCE_FILES ${XMPROOT_DIR}/source/Host_IO-POSIX.cpp)
+else()
+	list(APPEND COMMON_SOURCE_FILES ${XMPROOT_DIR}/source/Host_IO-Win.cpp)
+endif()
+source_group("Source Files\\common" FILES ${COMMON_SOURCE_FILES})
+
+list(APPEND SOURCE_FILES
+	${SOURCE_ROOT}/Template_Handler.cpp
+	)
+source_group("Source Files" FILES ${SOURCE_FILES})
+
+# resources
+AddPluginResourceFiles()
+
+# merge list elements
+list(APPEND SOURCE_FILES ${API_INCLUDE_FILES} ${API_SOURCE_FILES} ${COMMON_SOURCE_FILES} ${SOURCE_FILES} ${RESOURCE_FILES})
+
+# include directories
+include_directories(
+	${XMPROOT_DIR}
+	${XMPROOT_DIR}/public/include
+)
+if(UNIX)
+	if(APPLE)
+		set(XMPCORE_LIB "XMPCoreStatic")
+	else(APPLE)
+		set(XMPCORE_LIB "staticXMPCore")
+	endif(APPLE)
+else(UNIX)
+	if(WIN32)
+		set(XMPCORE_LIB "XMPCoreStatic")
+	endif(WIN32)
+endif(UNIX)
+#setting up XMP_BUILDMODE_DIR variable
+SetupInternalBuildDirectory()
+#link directories
+link_directories(${XMPROOT_DIR}/public/libraries/${XMP_PLATFORM_FOLDER})
+# ==============================================================================
+# Define what to do, lib, exe, etc
+set(DEPENDENCY_LIST "LIB:$(XMPCORE_LIB)")
+AddLibraryAndDependencies("${TARGET_NAME}" "${XMP_BUILD_STATIC}" "YES" "SHARED" "SOURCE_FILES" "DEPENDENCY_LIST")
+# ==============================================================================
+# Link dependencies
+
+if(WIN32)
+	target_link_libraries(
+		${TARGET_NAME}
+		${XMPCORE_LIB}
+		${XMP_PLATFORM_LINK}
+	)
+else(WIN32)
+	if(UNIX AND NOT APPLE)
+		target_link_libraries(
+			${TARGET_NAME}
+			${XMPROOT_DIR}/public/libraries/${XMP_PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}.ar 
+			${XMP_PLATFORM_LINK}
+		)
+	else(UNIX AND NOT APPLE)
+		target_link_libraries(
+			${TARGET_NAME}
+			${XMPCORE_LIB}
+		)
+	endif()
+endif()
+
+set(FRAMEWORK_LIST "Mac:CoreFoundation" "Mac:Foundation" "Mac:CoreServices"  "Mac:${XMP_PLATFORM_LINK}")
+AddMacFramework(${TARGET_NAME} FRAMEWORK_LIST)
+
+
+SetWinLinkFlags(${TARGET_NAME} "" "${TARGET_NAME}")
+
+if(APPLE)
+	set_target_properties(${TARGET_NAME} PROPERTIES BUILD_WITH_INSTALL_RPATH ON INSTALL_NAME_DIR "@executable_path/../Frameworks")
+endif()
+
+set(DEPEND_LIBS "")
+CreatePlugin(${TARGET_NAME} ${XMPPLUGIN_OUTPUT_DIR} "${PROJECT_ROOT}/resource/txt/*.txt" XMP_PLUGIN_DEPENDENCIES DEPEND_LIBS)
+
+# ==============================================================================
+# Post build
+# ==============================================================================
+
+if (UNIX)
+	if(APPLE)
+		add_custom_command (TARGET ${TARGET_NAME} POST_BUILD 
+			COMMAND cp -f ${PROJECT_ROOT}/resource/txt/MODULE_IDENTIFIER.txt ${XMPPLUGIN_OUTPUT_DIR}/${TARGET_NAME}.xpi/Versions/A/Resources/MODULE_IDENTIFIER.txt
+			COMMAND cp -f ${PROJECT_ROOT}/resource/txt/XMPPLUGINUIDS-${BITS}.txt ${XMPPLUGIN_OUTPUT_DIR}/${TARGET_NAME}.xpi/Versions/A/Resources/XMPPLUGINUIDS.txt
+			COMMENT "Copy resource")
+	else()
+		if((${CMAKE_BUILD_TYPE} MATCHES "Debug") OR (${CMAKE_BUILD_TYPE} MATCHES "debug") )
+			add_custom_command (TARGET ${TARGET_NAME}
+				POST_BUILD
+				COMMAND ls -l ${XMPPLUGIN_OUTPUT_DIR}/${TARGET_NAME}.xpi
+			)
+		else()
+			add_custom_command (TARGET ${TARGET_NAME}
+				POST_BUILD
+				COMMAND strip ${XMPPLUGIN_OUTPUT_DIR}/${TARGET_NAME}.xpi
+				COMMAND ls -l ${XMPPLUGIN_OUTPUT_DIR}/${TARGET_NAME}.xpi
+			)
+		endif()
+		add_custom_command (TARGET ${TARGET_NAME} POST_BUILD 
+			COMMAND mkdir -p ${XMPPLUGIN_OUTPUT_DIR}/${TARGET_NAME}.resources
+			COMMAND cp -f ${PROJECT_ROOT}/resource/txt/MODULE_IDENTIFIER.txt ${XMPPLUGIN_OUTPUT_DIR}/${TARGET_NAME}.resources/MODULE_IDENTIFIER.txt
+			COMMAND cp -f ${PROJECT_ROOT}/resource/txt/XMPPLUGINUIDS-${BITS}.txt ${XMPPLUGIN_OUTPUT_DIR}/${TARGET_NAME}.resources/XMPPLUGINUIDS.txt
+			COMMENT "Copy resource")
+	endif()
+endif()
+# ==============================================================================
+# configuration feedback
+# ==============================================================================
+
+message (STATUS "===========================================================================")
+message (STATUS " ${TARGET_NAME}		")
+message (STATUS "===========================================================================")
+
diff --git a/XMPFilesPlugins/PluginTemplate/build/GeneratePluginTemplate_mac.sh b/XMPFilesPlugins/PluginTemplate/build/GeneratePluginTemplate_mac.sh
new file mode 100755
index 0000000..2df9075
--- /dev/null
+++ b/XMPFilesPlugins/PluginTemplate/build/GeneratePluginTemplate_mac.sh
@@ -0,0 +1,81 @@
+#!/bin/bash 
+# =================================================================================================
+# ADOBE SYSTEMS INCORPORATED
+# Copyright 2013 Adobe Systems Incorporated
+# All Rights Reserved
+#
+# NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
+# of the Adobe license agreement accompanying it.
+# =================================================================================================
+clear
+# Get the absolute path of the script
+abspath=$(cd ${0%/*} && echo $PWD/${0##*/})
+scriptFolder=$(dirname "$abspath" | tr -s "\n" "/")
+cmake_buildbitdepth='On'
+clean()
+{
+echo "Cleaning..."
+if [ -e xcode ] 
+then
+rm -rf xcode
+fi	
+
+echo "Done"
+exit 0;
+}
+Generate()
+{
+cd  "$scriptFolder" >/dev/null
+if [ ! -e "$cmakedir" ]; then
+mkdir -p "$cmakedir"
+fi 
+cd "$cmakedir"
+CMAKE="$scriptFolder/../../../tools/cmake/bin/CMake.app/Contents/bin/cmake"
+echo "$CMAKE  ../../ -G Xcode -DCMAKE_CL_64=$cmake_buildbitdepth -DXMP_CMAKEFOLDER_NAME=$cmakedir -DXMP_BUILD_STATIC=Off -DCMAKE_TOOLCHAIN_FILE=$TOOLCHAIN "
+"$CMAKE"  ../../ -G"Xcode" -DCMAKE_CL_64="$cmake_buildbitdepth" -DXMP_CMAKEFOLDER_NAME="$cmakedir" -DXMP_BUILD_STATIC="Off" -DCMAKE_TOOLCHAIN_FILE="$TOOLCHAIN" 
+if [  $? -ne 0 ]
+then
+echo "ERROR: CMAKE tool failed"
+exit 1
+else
+echo "Xcode project created successfully"
+fi
+}
+
+PLuginTemplate32()
+{
+#create 32bit Xcode Project
+cmake_buildbitdepth='Off'
+cmakedir="xcode/intel"
+BITS="32"
+TOOLCHAIN="$scriptFolder/../../../build/shared/ToolchainLLVM.cmake"
+Generate
+}
+PLuginTemplate64()
+{
+#create 64bit Xcode Project
+cmake_buildbitdepth='On'
+cmakedir="xcode/intel_64"
+BITS="64"
+TOOLCHAIN="$scriptFolder/../../../build/shared/ToolchainLLVM.cmake"
+Generate
+}
+
+echo "Enter your choice:"
+echo "1. Clean All"
+echo "2. Generate PLuginTemplate 32"
+echo "3. Generate PluginTemplate 64"
+echo "4. Generate All"
+
+
+read choice
+
+case $choice in
+1) clean; break;;
+2) PLuginTemplate32;;
+3) PLuginTemplate64;;
+4) PLuginTemplate32; PLuginTemplate64;;
+*) echo "ERROR: Invalid Choice, Exiting"; exit 1;;
+esac
+
+exit 0
diff --git a/XMPFilesPlugins/PluginTemplate/build/GeneratePluginTemplate_win.bat b/XMPFilesPlugins/PluginTemplate/build/GeneratePluginTemplate_win.bat
new file mode 100755
index 0000000..9183dfb
--- /dev/null
+++ b/XMPFilesPlugins/PluginTemplate/build/GeneratePluginTemplate_win.bat
@@ -0,0 +1,100 @@
+:: =================================================================================================
+:: Copyright 2013 Adobe Systems Incorporated
+:: All Rights Reserved.
+::
+:: NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
+:: of the Adobe license agreement accompanying it.
+:: =================================================================================================
+
+echo OFF
+cls
+set CMAKE=..\..\..\tools\cmake\bin\cmake.exe
+set workingDir=%~dp0%
+set CMAKE=%workingDir%%relPath%%CMAKE%
+set CMAKE_BUILDSTATIC=Off
+set BITS64=ON
+
+if NOT exist %CMAKE% ( ECHO Cmake tool not present at %CMAKE%, cannot proceed 
+pause
+exit /B 0)
+
+ECHO Enter your choice:
+ECHO 1. Clean All
+ECHO 2. Generate PluginTemplate Dynamic Win32
+ECHO 3. Generate PluginTemplate Dynamic   x64
+ECHO 4. Generate Both
+
+
+ECHO
+set /P choice=Enter your choice:
+
+ECHO your choice is %choice%
+
+set GENERATE_ALL=Off
+set NEXT_LABEL=ok
+
+IF "%choice%"=="1" GOTO CLEANALL
+IF "%choice%"=="2" GOTO 32DLL
+IF "%choice%"=="3" GOTO 64DLL
+IF "%choice%"=="4" GOTO GENALL
+
+ECHO Invalid Choice, Exiting
+pause
+exit /B 0
+
+:GENALL
+set GENERATE_ALL=On
+
+:32DLL
+echo "Generating PluginTemplate Dynamic Win32"
+set GENERATOR=Visual Studio 10
+set BITS64=OFF
+set CMakeFolder="vc10/windows"
+set CMake_ARCH=x86
+IF "%GENERATE_ALL%"=="On" (
+	set NEXT_LABEL=64DLL
+)
+GOTO GenerateNow
+
+
+:64DLL
+echo "Generating PluginTemplate Dynamic x64"
+set GENERATOR=Visual Studio 10 Win64
+set BITS64=ON
+set CMakeFolder="vc10/windows_x64"
+set CMake_ARCH=x64
+IF "%GENERATE_ALL%"=="On" (
+	set NEXT_LABEL=ok
+)
+GOTO GenerateNow
+
+
+
+:GenerateNow
+echo CMakeFolder: %CMakeFolder%
+mkdir %CMakeFolder%
+cd %CMakeFolder%
+echo %CMAKE% ../../. -G"%GENERATOR%" -DCMAKE_CL_64=%BITS64% -DXMP_CMAKEFOLDER_NAME=%CMakeFolder% -DCMAKE_ARCH=%CMake_ARCH% -DXMP_BUILD_STATIC="%CMAKE_BUILDSTATIC%"
+%CMAKE% ../../. -G"%GENERATOR%" -DCMAKE_CL_64=%BITS64% -DXMP_CMAKEFOLDER_NAME=%CMakeFolder% -DCMAKE_ARCH=%CMake_ARCH% -DXMP_BUILD_STATIC="%CMAKE_BUILDSTATIC%"
+cd ..\..
+if errorlevel 1 goto error
+goto %NEXT_LABEL%
+
+:error
+cd ..\..
+echo Failed %PROJECT% build cmake.
+pause
+exit /B 1
+
+
+:ok
+echo Success %PROJECT% build cmake.
+pause
+exit /B 0
+
+:CLEANALL
+echo "Cleaning..."
+if exist vc10 rmdir /S /Q vc10
+echo "Done"
+pause
+exit /B 0
diff --git a/XMPFilesPlugins/PluginTemplate/build/Makefile b/XMPFilesPlugins/PluginTemplate/build/Makefile
new file mode 100755
index 0000000..5582359
--- /dev/null
+++ b/XMPFilesPlugins/PluginTemplate/build/Makefile
@@ -0,0 +1,65 @@
+# =================================================================================================
+# ADOBE SYSTEMS INCORPORATED
+# Copyright 2013 Adobe Systems Incorporated
+# All Rights Reserved
+#
+# NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
+# of the Adobe license agreement accompanying it.
+# =================================================================================================
+
+CURRDIR := $(shell dirname "$(realpath $(lastword $(MAKEFILE_LIST)))")
+arch=$(shell getconf LONG_BIT)
+CMAKE="$(CURRDIR)/../../../tools/cmake/bin/cmake"
+TOOLCHAIN="$(CURRDIR)/../../../build/shared/ToolchainGCC.cmake"
+
+# Default target executed when no arguments are given to make.
+default_target: all
+
+# target to generate make files using cmake
+Release32: DIR=./gcc/i80386linux/Release/
+Release32:
+ifeq ($(arch),32)
+	mkdir -p $(DIR) || echo "Unable to create Directory $(DIR)"; \
+	cd $(DIR) || echo "unable to Change Directory $(DIR)" ; \
+	${MAKE} -C "$(CURRDIR)/../../../build/" StaticRelease32 ; \
+	$(CMAKE) -D CMAKE_CL_64=0 -DCMAKE_BUILD_TYPE=Release -G "Unix Makefiles"  -DCMAKE_TOOLCHAIN_FILE=$(TOOLCHAIN) ../../../.
+	${MAKE} -C $(DIR)
+endif
+
+
+Debug32: DIR=./gcc/i80386linux/Debug/
+Debug32:
+ifeq ($(arch),32)
+	mkdir -p $(DIR) || echo "Unable to create Directory $(DIR)"; \
+	cd $(DIR) || echo "unable to Change Directory $(DIR)" ; \
+	${MAKE} -C "$(CURRDIR)/../../../build/" StaticDebug32 ; \
+	$(CMAKE) -D CMAKE_CL_64=0 -DCMAKE_BUILD_TYPE=Debug -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=$(TOOLCHAIN) ../../../.
+	${MAKE} -C $(DIR)
+endif
+
+Release64: DIR=./gcc/i80386linux_x64/Release/
+Release64:
+ifeq ($(arch),64)
+	mkdir -p $(DIR) || echo "Unable to create Directory $(DIR)"; \
+	cd $(DIR) || echo "unable to Change Directory $(DIR)" ; \
+	${MAKE} -C "$(CURRDIR)/../../../build/" StaticRelease64 ; \
+	$(CMAKE) -D CMAKE_CL_64=1 -DCMAKE_BUILD_TYPE=Release -G "Unix Makefiles"  -DCMAKE_TOOLCHAIN_FILE=$(TOOLCHAIN) ../../../.
+	${MAKE} -C $(DIR)
+endif
+
+Debug64: DIR=./gcc/i80386linux_x64/Debug/
+Debug64:
+ifeq ($(arch),64)
+	mkdir -p $(DIR) || echo "Unable to create Directory $(DIR)"; \
+	cd $(DIR) || echo "unable to Change Directory $(DIR)" ; \
+	${MAKE} -C "$(CURRDIR)/../../../build/" StaticDebug64 ; \
+	$(CMAKE) -D CMAKE_CL_64=1 -DCMAKE_BUILD_TYPE=Debug -G "Unix Makefiles"  -DCMAKE_TOOLCHAIN_FILE=$(TOOLCHAIN) ../../../.
+	${MAKE} -C $(DIR)
+endif
+
+all: Release32 Debug32 Release64 Debug64
+
+
+clean:
+	test -d gcc && rm -rf gcc
+	
\ No newline at end of file
diff --git a/XMPFilesPlugins/PluginTemplate/build/README.txt b/XMPFilesPlugins/PluginTemplate/build/README.txt
new file mode 100644
index 0000000..207b57c
--- /dev/null
+++ b/XMPFilesPlugins/PluginTemplate/build/README.txt
@@ -0,0 +1,20 @@
+Building Template Plugin Projects:

+

+Windows:

+

+1. Double Click "GenerateSamples_win.bat" or run it through command prompt.

+2. Enter the type of project to create

+3. The project files will be created in vc10\windows or vc10\windows_x64 folder

+

+Mac:

+

+1. Run the shell script GenerateSamples_mac.sh.

+2. Enter the type of project to create

+3. The project files will be created in xcode\intel or xcode\intel_64 folder

+

+Linux:

+

+1. Run the Makefile. This Makefile will call cmake to generate the makefile for all the template plugin projects. Also all the projects will be built automatically.

+2. All the template plugin project makefiles will be created in gcc folder.

+3. The template plugins will be built in ../../public folder.

+4. Make sure the gcc location is added to $PATH and its libraries location to $LD_LIBRARY_PATH. There is a need to add libuuid.so library path to the $LD_LIBRARY_PATH as well. Refer the ReadMe.txt present in <xmp-sdk>/build folder for more information around setting relevant gcc path on linux.

diff --git a/XMPFilesPlugins/PluginTemplate/build/gcc/PluginCommon.mak b/XMPFilesPlugins/PluginTemplate/build/gcc/PluginCommon.mak
deleted file mode 100644
index e1330cd..0000000
--- a/XMPFilesPlugins/PluginTemplate/build/gcc/PluginCommon.mak
+++ /dev/null
@@ -1,271 +0,0 @@
-# ==================================================================================================
-# Copyright 2011 Adobe Systems Incorporated
-# All Rights Reserved.
-#
-# NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-# of the Adobe license agreement accompanying it.
-# ==================================================================================================
-
-# --------------------------------------------------------------------
-# Make sure the stage (debug/release) and mode (dll/static) are known.
-
-Error =
-
-TargetOS = ${os}
-ifneq "${TargetOS}" "i80386linux"
-	Error += Invalid target OS "${TargetOS}"
-endif
-
-TargetStage = ${stage}
-ifneq "${TargetStage}" "debug"
-	ifneq "${TargetStage}" "release"
-		Error += Invalid target stage "${TargetStage}"
-	endif
-endif
-
-TargetMode = ${mode}
-ifneq "${TargetMode}" "dll"
-	ifneq "${TargetMode}" "static"
-		Error += Invalid target mode "${TargetMode}"
-	endif
-endif
-
-TargetArch = ${arch}
-ifeq "${TargetArch}" ""
-	Error += Unspecified target architecture "${TargetArch}"
-else
-	ifneq "${TargetArch}" "x86"
-		ifneq "${TargetArch}" "x64"
-			Error += Invalid target architecture "${TargetArch}"
-		endif
-	endif
-endif
-
-# ensure libpath is set:
-LibraryPath = ${libpath}
-ifeq "${libpath}" ""
-	Error += Unspecified library path. Must set libpath=...
-endif
-
-# ------------------------------------------------------------
-# Define variables for input and output directories and files.
-
-ProjectRoot = ../..
-PluginsRoot = ../../..
-ToolkitRoot = ../../../..
-
-x64_ext =
-ifeq "${TargetArch}" "x64"
-	x64_ext = _x64
-endif
-
-LibRoot    = ${ToolkitRoot}/public/libraries/${TargetOS}${x64_ext}/${TargetStage}
-TempRoot   = ${PluginsRoot}/temp/${PluginName}/${TargetOS}${x64_ext}/${TargetStage}/${TargetMode}
-TargetRoot = ${PluginsRoot}/public/${TargetOS}${x64_ext}/${TargetStage}
-
-ResourceSource = ${ProjectRoot}/build/resource/txt
-ResourceDest   = ${TargetRoot}/${PluginName}.resources
-
-ifeq "${TargetMode}" "dll"
-	LibName = ${TargetRoot}/${PluginName}.xpi
-else
-	LibName = ${TargetRoot}/static${PluginName}${x64_ext}.ar
-	ModeOpt = -DXMP_StaticBuild=1
-endif
-
-# ==================================================================================================
-
-# ------------------------------------------
-# Define compile and link tools and options.
-ToolName = gcc
-LibPathVar = LD_LIBRARY_PATH
-ifeq "${TargetOS}" "hppahpux"
-	LibPathVar = SHLIB_PATH
-endif
-
-ToolPath = ${PATH}
-Compile = PATH=${ToolPath} ${ToolName}
-Link    = PATH=${ToolPath} ${LibPathVar}=${LibraryPath} ${ToolName}
-
-# Do something innocuous by default for Strip.
-Strip = ls -l
-
-ifeq "${TargetStage}" "release"
-	Strip = PATH=${ToolPath} strip
-
-	ifeq "${TargetOS}" "rs6000aix"
-		Strip = PATH=/usr/bin strip
-	endif
-
-	ifeq "${TargetOS}" "hppahpux"
-		# Don't have a good gcc strip on HPUX yet.
-		Strip = ls
-	endif
-endif
-
-CPPFlags =
-
-XMPDefines = -DUNIX_ENV=1 -DAdobePrivate=1 -DHAVE_EXPAT_CONFIG_H=1 -DXML_STATIC=1 ${ModeOpt}
-
-ifeq "${TargetArch}" "x64"
-	XMPDefines += -DXMP_64=1 -D__x86_64__=1
-endif
-
-DashG = -g
-
-ifeq "${TargetStage}" "debug"
-	CompileFlags = ${DashG} -O0 -DDEBUG=1 -D_DEBUG=1
-endif
-
-OptFlags = -O2 -Os
-
-ifeq "${TargetStage}" "release"
-	CompileFlags = ${OptFlags} -DNDEBUG=1
-endif
-
-Includes += \
-   -I${ToolkitRoot} \
-   -I${ToolkitRoot}/public/include \
-   -I${PluginsRoot}/api/source \
-   -I${ProjectRoot}/source
-
-# --------------------------------
-# Define settings specific to gcc.
-
-CPPFlags = -x c++ -Wno-ctor-dtor-privacy
-
-CompileFlags += -fPIC -funsigned-char -fexceptions -D_FILE_OFFSET_BITS=64
-CompileFlags += -Wno-multichar -Wno-implicit
-
-LinkFlags = -shared -z defs
-#LinkFlags  = -shared -fPIC -z defs -Wl,-z,relro -Wl,-z,now
-#LinkFlags += -Xlinker -Bsymbolic -Xlinker --version-script -Xlinker XMPCore.ex
-
-RuntimeLibs += -lc -lm -lpthread -L${LibPath} -Bdynamic -lstdc++ -shared-libgcc 
-
-ifeq "${TargetOS}" "i80386linux"
-	ifeq "${TargetArch}" "x86"
-		CompileFlags += -m32 -mtune=i686
-		LinkFlags    += -m32
-	else
-		CompileFlags += -m64
-		LinkFlags    += -m64
-	endif
-	LinkFlags += -Wl,-rpath,'$$ORIGIN'
-endif
-
-# ==================================================================================================
-# Define the set of source files.
-
-vpath %.incl_cpp \
-    ${ToolkitRoot}/public/include: \
-    ${ToolkitRoot}/public/include/client-glue:
-
-vpath %.c \
-    ${ProjectRoot}/source:
-
-vpath %.cpp \
-    ${PluginsRoot}/api/source: \
-    ${ProjectRoot}/source: \
-    ${ToolkitRoot}/source:
-
-CPPSources += \
-	HostAPIAccess.cpp \
-	PluginAPIImpl.cpp \
-	PluginBase.cpp \
-	PluginRegistry.cpp
-
-CObjs = $(foreach objs,${CSources:.c=.o},${TempRoot}/$(objs))
-CPPObjs = $(foreach objs,${CPPSources:.cpp=.o},${TempRoot}/$(objs))
-
-.SUFFIXES:                # Delete the default suffixes
-.SUFFIXES: .o .c .cpp     # Define our suffix list
-
-# ==================================================================================================
-
-# ---------------------------------------
-# Define the generic compile build rules.
-
-${TempRoot}/%.o : %.c
-	@echo ""
-	@echo "source = $<"
-	@echo "target = $@"
-	rm -f $@
-	${Compile} ${CPPFlags} ${CompileFlags} ${XMPDefines} ${Includes} -c $< -o $@
-	@touch $@
-
-${TempRoot}/%.o : %.cpp
-	@echo ""
-	@echo "source = $<"
-	@echo "target = $@"
-	rm -f $@
-	${Compile} ${CPPFlags} ${CompileFlags} ${XMPDefines} ${Includes} -c $< -o $@
-	@touch $@
-
-# ==================================================================================================
-
-.PHONY: all rebuild msg create_dirs
-
-all : msg clean create_dirs cleanTemp ${LibName}
-
-rebuild: all
-
-build: msg create_dirs ${LibName}
-	@echo "Lazy build done."
-
-msg :
-ifeq "${Error}" ""
-	@echo ""
-	@echo Building ${PluginName} for ${TargetOS}-${TargetArch} ${TargetMode} ${TargetStage}
-	@echo ""
-else
-	@echo ""
-	@echo "Error: ${Error}"
-	@echo ""
-	@echo "# To build the Adobe ${PluginName} DLL:"
-	@echo "#   make -f ${PluginName}.mak [os=<os>] [stage=<stage>] [mode=<mode>] [arch=<arch>] "
-	@echo "# where"
-	@echo "#   os    = i80386linux"
-	@echo "#   stage = debug | release"
-	@echo "#   mode  = static | dll"
-	@echo "#   arch  = x86 | x64"
-	@echo "#"
-	@echo "# The os and stage symbols can also be uppercase, OS and STAGE."
-	@echo "# If the os is omitted it will try to default from the OSTYPE"
-	@echo "# and MACHTYPE environment variables. If the stage is omitted"
-	@echo "# it defaults to debug."
-	@echo ""
-	@exit 1
-endif
-
-create_dirs :
-	@mkdir -p ${TempRoot} ${TargetRoot} ${ResourceDest}
-
-${LibName} : ${CObjs} ${CPPObjs}
-	@echo ""
-	@echo "Linking $@"
-	rm -f $@
-	rm -f ${ResourceDest}/*
-	${Link} ${LinkFlags} $? ${LibRoot}/staticXMPCore${x64_ext}.ar ${RuntimeLibs} -o $@
-	${Strip} $@
-	@touch $@
-	cp -f ${ResourceSource}/MODULE_IDENTIFIER.txt ${ResourceDest}/MODULE_IDENTIFIER.txt
-ifeq "${TargetArch}" "x86"
-	cp -f ${ResourceSource}/XMPPLUGINUIDS-32.txt ${ResourceDest}/XMPPLUGINUIDS.txt
-else
-	cp -f ${ResourceSource}/XMPPLUGINUIDS-64.txt ${ResourceDest}/XMPPLUGINUIDS.txt
-endif
-	@echo ""
-	@echo ${PluginName} built for ${TargetOS}-${TargetArch} ${TargetMode} ${TargetStage}
-	@echo ""
-	@exit 0
-
-clean: cleanTemp cleanLib
-
-cleanTemp:
-	rm -rf ${TempRoot}/*
-
-cleanLib:
-	rm -f  ${LibName}
-	rm -rf ${ResourceDest}
-	rm -rf ${ProjectRoot}/build/common-unix/intermediate/${TargetOS}/
diff --git a/XMPFilesPlugins/PluginTemplate/build/gcc/PluginTemplate.mak b/XMPFilesPlugins/PluginTemplate/build/gcc/PluginTemplate.mak
deleted file mode 100644
index 2b821a1..0000000
--- a/XMPFilesPlugins/PluginTemplate/build/gcc/PluginTemplate.mak
+++ /dev/null
@@ -1,21 +0,0 @@
-# ==================================================================================================
-# Copyright 2011 Adobe Systems Incorporated
-# All Rights Reserved.
-#
-# NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-# of the Adobe license agreement accompanying it.
-# ==================================================================================================
-
-# -----------------------------------------------
-# All of the real processing is in a common file.
-
-PluginName = PluginTemplate
-
-CPPSources = \
-	Template_Handler.cpp \
-	Host_IO-UNIX.cpp \
-	XMPFiles_IO.cpp \
-	XIO.cpp
-
-include PluginCommon.mak
-
diff --git a/XMPFilesPlugins/PluginTemplate/build/vc/PluginTemplate-32.rc b/XMPFilesPlugins/PluginTemplate/build/vc/PluginTemplate-32.rc
deleted file mode 100644
index af97574..0000000
--- a/XMPFilesPlugins/PluginTemplate/build/vc/PluginTemplate-32.rc
+++ /dev/null
@@ -1,8 +0,0 @@
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// TXT
-//
-
-XMPPLUGINUIDS           TXT                     "../resource/txt/XMPPLUGINUIDS-32.txt"
-MODULE_IDENTIFIER       TXT                     "../resource/txt/MODULE_IDENTIFIER.txt"
diff --git a/XMPFilesPlugins/PluginTemplate/build/vc/PluginTemplate-64.rc b/XMPFilesPlugins/PluginTemplate/build/vc/PluginTemplate-64.rc
deleted file mode 100644
index c258951..0000000
--- a/XMPFilesPlugins/PluginTemplate/build/vc/PluginTemplate-64.rc
+++ /dev/null
@@ -1,8 +0,0 @@
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// TXT
-//
-
-XMPPLUGINUIDS           TXT                     "../resource/txt/XMPPLUGINUIDS-64.txt"
-MODULE_IDENTIFIER       TXT                     "../resource/txt/MODULE_IDENTIFIER.txt"
diff --git a/XMPFilesPlugins/PluginTemplate/build/vc/PluginTemplate.vcxproj b/XMPFilesPlugins/PluginTemplate/build/vc/PluginTemplate.vcxproj
deleted file mode 100644
index 9175096..0000000
--- a/XMPFilesPlugins/PluginTemplate/build/vc/PluginTemplate.vcxproj
+++ /dev/null
@@ -1,282 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|x64">

-      <Configuration>Debug</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|x64">

-      <Configuration>Release</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{82006940-7ECC-454B-A571-B3854C407D25}</ProjectGuid>

-    <RootNamespace>PluginTemplate</RootNamespace>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <CharacterSet>Unicode</CharacterSet>

-    <WholeProgramOptimization>false</WholeProgramOptimization>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <CharacterSet>Unicode</CharacterSet>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <CharacterSet>Unicode</CharacterSet>

-    <WholeProgramOptimization>false</WholeProgramOptimization>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <CharacterSet>Unicode</CharacterSet>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup>

-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\public\windows\release\$(ProjectName)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(ProjectName)\windows\release\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\public\windows_x64\release\$(ProjectName)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(ProjectName)\windows_x64\release\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\public\windows\debug\$(ProjectName)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(ProjectName)\windows\debug\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\public\windows_x64\debug\$(ProjectName)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(ProjectName)\windows_x64\debug\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

-    <TargetExt>.xpi</TargetExt>

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-32</TargetName>

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-32</TargetName>

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)-64</TargetName>

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)-64</TargetName>

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <BuildLog>

-      <Path>$(IntDir)BuildLog.htm</Path>

-    </BuildLog>

-    <ClCompile>

-      <Optimization>MinSpace</Optimization>

-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <AdditionalIncludeDirectories>..\..\..\..;..\..\..\..\public\include;..\..\..\api\source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN_ENV;WIN_PLATFORM;AdobePrivate=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)obj\</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)obj\</ObjectFileName>

-      <ProgramDataBaseFileName>$(IntDir)obj\</ProgramDataBaseFileName>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <CompileAs>Default</CompileAs>

-    </ClCompile>

-    <ResourceCompile>

-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <Culture>0x0409</Culture>

-    </ResourceCompile>

-    <Link>

-      <AdditionalOptions>/PDBALTPATH:%_PDB%</AdditionalOptions>

-      <AdditionalDependencies>..\..\..\..\public\libraries\windows\release\XMPCoreStatic.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)$(ProjectName)-32.xpi</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)$(ProjectName)-32.pdb</ProgramDatabaseFile>

-      <SubSystem>Console</SubSystem>

-      <RandomizedBaseAddress>true</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

-      <TargetMachine>MachineX86</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <BuildLog>

-      <Path>$(IntDir)BuildLog.htm</Path>

-    </BuildLog>

-    <ClCompile>

-      <Optimization>MinSpace</Optimization>

-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <AdditionalIncludeDirectories>..\..\..\..;..\..\..\..\public\include;..\..\..\api\source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN_ENV;WIN_PLATFORM;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)obj\</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)obj\</ObjectFileName>

-      <ProgramDataBaseFileName>$(IntDir)obj\</ProgramDataBaseFileName>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <CompileAs>Default</CompileAs>

-    </ClCompile>

-    <Link>

-      <AdditionalOptions>/PDBALTPATH:%_PDB%</AdditionalOptions>

-      <AdditionalDependencies>..\..\..\..\public\libraries\windows_x64\release\XMPCoreStatic.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)$(ProjectName)-64.xpi</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)$(ProjectName)-64.pdb</ProgramDatabaseFile>

-      <SubSystem>Console</SubSystem>

-      <RandomizedBaseAddress>true</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

-      <TargetMachine>MachineX64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <BuildLog>

-      <Path>$(IntDir)BuildLog.htm</Path>

-    </BuildLog>

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..\..;..\..\..\..\public\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_DEBUG;WIN_ENV;WIN_PLATFORM;WIN32;_CONSOLE;AdobePrivate=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)obj\</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)obj\</ObjectFileName>

-      <ProgramDataBaseFileName>$(IntDir)obj\</ProgramDataBaseFileName>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-      <CompileAs>Default</CompileAs>

-    </ClCompile>

-    <ResourceCompile>

-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <Culture>0x0409</Culture>

-    </ResourceCompile>

-    <Link>

-      <AdditionalDependencies>..\..\..\..\public\libraries\windows\debug\XMPCoreStatic.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)$(ProjectName)-32.xpi</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)$(ProjectName)-32.pdb</ProgramDatabaseFile>

-      <SubSystem>Console</SubSystem>

-      <RandomizedBaseAddress>true</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

-      <TargetMachine>MachineX86</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <BuildLog>

-      <Path>$(IntDir)BuildLog.htm</Path>

-    </BuildLog>

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..\..;..\..\..\..\public\include;..\..\..\api\source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_DEBUG;WIN_ENV;WIN_PLATFORM;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>$(IntDir)obj\</AssemblerListingLocation>

-      <ObjectFileName>$(IntDir)obj\</ObjectFileName>

-      <ProgramDataBaseFileName>$(IntDir)obj\</ProgramDataBaseFileName>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <CompileAs>Default</CompileAs>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>..\..\..\..\public\libraries\windows_x64\debug\XMPCoreStatic.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)$(ProjectName)-64.xpi</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)$(ProjectName)-64.pdb</ProgramDatabaseFile>

-      <SubSystem>Console</SubSystem>

-      <RandomizedBaseAddress>true</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

-      <TargetMachine>MachineX64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\..\..\source\Host_IO-Win.cpp" />

-    <ClCompile Include="..\..\..\..\source\UnicodeConversions.cpp" />

-    <ClCompile Include="..\..\source\Template_Handler.cpp" />

-    <ClCompile Include="..\..\..\api\source\HostAPIAccess.cpp" />

-    <ClCompile Include="..\..\..\api\source\PluginAPIImpl.cpp" />

-    <ClCompile Include="..\..\..\api\source\PluginBase.cpp" />

-    <ClCompile Include="..\..\..\api\source\PluginRegistry.cpp" />

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="..\resource\txt\MODULE_IDENTIFIER.txt" />

-    <None Include="..\resource\txt\XMPPLUGINUIDS-32.txt" />

-    <None Include="..\resource\txt\XMPPLUGINUIDS-64.txt" />

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="..\..\..\api\source\HostAPI.h" />

-    <ClInclude Include="..\..\..\api\source\HostAPIAccess.h" />

-    <ClInclude Include="..\..\..\api\source\PluginBase.h" />

-    <ClInclude Include="..\..\..\api\source\PluginConst.h" />

-    <ClInclude Include="..\..\..\api\source\PluginHandler.h" />

-    <ClInclude Include="..\..\..\api\source\PluginRegistry.h" />

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="PluginTemplate-32.rc">

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>

-    </ResourceCompile>

-    <ResourceCompile Include="PluginTemplate-64.rc">

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>

-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>

-    </ResourceCompile>

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>

diff --git a/XMPFilesPlugins/PluginTemplate/build/vc/PluginTemplate.vcxproj.filters b/XMPFilesPlugins/PluginTemplate/build/vc/PluginTemplate.vcxproj.filters
deleted file mode 100644
index 02e7f0e..0000000
--- a/XMPFilesPlugins/PluginTemplate/build/vc/PluginTemplate.vcxproj.filters
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup>

-    <Filter Include="Source Files">

-      <UniqueIdentifier>{be8b7123-2efd-4e6e-a980-ffa3771da3d6}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Resource Files">

-      <UniqueIdentifier>{c62b13dc-6728-47c9-bd85-dcc2d66f3edd}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="api">

-      <UniqueIdentifier>{5d8ff4ed-3a19-4dda-8b54-d23d5ff7384c}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="api\include">

-      <UniqueIdentifier>{36669ecc-d1ae-49fe-b62a-696335c6d2c9}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="api\source">

-      <UniqueIdentifier>{e245d6bd-e1ab-4fd5-ac2d-777b2139dc0d}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Source Files\common">

-      <UniqueIdentifier>{81a5c5f2-c70a-4437-bbe2-d8d115561c7e}</UniqueIdentifier>

-    </Filter>

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\source\Template_Handler.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\api\source\HostAPIAccess.cpp">

-      <Filter>api\source</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\api\source\PluginAPIImpl.cpp">

-      <Filter>api\source</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\api\source\PluginBase.cpp">

-      <Filter>api\source</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\api\source\PluginRegistry.cpp">

-      <Filter>api\source</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\..\source\Host_IO-Win.cpp">

-      <Filter>Source Files\common</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\..\source\UnicodeConversions.cpp">

-      <Filter>Source Files\common</Filter>

-    </ClCompile>

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="..\resource\txt\MODULE_IDENTIFIER.txt">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="..\resource\txt\XMPPLUGINUIDS-32.txt">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="..\resource\txt\XMPPLUGINUIDS-64.txt">

-      <Filter>Resource Files</Filter>

-    </None>

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="..\..\..\api\source\HostAPIAccess.h">

-      <Filter>api\include</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\api\source\PluginBase.h">

-      <Filter>api\include</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\api\source\PluginRegistry.h">

-      <Filter>api\include</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\api\source\PluginConst.h">

-      <Filter>api\include</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\api\source\PluginHandler.h">

-      <Filter>api\include</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\api\source\HostAPI.h">

-      <Filter>api\include</Filter>

-    </ClInclude>

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="PluginTemplate-32.rc" />

-    <ResourceCompile Include="PluginTemplate-64.rc" />

-  </ItemGroup>

-</Project>

diff --git a/XMPFilesPlugins/PluginTemplate/build/xcode/Debug32.xcconfig b/XMPFilesPlugins/PluginTemplate/build/xcode/Debug32.xcconfig
deleted file mode 100644
index 7b09461..0000000
--- a/XMPFilesPlugins/PluginTemplate/build/xcode/Debug32.xcconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-//Build mode related changes

-BUILD_MODE  = debug

-GCC_PREPROCESSOR_DEFINITIONS = ${COMMON_DEFINES} ${ARCH_DEFINES} DEBUG=1 _DEBUG=1

-GCC_GENERATE_DEBUGGING_SYMBOLS = YES

-GCC_DEBUGGING_SYMBOLS = full

-GCC_OPTIMIZATION_LEVEL = 0

-

-//Architecture related changes

-ARCHS = i386

-ARCH_SUFFIX = -32

-ARCH_DEFINES = XMP_64=0

-CT_RELEASE_DIR_TARGET = intel

diff --git a/XMPFilesPlugins/PluginTemplate/build/xcode/Debug64.xcconfig b/XMPFilesPlugins/PluginTemplate/build/xcode/Debug64.xcconfig
deleted file mode 100644
index 08a571f..0000000
--- a/XMPFilesPlugins/PluginTemplate/build/xcode/Debug64.xcconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-//Build mode related changes

-BUILD_MODE  = debug

-GCC_PREPROCESSOR_DEFINITIONS = ${COMMON_DEFINES} ${ARCH_DEFINES} DEBUG=1 _DEBUG=1

-GCC_GENERATE_DEBUGGING_SYMBOLS = YES

-GCC_DEBUGGING_SYMBOLS = full

-GCC_OPTIMIZATION_LEVEL = 0

-

-//Architecture related changes

-ARCHS = x86_64

-ARCH_SUFFIX = -64

-ARCH_DEFINES = XMP_64=1

-CT_RELEASE_DIR_TARGET = intel_64

diff --git a/XMPFilesPlugins/PluginTemplate/build/xcode/PluginCommon.xcconfig b/XMPFilesPlugins/PluginTemplate/build/xcode/PluginCommon.xcconfig
deleted file mode 100644
index 65401f1..0000000
--- a/XMPFilesPlugins/PluginTemplate/build/xcode/PluginCommon.xcconfig
+++ /dev/null
@@ -1,87 +0,0 @@
-// Symbols that we define for our own convenience:

-

-PLUGIN_ROOT = ${PROJECT_DIR}/../../..

-XMP_ROOT = ${PLUGIN_ROOT}/..

-CT_RELEASE_DIR = public/libraries/macintosh/

-

-XMPLIB_ROOT = ${XMP_ROOT}/${CT_RELEASE_DIR}

-TEMP_ROOT   = ${PLUGIN_ROOT}/temp/${PROJECT}/macintosh/${CT_RELEASE_DIR_TARGET}

-TARGET_ROOT = ${PLUGIN_ROOT}/public/macintosh/${CT_RELEASE_DIR_TARGET}

-CLIENT_ROOT = ${XMP_ROOT}/target/macintosh/${CT_RELEASE_DIR_TARGET}

-

-// Build specific settings for debug/release/static:

-

-XMPLIB_DIR = ${XMPLIB_ROOT}/${BUILD_MODE}

-TEMP_DIR   = ${TEMP_ROOT}/${BUILD_MODE}

-TARGET_DIR = ${TARGET_ROOT}/${BUILD_MODE}

-CLIENT_DIR = ${CLIENT_ROOT}/${BUILD_MODE}/bin

-

-COMMON_HEADER_PATHS    = ${XMP_ROOT} ${XMP_ROOT}/public/include ${PLUGIN_ROOT}/api/source

-COMMON_FRAMEWORK_PATHS = ${SDKROOT}/System/Library/Frameworks ${XMPLIB_DIR}

-COMMON_LDFLAGS = ${XMPLIB_DIR}/libXMPCoreStatic.a -framework CoreServices

-

-CONFIGURATION_TEMP_DIR  = ${TEMP_DIR}

-CONFIGURATION_BUILD_DIR = ${TARGET_DIR}

-

-// Symbols that Xcode uses to control the build

-// The bogus OBJROOT redirects the unwanted project-opening .build folder

-

-OBJROOT = ${TEMP_DIR}

-

-PRODUCT_NAME = ${PROJECT}${ARCH_SUFFIX}

-WRAPPER_EXTENSION = xpi

-//INFOPLIST_FILE = ${PROJECT}.plist

-//INFOPLIST_PREFIX_HEADER = ${PROJECT}PList.h

-

-RESOURCE_DIR = ${TARGET_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Resources

-

-MACH_O_TYPE = mh_bundle

-LIBRARY_STYLE = DYNAMIC

-PREBINDING = NO

-INSTALL_PATH = @executable_path/../Frameworks

-LD_RUNPATH_SEARCH_PATHS = @loader_path/../../.. @loader_path/../../../..

-MACOSX_DEPLOYMENT_TARGET = 10.6

-SDKROOT = macosx10.6

-

-SHARED_PRECOMPS_DIR = ${TEMP_DIR}

-PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO

-GCC_PRECOMPILE_PREFIX_HEADER = NO

-

-DEBUG_INFORMATION_FORMAT = dwarf-with-dsym

-GCC_PREPROCESSOR_DEFINITIONS = ${COMMON_DEFINES} ${ARCH_DEFINES} ${BUILD_MODE_DEFINES}

-COMMON_DEFINES = MAC_ENV=1 AdobePrivate=1 HAVE_EXPAT_CONFIG_H=1 XML_STATIC=1

-

-GCC_VERSION = com.apple.compilers.llvm.clang.1_0

-

-GCC_INPUT_FILETYPE = sourcecode.cpp.objcpp

-GCC_CHAR_IS_UNSIGNED_CHAR = YES

-GCC_ENABLE_PASCAL_STRINGS = NO

-GCC_SHORT_ENUMS = YES

-GCC_ONE_BYTE_BOOL = YES

-GCC_NO_COMMON_BLOCKS = YES

-GCC_FAST_MATH = YES

-

-CommonCFlags = -fstack-protector

-OTHER_CPLUSPLUSFLAGS = ${CommonCFlags}

-OTHER_CFLAGS = ${CommonCFlags}

-

-GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES

-GCC_WARN_ABOUT_RETURN_TYPE = YES

-GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES

-GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES

-GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES

-GCC_WARN_MISSING_PARENTHESES = YES

-GCC_WARN_CHECK_SWITCH_STATEMENTS = YES

-GCC_WARN_UNKNOWN_PRAGMAS = YES

-GCC_WARN_SIGN_COMPARE = YES

-GCC_WARN_ABOUT_MISSING_NEWLINE = YES

-

-// It would be nice to set these, but they cause a huge

-// number of warnings, many from Expat.

-

-GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO

-GCC_WARN_UNINITIALIZED_AUTOS = NO

-GCC_WARN_UNUSED_PARAMETER = NO

-GCC_WARN_UNUSED_VARIABLE = NO

-GCC_WARN_UNUSED_VALUE = NO

-GCC_WARN_SHADOW = NO

diff --git a/XMPFilesPlugins/PluginTemplate/build/xcode/PluginTemplate.xcodeproj/project.pbxproj b/XMPFilesPlugins/PluginTemplate/build/xcode/PluginTemplate.xcodeproj/project.pbxproj
deleted file mode 100644
index 5dc7b6e..0000000
--- a/XMPFilesPlugins/PluginTemplate/build/xcode/PluginTemplate.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,524 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 45;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		0550EBFD14F687FD0015E491 /* Host_IO-Mac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0550EBFA14F687FD0015E491 /* Host_IO-Mac.cpp */; };
-		0550EBFE14F687FD0015E491 /* Host_IO-Mac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0550EBFA14F687FD0015E491 /* Host_IO-Mac.cpp */; };
-		0550EBFF14F687FD0015E491 /* Host_IO-Mac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0550EBFA14F687FD0015E491 /* Host_IO-Mac.cpp */; };
-		0550EC0014F687FD0015E491 /* Host_IO-Mac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0550EBFA14F687FD0015E491 /* Host_IO-Mac.cpp */; };
-		0550EC0114F687FD0015E491 /* XIO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0550EBFB14F687FD0015E491 /* XIO.cpp */; };
-		0550EC0214F687FD0015E491 /* XIO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0550EBFB14F687FD0015E491 /* XIO.cpp */; };
-		0550EC0314F687FD0015E491 /* XIO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0550EBFB14F687FD0015E491 /* XIO.cpp */; };
-		0550EC0414F687FD0015E491 /* XIO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0550EBFB14F687FD0015E491 /* XIO.cpp */; };
-		0550EC0514F687FD0015E491 /* XMPFiles_IO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0550EBFC14F687FD0015E491 /* XMPFiles_IO.cpp */; };
-		0550EC0614F687FD0015E491 /* XMPFiles_IO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0550EBFC14F687FD0015E491 /* XMPFiles_IO.cpp */; };
-		0550EC0714F687FD0015E491 /* XMPFiles_IO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0550EBFC14F687FD0015E491 /* XMPFiles_IO.cpp */; };
-		0550EC0814F687FD0015E491 /* XMPFiles_IO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0550EBFC14F687FD0015E491 /* XMPFiles_IO.cpp */; };
-		0550EC0A14F688320015E491 /* XMPPLUGINUIDS-32.txt in Resources */ = {isa = PBXBuildFile; fileRef = 0550EC0914F688320015E491 /* XMPPLUGINUIDS-32.txt */; };
-		0550EC0B14F688320015E491 /* XMPPLUGINUIDS-32.txt in Resources */ = {isa = PBXBuildFile; fileRef = 0550EC0914F688320015E491 /* XMPPLUGINUIDS-32.txt */; };
-		0550EC0F14F688460015E491 /* XMPPLUGINUIDS-64.txt in Resources */ = {isa = PBXBuildFile; fileRef = 0550EC0E14F688460015E491 /* XMPPLUGINUIDS-64.txt */; };
-		0550EC1014F688460015E491 /* XMPPLUGINUIDS-64.txt in Resources */ = {isa = PBXBuildFile; fileRef = 0550EC0E14F688460015E491 /* XMPPLUGINUIDS-64.txt */; };
-		120A3FD4139AAED2003E6D70 /* HostAPIAccess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 120A3FCE139AAED2003E6D70 /* HostAPIAccess.cpp */; };
-		120A3FD6139AAED2003E6D70 /* PluginAPIImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 120A3FD0139AAED2003E6D70 /* PluginAPIImpl.cpp */; };
-		120A3FD8139AAED2003E6D70 /* PluginRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 120A3FD2139AAED2003E6D70 /* PluginRegistry.cpp */; };
-		120A3FE4139AB023003E6D70 /* MODULE_IDENTIFIER.txt in Resources */ = {isa = PBXBuildFile; fileRef = 120A3FE2139AB023003E6D70 /* MODULE_IDENTIFIER.txt */; };
-		120A4049139AB954003E6D70 /* PluginBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 120A4048139AB954003E6D70 /* PluginBase.cpp */; };
-		120A41D4139ABDC9003E6D70 /* Template_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 120A41D3139ABDC9003E6D70 /* Template_Handler.cpp */; };
-		120A4541139CE4F5003E6D70 /* MODULE_IDENTIFIER.txt in Resources */ = {isa = PBXBuildFile; fileRef = 120A3FE2139AB023003E6D70 /* MODULE_IDENTIFIER.txt */; };
-		120A4543139CE4F5003E6D70 /* MODULE_IDENTIFIER.txt in Resources */ = {isa = PBXBuildFile; fileRef = 120A3FE2139AB023003E6D70 /* MODULE_IDENTIFIER.txt */; };
-		120A4545139CE4F6003E6D70 /* MODULE_IDENTIFIER.txt in Resources */ = {isa = PBXBuildFile; fileRef = 120A3FE2139AB023003E6D70 /* MODULE_IDENTIFIER.txt */; };
-		120A4547139CE50A003E6D70 /* HostAPIAccess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 120A3FCE139AAED2003E6D70 /* HostAPIAccess.cpp */; };
-		120A4548139CE50A003E6D70 /* PluginAPIImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 120A3FD0139AAED2003E6D70 /* PluginAPIImpl.cpp */; };
-		120A4549139CE50A003E6D70 /* PluginRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 120A3FD2139AAED2003E6D70 /* PluginRegistry.cpp */; };
-		120A454A139CE50A003E6D70 /* PluginBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 120A4048139AB954003E6D70 /* PluginBase.cpp */; };
-		120A454B139CE50A003E6D70 /* Template_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 120A41D3139ABDC9003E6D70 /* Template_Handler.cpp */; };
-		120A454C139CE50B003E6D70 /* HostAPIAccess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 120A3FCE139AAED2003E6D70 /* HostAPIAccess.cpp */; };
-		120A454D139CE50B003E6D70 /* PluginAPIImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 120A3FD0139AAED2003E6D70 /* PluginAPIImpl.cpp */; };
-		120A454E139CE50B003E6D70 /* PluginRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 120A3FD2139AAED2003E6D70 /* PluginRegistry.cpp */; };
-		120A454F139CE50B003E6D70 /* PluginBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 120A4048139AB954003E6D70 /* PluginBase.cpp */; };
-		120A4550139CE50B003E6D70 /* Template_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 120A41D3139ABDC9003E6D70 /* Template_Handler.cpp */; };
-		120A4551139CE50B003E6D70 /* HostAPIAccess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 120A3FCE139AAED2003E6D70 /* HostAPIAccess.cpp */; };
-		120A4552139CE50B003E6D70 /* PluginAPIImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 120A3FD0139AAED2003E6D70 /* PluginAPIImpl.cpp */; };
-		120A4553139CE50B003E6D70 /* PluginRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 120A3FD2139AAED2003E6D70 /* PluginRegistry.cpp */; };
-		120A4554139CE50B003E6D70 /* PluginBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 120A4048139AB954003E6D70 /* PluginBase.cpp */; };
-		120A4555139CE50B003E6D70 /* Template_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 120A41D3139ABDC9003E6D70 /* Template_Handler.cpp */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXFileReference section */
-		0550EBFA14F687FD0015E491 /* Host_IO-Mac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "Host_IO-Mac.cpp"; path = "../../../../source/Host_IO-Mac.cpp"; sourceTree = SOURCE_ROOT; };
-		0550EBFB14F687FD0015E491 /* XIO.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = XIO.cpp; path = ../../../../source/XIO.cpp; sourceTree = SOURCE_ROOT; };
-		0550EBFC14F687FD0015E491 /* XMPFiles_IO.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = XMPFiles_IO.cpp; path = ../../../../source/XMPFiles_IO.cpp; sourceTree = SOURCE_ROOT; };
-		0550EC0914F688320015E491 /* XMPPLUGINUIDS-32.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "XMPPLUGINUIDS-32.txt"; path = "../resource/txt/XMPPLUGINUIDS-32.txt"; sourceTree = SOURCE_ROOT; };
-		0550EC0E14F688460015E491 /* XMPPLUGINUIDS-64.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "XMPPLUGINUIDS-64.txt"; path = "../resource/txt/XMPPLUGINUIDS-64.txt"; sourceTree = SOURCE_ROOT; };
-		120A3FCE139AAED2003E6D70 /* HostAPIAccess.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HostAPIAccess.cpp; path = ../../../api/source/HostAPIAccess.cpp; sourceTree = SOURCE_ROOT; };
-		120A3FCF139AAED2003E6D70 /* HostAPIAccess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HostAPIAccess.h; path = ../../../api/source/HostAPIAccess.h; sourceTree = SOURCE_ROOT; };
-		120A3FD0139AAED2003E6D70 /* PluginAPIImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PluginAPIImpl.cpp; path = ../../../api/source/PluginAPIImpl.cpp; sourceTree = SOURCE_ROOT; };
-		120A3FD1139AAED2003E6D70 /* PluginBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PluginBase.h; path = ../../../api/source/PluginBase.h; sourceTree = SOURCE_ROOT; };
-		120A3FD2139AAED2003E6D70 /* PluginRegistry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PluginRegistry.cpp; path = ../../../api/source/PluginRegistry.cpp; sourceTree = SOURCE_ROOT; };
-		120A3FD3139AAED2003E6D70 /* PluginRegistry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PluginRegistry.h; path = ../../../api/source/PluginRegistry.h; sourceTree = SOURCE_ROOT; };
-		120A3FDA139AAF11003E6D70 /* HostAPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HostAPI.h; path = ../../../api/source/HostAPI.h; sourceTree = SOURCE_ROOT; };
-		120A3FDB139AAF11003E6D70 /* PluginConst.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PluginConst.h; path = ../../../api/source/PluginConst.h; sourceTree = SOURCE_ROOT; };
-		120A3FDC139AAF11003E6D70 /* PluginHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PluginHandler.h; path = ../../../api/source/PluginHandler.h; sourceTree = SOURCE_ROOT; };
-		120A3FE0139AAFA5003E6D70 /* PluginCommon.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = PluginCommon.xcconfig; sourceTree = SOURCE_ROOT; };
-		120A3FE2139AB023003E6D70 /* MODULE_IDENTIFIER.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = MODULE_IDENTIFIER.txt; path = ../resource/txt/MODULE_IDENTIFIER.txt; sourceTree = SOURCE_ROOT; };
-		120A4048139AB954003E6D70 /* PluginBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PluginBase.cpp; path = ../../../api/source/PluginBase.cpp; sourceTree = SOURCE_ROOT; };
-		120A41D3139ABDC9003E6D70 /* Template_Handler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Template_Handler.cpp; path = ../../source/Template_Handler.cpp; sourceTree = SOURCE_ROOT; };
-		120A4433139CD1AF003E6D70 /* Debug32.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug32.xcconfig; sourceTree = SOURCE_ROOT; };
-		120A4434139CD1AF003E6D70 /* Debug64.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug64.xcconfig; sourceTree = SOURCE_ROOT; };
-		120A4435139CD1AF003E6D70 /* Release32.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Release32.xcconfig; sourceTree = SOURCE_ROOT; };
-		120A4436139CD1AF003E6D70 /* Release64.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Release64.xcconfig; sourceTree = SOURCE_ROOT; };
-		120A4455139CD383003E6D70 /* PluginTemplate-32.xpi */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = "PluginTemplate-32.xpi"; sourceTree = BUILT_PRODUCTS_DIR; };
-		120A451E139CE32E003E6D70 /* PluginTemplate-32.xpi */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = "PluginTemplate-32.xpi"; sourceTree = BUILT_PRODUCTS_DIR; };
-		120A4534139CE476003E6D70 /* PluginTemplate-64.xpi */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = "PluginTemplate-64.xpi"; sourceTree = BUILT_PRODUCTS_DIR; };
-		120A453D139CE491003E6D70 /* PluginTemplate-64.xpi */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = "PluginTemplate-64.xpi"; sourceTree = BUILT_PRODUCTS_DIR; };
-		1292145A139FB919003D2AF8 /* PluginTemplateCommon.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = PluginTemplateCommon.xcconfig; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXGroup section */
-		0550EBF814F6879F0015E491 /* common */ = {
-			isa = PBXGroup;
-			children = (
-				0550EBFA14F687FD0015E491 /* Host_IO-Mac.cpp */,
-				0550EBFB14F687FD0015E491 /* XIO.cpp */,
-				0550EBFC14F687FD0015E491 /* XMPFiles_IO.cpp */,
-			);
-			name = common;
-			sourceTree = "<group>";
-		};
-		0867D691FE84028FC02AAC07 /* PluginTemplate */ = {
-			isa = PBXGroup;
-			children = (
-				120A4432139CD175003E6D70 /* Build Files */,
-				120A41D2139ABDA1003E6D70 /* Source Files */,
-				08FB77AEFE84172EC02AAC07 /* api */,
-				089C1665FE841158C02AAC07 /* Resources */,
-				120A4455139CD383003E6D70 /* PluginTemplate-32.xpi */,
-				120A451E139CE32E003E6D70 /* PluginTemplate-32.xpi */,
-				120A4534139CE476003E6D70 /* PluginTemplate-64.xpi */,
-				120A453D139CE491003E6D70 /* PluginTemplate-64.xpi */,
-			);
-			name = PluginTemplate;
-			sourceTree = "<group>";
-		};
-		089C1665FE841158C02AAC07 /* Resources */ = {
-			isa = PBXGroup;
-			children = (
-				0550EC0E14F688460015E491 /* XMPPLUGINUIDS-64.txt */,
-				0550EC0914F688320015E491 /* XMPPLUGINUIDS-32.txt */,
-				120A3FE2139AB023003E6D70 /* MODULE_IDENTIFIER.txt */,
-			);
-			name = Resources;
-			sourceTree = "<group>";
-		};
-		08FB77AEFE84172EC02AAC07 /* api */ = {
-			isa = PBXGroup;
-			children = (
-				120A3F73139AA649003E6D70 /* source */,
-				120A3F72139AA63E003E6D70 /* include */,
-			);
-			name = api;
-			sourceTree = "<group>";
-		};
-		120A3F72139AA63E003E6D70 /* include */ = {
-			isa = PBXGroup;
-			children = (
-				120A3FCF139AAED2003E6D70 /* HostAPIAccess.h */,
-				120A3FD1139AAED2003E6D70 /* PluginBase.h */,
-				120A3FD3139AAED2003E6D70 /* PluginRegistry.h */,
-				120A3FDA139AAF11003E6D70 /* HostAPI.h */,
-				120A3FDB139AAF11003E6D70 /* PluginConst.h */,
-				120A3FDC139AAF11003E6D70 /* PluginHandler.h */,
-			);
-			name = include;
-			sourceTree = "<group>";
-		};
-		120A3F73139AA649003E6D70 /* source */ = {
-			isa = PBXGroup;
-			children = (
-				120A4048139AB954003E6D70 /* PluginBase.cpp */,
-				120A3FCE139AAED2003E6D70 /* HostAPIAccess.cpp */,
-				120A3FD0139AAED2003E6D70 /* PluginAPIImpl.cpp */,
-				120A3FD2139AAED2003E6D70 /* PluginRegistry.cpp */,
-			);
-			name = source;
-			sourceTree = "<group>";
-		};
-		120A3F93139AA772003E6D70 /* Settings */ = {
-			isa = PBXGroup;
-			children = (
-				1292145A139FB919003D2AF8 /* PluginTemplateCommon.xcconfig */,
-				120A4433139CD1AF003E6D70 /* Debug32.xcconfig */,
-				120A4434139CD1AF003E6D70 /* Debug64.xcconfig */,
-				120A4435139CD1AF003E6D70 /* Release32.xcconfig */,
-				120A4436139CD1AF003E6D70 /* Release64.xcconfig */,
-				120A3FE0139AAFA5003E6D70 /* PluginCommon.xcconfig */,
-			);
-			name = Settings;
-			sourceTree = "<group>";
-		};
-		120A41D2139ABDA1003E6D70 /* Source Files */ = {
-			isa = PBXGroup;
-			children = (
-				0550EBF814F6879F0015E491 /* common */,
-				120A41D3139ABDC9003E6D70 /* Template_Handler.cpp */,
-			);
-			name = "Source Files";
-			sourceTree = "<group>";
-		};
-		120A4432139CD175003E6D70 /* Build Files */ = {
-			isa = PBXGroup;
-			children = (
-				120A3F93139AA772003E6D70 /* Settings */,
-			);
-			name = "Build Files";
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		120A451D139CE32E003E6D70 /* PluginTemplate Release32 */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 120A4521139CE32E003E6D70 /* Build configuration list for PBXNativeTarget "PluginTemplate Release32" */;
-			buildPhases = (
-				120A451A139CE32E003E6D70 /* Resources */,
-				056CCD3D14FD276200D44FBA /* Rename XML manifest */,
-				120A451B139CE32E003E6D70 /* Sources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = "PluginTemplate Release32";
-			productName = "PluginTemplate Release32";
-			productReference = 120A451E139CE32E003E6D70 /* PluginTemplate-32.xpi */;
-			productType = "com.apple.product-type.framework";
-		};
-		120A4533139CE476003E6D70 /* PluginTemplate Debug64 */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 120A4537139CE477003E6D70 /* Build configuration list for PBXNativeTarget "PluginTemplate Debug64" */;
-			buildPhases = (
-				120A4530139CE476003E6D70 /* Resources */,
-				056CCD3E14FD277600D44FBA /* Rename XML manifest */,
-				120A4531139CE476003E6D70 /* Sources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = "PluginTemplate Debug64";
-			productName = "PluginTemplate Debug64";
-			productReference = 120A4534139CE476003E6D70 /* PluginTemplate-64.xpi */;
-			productType = "com.apple.product-type.framework";
-		};
-		120A453C139CE491003E6D70 /* PluginTemplate Release64 */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 120A4540139CE492003E6D70 /* Build configuration list for PBXNativeTarget "PluginTemplate Release64" */;
-			buildPhases = (
-				120A4539139CE491003E6D70 /* Resources */,
-				056CCD3F14FD278A00D44FBA /* Rename XML manifest */,
-				120A453A139CE491003E6D70 /* Sources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = "PluginTemplate Release64";
-			productName = "PluginTemplate Release64";
-			productReference = 120A453D139CE491003E6D70 /* PluginTemplate-64.xpi */;
-			productType = "com.apple.product-type.framework";
-		};
-		8DC2EF4F0486A6940098B216 /* PluginTemplate Debug32 */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "PluginTemplate Debug32" */;
-			buildPhases = (
-				8DC2EF520486A6940098B216 /* Resources */,
-				056CCD3C14FD270600D44FBA /* Rename XML manifest */,
-				8DC2EF540486A6940098B216 /* Sources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = "PluginTemplate Debug32";
-			productInstallPath = "$(HOME)/Library/Frameworks";
-			productName = PluginTemplate;
-			productReference = 120A4455139CD383003E6D70 /* PluginTemplate-32.xpi */;
-			productType = "com.apple.product-type.framework";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		0867D690FE84028FC02AAC07 /* Project object */ = {
-			isa = PBXProject;
-			buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "PluginTemplate" */;
-			compatibilityVersion = "Xcode 3.1";
-			developmentRegion = English;
-			hasScannedForEncodings = 1;
-			knownRegions = (
-				English,
-				Japanese,
-				French,
-				German,
-			);
-			mainGroup = 0867D691FE84028FC02AAC07 /* PluginTemplate */;
-			productRefGroup = 0867D691FE84028FC02AAC07 /* PluginTemplate */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				8DC2EF4F0486A6940098B216 /* PluginTemplate Debug32 */,
-				120A451D139CE32E003E6D70 /* PluginTemplate Release32 */,
-				120A4533139CE476003E6D70 /* PluginTemplate Debug64 */,
-				120A453C139CE491003E6D70 /* PluginTemplate Release64 */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		120A451A139CE32E003E6D70 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				120A4541139CE4F5003E6D70 /* MODULE_IDENTIFIER.txt in Resources */,
-				0550EC0B14F688320015E491 /* XMPPLUGINUIDS-32.txt in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		120A4530139CE476003E6D70 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				120A4543139CE4F5003E6D70 /* MODULE_IDENTIFIER.txt in Resources */,
-				0550EC0F14F688460015E491 /* XMPPLUGINUIDS-64.txt in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		120A4539139CE491003E6D70 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				120A4545139CE4F6003E6D70 /* MODULE_IDENTIFIER.txt in Resources */,
-				0550EC1014F688460015E491 /* XMPPLUGINUIDS-64.txt in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		8DC2EF520486A6940098B216 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				120A3FE4139AB023003E6D70 /* MODULE_IDENTIFIER.txt in Resources */,
-				0550EC0A14F688320015E491 /* XMPPLUGINUIDS-32.txt in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXShellScriptBuildPhase section */
-		056CCD3C14FD270600D44FBA /* Rename XML manifest */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Rename XML manifest";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "mv ${RESOURCE_DIR}/XMPPLUGINUIDS-*.txt ${RESOURCE_DIR}/XMPPLUGINUIDS.txt";
-		};
-		056CCD3D14FD276200D44FBA /* Rename XML manifest */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Rename XML manifest";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "mv ${RESOURCE_DIR}/XMPPLUGINUIDS-*.txt ${RESOURCE_DIR}/XMPPLUGINUIDS.txt";
-		};
-		056CCD3E14FD277600D44FBA /* Rename XML manifest */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Rename XML manifest";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "mv ${RESOURCE_DIR}/XMPPLUGINUIDS-*.txt ${RESOURCE_DIR}/XMPPLUGINUIDS.txt";
-		};
-		056CCD3F14FD278A00D44FBA /* Rename XML manifest */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Rename XML manifest";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "mv ${RESOURCE_DIR}/XMPPLUGINUIDS-*.txt ${RESOURCE_DIR}/XMPPLUGINUIDS.txt";
-		};
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		120A451B139CE32E003E6D70 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				120A4547139CE50A003E6D70 /* HostAPIAccess.cpp in Sources */,
-				120A4548139CE50A003E6D70 /* PluginAPIImpl.cpp in Sources */,
-				120A4549139CE50A003E6D70 /* PluginRegistry.cpp in Sources */,
-				120A454A139CE50A003E6D70 /* PluginBase.cpp in Sources */,
-				120A454B139CE50A003E6D70 /* Template_Handler.cpp in Sources */,
-				0550EBFE14F687FD0015E491 /* Host_IO-Mac.cpp in Sources */,
-				0550EC0214F687FD0015E491 /* XIO.cpp in Sources */,
-				0550EC0614F687FD0015E491 /* XMPFiles_IO.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		120A4531139CE476003E6D70 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				120A454C139CE50B003E6D70 /* HostAPIAccess.cpp in Sources */,
-				120A454D139CE50B003E6D70 /* PluginAPIImpl.cpp in Sources */,
-				120A454E139CE50B003E6D70 /* PluginRegistry.cpp in Sources */,
-				120A454F139CE50B003E6D70 /* PluginBase.cpp in Sources */,
-				120A4550139CE50B003E6D70 /* Template_Handler.cpp in Sources */,
-				0550EBFF14F687FD0015E491 /* Host_IO-Mac.cpp in Sources */,
-				0550EC0314F687FD0015E491 /* XIO.cpp in Sources */,
-				0550EC0714F687FD0015E491 /* XMPFiles_IO.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		120A453A139CE491003E6D70 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				120A4551139CE50B003E6D70 /* HostAPIAccess.cpp in Sources */,
-				120A4552139CE50B003E6D70 /* PluginAPIImpl.cpp in Sources */,
-				120A4553139CE50B003E6D70 /* PluginRegistry.cpp in Sources */,
-				120A4554139CE50B003E6D70 /* PluginBase.cpp in Sources */,
-				120A4555139CE50B003E6D70 /* Template_Handler.cpp in Sources */,
-				0550EC0014F687FD0015E491 /* Host_IO-Mac.cpp in Sources */,
-				0550EC0414F687FD0015E491 /* XIO.cpp in Sources */,
-				0550EC0814F687FD0015E491 /* XMPFiles_IO.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		8DC2EF540486A6940098B216 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				120A3FD4139AAED2003E6D70 /* HostAPIAccess.cpp in Sources */,
-				120A3FD6139AAED2003E6D70 /* PluginAPIImpl.cpp in Sources */,
-				120A3FD8139AAED2003E6D70 /* PluginRegistry.cpp in Sources */,
-				120A4049139AB954003E6D70 /* PluginBase.cpp in Sources */,
-				120A41D4139ABDC9003E6D70 /* Template_Handler.cpp in Sources */,
-				0550EBFD14F687FD0015E491 /* Host_IO-Mac.cpp in Sources */,
-				0550EC0114F687FD0015E491 /* XIO.cpp in Sources */,
-				0550EC0514F687FD0015E491 /* XMPFiles_IO.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin XCBuildConfiguration section */
-		120A4520139CE32E003E6D70 /* Default */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 120A4435139CD1AF003E6D70 /* Release32.xcconfig */;
-			buildSettings = {
-			};
-			name = Default;
-		};
-		120A4536139CE477003E6D70 /* Default */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 120A4434139CD1AF003E6D70 /* Debug64.xcconfig */;
-			buildSettings = {
-			};
-			name = Default;
-		};
-		120A453F139CE491003E6D70 /* Default */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 120A4436139CD1AF003E6D70 /* Release64.xcconfig */;
-			buildSettings = {
-			};
-			name = Default;
-		};
-		1DEB91AF08733DA50010E9CD /* Default */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 120A4433139CD1AF003E6D70 /* Debug32.xcconfig */;
-			buildSettings = {
-			};
-			name = Default;
-		};
-		1DEB91B308733DA50010E9CD /* Default */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 1292145A139FB919003D2AF8 /* PluginTemplateCommon.xcconfig */;
-			buildSettings = {
-			};
-			name = Default;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		120A4521139CE32E003E6D70 /* Build configuration list for PBXNativeTarget "PluginTemplate Release32" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				120A4520139CE32E003E6D70 /* Default */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Default;
-		};
-		120A4537139CE477003E6D70 /* Build configuration list for PBXNativeTarget "PluginTemplate Debug64" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				120A4536139CE477003E6D70 /* Default */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Default;
-		};
-		120A4540139CE492003E6D70 /* Build configuration list for PBXNativeTarget "PluginTemplate Release64" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				120A453F139CE491003E6D70 /* Default */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Default;
-		};
-		1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "PluginTemplate Debug32" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				1DEB91AF08733DA50010E9CD /* Default */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Default;
-		};
-		1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "PluginTemplate" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				1DEB91B308733DA50010E9CD /* Default */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Default;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 0867D690FE84028FC02AAC07 /* Project object */;
-}
diff --git a/XMPFilesPlugins/PluginTemplate/build/xcode/PluginTemplate.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/XMPFilesPlugins/PluginTemplate/build/xcode/PluginTemplate.xcodeproj/project.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index f54863a..0000000
--- a/XMPFilesPlugins/PluginTemplate/build/xcode/PluginTemplate.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:PluginTemplate.xcodeproj">
-   </FileRef>
-</Workspace>
diff --git a/XMPFilesPlugins/PluginTemplate/build/xcode/PluginTemplate.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/XMPFilesPlugins/PluginTemplate/build/xcode/PluginTemplate.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
deleted file mode 100644
index 08de0be..0000000
--- a/XMPFilesPlugins/PluginTemplate/build/xcode/PluginTemplate.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
-	<false/>
-</dict>
-</plist>
diff --git a/XMPFilesPlugins/PluginTemplate/build/xcode/PluginTemplate.xcodeproj/project.xcworkspace/xcuserdata/jehrlich.xcuserdatad/WorkspaceSettings.xcsettings b/XMPFilesPlugins/PluginTemplate/build/xcode/PluginTemplate.xcodeproj/project.xcworkspace/xcuserdata/jehrlich.xcuserdatad/WorkspaceSettings.xcsettings
deleted file mode 100644
index f7f6518..0000000
--- a/XMPFilesPlugins/PluginTemplate/build/xcode/PluginTemplate.xcodeproj/project.xcworkspace/xcuserdata/jehrlich.xcuserdatad/WorkspaceSettings.xcsettings
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEWorkspaceUserSettings_BuildLocationStyle</key>
-	<integer>2</integer>
-</dict>
-</plist>
diff --git a/XMPFilesPlugins/PluginTemplate/build/xcode/PluginTemplate.xcodeproj/xcshareddata/xcschemes/PluginTemplate Debug32.xcscheme b/XMPFilesPlugins/PluginTemplate/build/xcode/PluginTemplate.xcodeproj/xcshareddata/xcschemes/PluginTemplate Debug32.xcscheme
deleted file mode 100644
index b472338..0000000
--- a/XMPFilesPlugins/PluginTemplate/build/xcode/PluginTemplate.xcodeproj/xcshareddata/xcschemes/PluginTemplate Debug32.xcscheme
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "8DC2EF4F0486A6940098B216"
-               BuildableName = "PluginTemplate-32.xpi"
-               BlueprintName = "PluginTemplate Debug32"
-               ReferencedContainer = "container:PluginTemplate.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Default">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Default"
-      debugDocumentVersioning = "YES"
-      allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Default"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Default">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Default"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/XMPFilesPlugins/PluginTemplate/build/xcode/PluginTemplate.xcodeproj/xcshareddata/xcschemes/PluginTemplate Debug64.xcscheme b/XMPFilesPlugins/PluginTemplate/build/xcode/PluginTemplate.xcodeproj/xcshareddata/xcschemes/PluginTemplate Debug64.xcscheme
deleted file mode 100644
index dd47721..0000000
--- a/XMPFilesPlugins/PluginTemplate/build/xcode/PluginTemplate.xcodeproj/xcshareddata/xcschemes/PluginTemplate Debug64.xcscheme
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "120A4533139CE476003E6D70"
-               BuildableName = "PluginTemplate-64.xpi"
-               BlueprintName = "PluginTemplate Debug64"
-               ReferencedContainer = "container:PluginTemplate.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Default">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Default"
-      debugDocumentVersioning = "YES"
-      allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Default"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Default">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Default"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/XMPFilesPlugins/PluginTemplate/build/xcode/PluginTemplate.xcodeproj/xcshareddata/xcschemes/PluginTemplate Release32.xcscheme b/XMPFilesPlugins/PluginTemplate/build/xcode/PluginTemplate.xcodeproj/xcshareddata/xcschemes/PluginTemplate Release32.xcscheme
deleted file mode 100644
index 30ce200..0000000
--- a/XMPFilesPlugins/PluginTemplate/build/xcode/PluginTemplate.xcodeproj/xcshareddata/xcschemes/PluginTemplate Release32.xcscheme
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "120A451D139CE32E003E6D70"
-               BuildableName = "PluginTemplate-32.xpi"
-               BlueprintName = "PluginTemplate Release32"
-               ReferencedContainer = "container:PluginTemplate.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Default">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Default"
-      debugDocumentVersioning = "YES"
-      allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Default"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Default">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Default"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/XMPFilesPlugins/PluginTemplate/build/xcode/PluginTemplate.xcodeproj/xcshareddata/xcschemes/PluginTemplate Release64.xcscheme b/XMPFilesPlugins/PluginTemplate/build/xcode/PluginTemplate.xcodeproj/xcshareddata/xcschemes/PluginTemplate Release64.xcscheme
deleted file mode 100644
index 5cd180e..0000000
--- a/XMPFilesPlugins/PluginTemplate/build/xcode/PluginTemplate.xcodeproj/xcshareddata/xcschemes/PluginTemplate Release64.xcscheme
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "120A453C139CE491003E6D70"
-               BuildableName = "PluginTemplate-64.xpi"
-               BlueprintName = "PluginTemplate Release64"
-               ReferencedContainer = "container:PluginTemplate.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Default">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Default"
-      debugDocumentVersioning = "YES"
-      allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Default"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Default">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Default"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/XMPFilesPlugins/PluginTemplate/build/xcode/PluginTemplateCommon.xcconfig b/XMPFilesPlugins/PluginTemplate/build/xcode/PluginTemplateCommon.xcconfig
deleted file mode 100644
index fb46e0e..0000000
--- a/XMPFilesPlugins/PluginTemplate/build/xcode/PluginTemplateCommon.xcconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "PluginCommon.xcconfig"

-

-HEADER_SEARCH_PATHS    = ${COMMON_HEADER_PATHS}

-FRAMEWORK_SEARCH_PATHS = ${COMMON_FRAMEWORK_PATHS} 

-OTHER_LDFLAGS = ${COMMON_LDFLAGS} 

diff --git a/XMPFilesPlugins/PluginTemplate/build/xcode/Release32.xcconfig b/XMPFilesPlugins/PluginTemplate/build/xcode/Release32.xcconfig
deleted file mode 100644
index c249825..0000000
--- a/XMPFilesPlugins/PluginTemplate/build/xcode/Release32.xcconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-//Build mode related changes

-BUILD_MODE  = release

-BUILD_MODE_DEFINES = NDEBUG=1

-GCC_GENERATE_DEBUGGING_SYMBOLS = NO

-GCC_DEBUGGING_SYMBOLS = used

-GCC_OPTIMIZATION_LEVEL = s

-

-//Architecture related changes

-ARCHS = i386

-ARCH_SUFFIX = -32

-ARCH_DEFINES = XMP_64=0

-CT_RELEASE_DIR_TARGET = intel

diff --git a/XMPFilesPlugins/PluginTemplate/build/xcode/Release64.xcconfig b/XMPFilesPlugins/PluginTemplate/build/xcode/Release64.xcconfig
deleted file mode 100644
index 753b2d6..0000000
--- a/XMPFilesPlugins/PluginTemplate/build/xcode/Release64.xcconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-//Build mode related changes

-BUILD_MODE  = release

-BUILD_MODE_DEFINES = NDEBUG=1

-GCC_GENERATE_DEBUGGING_SYMBOLS = NO

-GCC_DEBUGGING_SYMBOLS = used

-GCC_OPTIMIZATION_LEVEL = s

-

-//Architecture related changes

-ARCHS = x86_64

-ARCH_SUFFIX = -64

-ARCH_DEFINES = XMP_64=1

-CT_RELEASE_DIR_TARGET = intel_64

diff --git a/XMPFilesPlugins/PluginTemplate/resource/win/PluginTemplate-32.rc b/XMPFilesPlugins/PluginTemplate/resource/win/PluginTemplate-32.rc
new file mode 100644
index 0000000..908cdf5
--- /dev/null
+++ b/XMPFilesPlugins/PluginTemplate/resource/win/PluginTemplate-32.rc
@@ -0,0 +1,8 @@
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// TXT
+//
+
+XMPPLUGINUIDS           TXT                     "../../resource/txt/XMPPLUGINUIDS-32.txt"
+MODULE_IDENTIFIER       TXT                     "../../resource/txt/MODULE_IDENTIFIER.txt"
diff --git a/XMPFilesPlugins/PluginTemplate/resource/win/PluginTemplate-64.rc b/XMPFilesPlugins/PluginTemplate/resource/win/PluginTemplate-64.rc
new file mode 100644
index 0000000..c00e9f1
--- /dev/null
+++ b/XMPFilesPlugins/PluginTemplate/resource/win/PluginTemplate-64.rc
@@ -0,0 +1,8 @@
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// TXT
+//
+
+XMPPLUGINUIDS           TXT                     "../../resource/txt/XMPPLUGINUIDS-64.txt"
+MODULE_IDENTIFIER       TXT                     "../../resource/txt/MODULE_IDENTIFIER.txt"
diff --git a/XMPFilesPlugins/PluginTemplate/source/Template_Handler.cpp b/XMPFilesPlugins/PluginTemplate/source/Template_Handler.cpp
index 8727560..d4c08ac 100644
--- a/XMPFilesPlugins/PluginTemplate/source/Template_Handler.cpp
+++ b/XMPFilesPlugins/PluginTemplate/source/Template_Handler.cpp
@@ -83,6 +83,21 @@ const char* GetModuleIdentifier()
 	return kModuleIdentifier;
 }
 
+// This function will be called during initialization of the plugin.
+// Additional host API suite can be requested using RequestAPISuite().
+// The initialization will be aborted if false is returned.
+bool SetupPlugin()
+{
+	/*
+	 ExampleSuite* exampleSuite =
+	 	reinterpret_cast<ExampleSuite*>( RequestAPISuite( "exampleSuite", 1 ) );
+	 
+	 return (exampleSuite != NULL);
+	 */
+	
+	return true;
+}
+
 // All the file handlers present in this module will be registered. There may be many file handlers
 // inside one module. Only those file handlers which are registered here will be visible to XMPFiles.
 // This function need to be implemented by the plugin developer.
diff --git a/XMPFilesPlugins/api/source/HostAPI.h b/XMPFilesPlugins/api/source/HostAPI.h
index ec679f8..d94aae0 100644
--- a/XMPFilesPlugins/api/source/HostAPI.h
+++ b/XMPFilesPlugins/api/source/HostAPI.h
@@ -7,20 +7,17 @@
 // of the Adobe license agreement accompanying it.
 // =================================================================================================
 
-/**************************************************************************
-* @file HostAPI.h
-* 
-*  Function prototypes for the functions that is provided by the host (the XMPFiles) 
-*  that can be used by a plugin implementaion.
-*
-* @author Praveen Kumar Goyal (pkgoyal)
-* @bug No known bugs.
-***************************************************************************/
 
 #ifndef __HOSTAPI_H__
 #define __HOSTAPI_H__	1
 #include "PluginHandler.h"
 
+#define XMP_HOST_API_VERSION_1	1	// CS6
+#define XMP_HOST_API_VERSION_4	4	// CS7 and beyond
+
+#define XMP_HOST_API_VERSION	XMP_HOST_API_VERSION_4
+
+
 namespace XMP_PLUGIN
 {
 
@@ -34,8 +31,26 @@ struct Abort_API;
 struct StandardHandler_API;
 typedef char* StringPtr;
 
+/** @brief Request additional API suite from the host.
+ *
+ *  RequestAPISuite should be called during plugin initialization time
+ *  to request additional versioned APIs from the plugin host. If the name or version
+ *  of the requested API suite is unknown to the host an error is returned.
+ *
+ *  @param apiName The name of the API suite.
+ *  @param apiVersion The version of the API suite.
+ *  @param apiSuite On successful exit points to the API suite.
+ *  @param wError WXMP_Error structure which will be filled by the API if any error occurs.
+ *  @return kXMPErr_NoError on success otherwise error id of the failure.
+ */	
+typedef XMPErrorID (*RequestAPISuiteFn)( const char* apiName, XMP_Uns32 apiVersion, void** apiSuite, WXMP_Error* wError );
+	
+
 /** @struct HostAPI
  *  @brief This is a Host API structure.
+ *
+ *  Please don't change this struct.
+ *  Additional host functionality should be added through RequestAPISuite().
  */
 struct HostAPI
 {
@@ -45,7 +60,7 @@ struct HostAPI
 	XMP_Uns32				mSize;
    
 	/** 
-	 *  Version number of the plugin.
+	 *  Version number of the API.
 	 */
 	XMP_Uns32				mVersion;
 	
@@ -68,6 +83,16 @@ struct HostAPI
 	 * Pointer to a structure which contains API for accessing the standard file handler
 	 */
 	StandardHandler_API*	mStandardHandlerAPI;
+	
+	//
+	// VERSION 4
+	//
+	
+	/**
+	 * Function to request additional APIs from the host
+	 */
+	RequestAPISuiteFn		mRequestAPISuite;
+	
 };
 
 
@@ -92,7 +117,7 @@ struct FileIO_API
 	 *  @param wError WXMP_Error structure which will be filled by the API if any error occurs.
 	 *  @return kXMPErr_NoError on success otherwise error id of the failure.
 	 */	
-	typedef XMPErrorID (*ReadProc)( XMP_IORef io, void* buffer, XMP_Uns32 count, bool readAll, XMP_Uns32& byteRead, WXMP_Error * wError );
+	typedef XMPErrorID (*ReadProc)( XMP_IORef io, void* buffer, XMP_Uns32 count, XMP_Bool readAll, XMP_Uns32& byteRead, WXMP_Error * wError );
 	ReadProc		mReadProc;
 
 	/** @brief Write from a buffer.
@@ -224,7 +249,7 @@ struct Abort_API
 	 *  @param wError WXMP_Error structure which will be filled by the API if any error occurs.
 	 *  @return kXMPErr_NoError on success otherwise error id of the failure.
 	 */
-	typedef XMPErrorID (*CheckAbort)( SessionRef session, bool* aborted, WXMP_Error* wError );
+	typedef XMPErrorID (*CheckAbort)( SessionRef session, XMP_Bool * aborted, WXMP_Error* wError );
 	CheckAbort	mCheckAbort;
 };
 
@@ -241,7 +266,7 @@ struct StandardHandler_API
 	 * @param wError		WXMP_Error structure which will be filled by the API if any error occurs.
 	 * @return				kXMPErr_NoError on success otherwise error id of the failure.
 	 */
-	typedef XMPErrorID (*CheckFormatStandardHandler)( SessionRef session, XMP_FileFormat format, StringPtr path, bool& checkOK, WXMP_Error* wError );
+	typedef XMPErrorID (*CheckFormatStandardHandler)( SessionRef session, XMP_FileFormat format, StringPtr path, XMP_Bool & checkOK, WXMP_Error* wError );
 	CheckFormatStandardHandler mCheckFormatStandardHandler;
 
 	/** @brief Get XMP from standard file handler
@@ -256,10 +281,43 @@ struct StandardHandler_API
 	 * @param wError		WXMP_Error structure which will be filled by the API if any error occurs.
 	 * @return				kXMPErr_NoError on success otherwise error id of the failure.
 	 */
-	typedef XMPErrorID (*GetXMPStandardHandler)( SessionRef session, XMP_FileFormat format, StringPtr path, XMPMetaRef meta, bool* containsXMP, WXMP_Error* wError );
+	typedef XMPErrorID (*GetXMPStandardHandler)( SessionRef session, XMP_FileFormat format, StringPtr path, XMPMetaRef meta, XMP_Bool * containsXMP, WXMP_Error* wError );
+	GetXMPStandardHandler	mGetXMPStandardHandler;
+};
+
+struct StandardHandler_API_V2
+{
+	/** @brief Check format with standard file handler
+	 *
+	 * Call the replaced file handler (if available) to check the format of the data source.
+	 *
+	 * @param session		File handler session (referring to replacement handler)
+	 * @param format		The file format identifier
+	 * @param path			Path to the file that needs to be checked
+	 * @param checkOK		On return true if the data can be handled by the file handler
+	 * @param wError		WXMP_Error structure which will be filled by the API if any error occurs.
+	 * @return				kXMPErr_NoError on success otherwise error id of the failure.
+	 */
+	typedef XMPErrorID (*CheckFormatStandardHandler)( SessionRef session, XMP_FileFormat format, StringPtr path, XMP_Bool & checkOK, WXMP_Error* wError );
+	CheckFormatStandardHandler mCheckFormatStandardHandler;
+
+	/** @brief Get XMP from standard file handler
+	 *
+	 * Call the standard file handler in order to retrieve XMP from it.
+	 *
+	 * @param session		File handler session (referring to replacement handler)
+	 * @param format		The file format identifier
+	 * @param path			Path to the file that should be proceeded
+	 * @param xmpStr		Will on success contain serialized XMP Packet from the standard Handler
+	 * @param containsXMP	Returns true if the standard handler detected XMP
+	 * @param wError		WXMP_Error structure which will be filled by the API if any error occurs.
+	 * @return				kXMPErr_NoError on success otherwise error id of the failure.
+	 */
+	typedef XMPErrorID (*GetXMPStandardHandler)( SessionRef session, XMP_FileFormat format, StringPtr path, XMP_StringPtr* xmpStr, XMP_Bool * containsXMP, WXMP_Error* wError );
 	GetXMPStandardHandler	mGetXMPStandardHandler;
 };
 
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/XMPFilesPlugins/api/source/HostAPIAccess.cpp b/XMPFilesPlugins/api/source/HostAPIAccess.cpp
index f783769..4215b99 100644
--- a/XMPFilesPlugins/api/source/HostAPIAccess.cpp
+++ b/XMPFilesPlugins/api/source/HostAPIAccess.cpp
@@ -8,6 +8,10 @@
 // =================================================================================================
 
 #include "HostAPIAccess.h"
+#include <cstring>
+#include <string>
+#define TXMP_STRING_TYPE std::string
+#include "XMP.hpp"
 
 namespace XMP_PLUGIN
 {
@@ -18,18 +22,54 @@ namespace XMP_PLUGIN
 //
 	
 static HostAPIRef sHostAPI = NULL;
+static XMP_Uns32 sHostAPIVersion = 0;
+
+StandardHandler_API_V2* sStandardHandler_V2 = NULL;
+	
+// ============================================================================
+	
+static bool CheckAPICompatibility_V1 ( const HostAPIRef hostAPI )
+{
+	return ( hostAPI
+			&& hostAPI->mFileIOAPI
+			&& hostAPI->mStrAPI
+			&& hostAPI->mAbortAPI
+			&& hostAPI->mStandardHandlerAPI );
+}
+
+static bool CheckAPICompatibility_V4 ( const HostAPIRef hostAPI )
+{
+	return ( CheckAPICompatibility_V1( hostAPI )
+			&& hostAPI->mRequestAPISuite != NULL );
+}
+
+// ============================================================================
 
 bool SetHostAPI( HostAPIRef hostAPI )
 {
-	bool retVal = false;
-	if( hostAPI &&
-		hostAPI->mFileIOAPI &&
-		hostAPI->mStrAPI		)
+	bool valid = false;
+	if( hostAPI && hostAPI->mVersion > 0 )
+	{
+		if ( hostAPI->mVersion <= 3 )
+		{
+			// Old host API before plugin versioning changes
+			valid = CheckAPICompatibility_V1( hostAPI );
+		}
+		else
+		{
+			// New host API including RequestAPISuite.
+			// This version of the HostAPI struct should not be changed.
+			valid = CheckAPICompatibility_V4( hostAPI );
+		}
+	}
+	
+	if( valid )
 	{
 		sHostAPI = hostAPI;
-		retVal = true;
+		sHostAPIVersion = hostAPI->mVersion;
 	}
-	return retVal;
+	
+	return valid;
 }
 
 // ============================================================================
@@ -41,6 +81,13 @@ static HostAPIRef GetHostAPI()
 
 // ============================================================================
 
+static XMP_Uns32 GetHostAPIVersion()
+{
+	return sHostAPIVersion;
+}
+
+// ============================================================================
+
 inline void CheckError( WXMP_Error & error )
 {
 	if( error.mErrorID != kXMPErr_NoError )
@@ -161,7 +208,7 @@ void HostStringReleaseBuffer( StringPtr buffer )
 bool CheckAbort( SessionRef session )
 {
 	WXMP_Error error;
-	bool abort = false;
+	XMP_Bool abort = false;
 	GetHostAPI()->mAbortAPI->mCheckAbort( session, &abort, &error );
 
 	if( error.mErrorID == kXMPErr_Unavailable )
@@ -173,7 +220,7 @@ bool CheckAbort( SessionRef session )
 		throw XMP_Error( error.mErrorID, error.mErrorMsg );
 	}
 
-	return abort;
+	return ConvertXMP_BoolToBool( abort );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -181,4 +228,74 @@ bool CheckAbort( SessionRef session )
 // Standard file handler access
 //
 
+
+bool CheckFormatStandard( SessionRef session, XMP_FileFormat format, const StringPtr path )
+{
+	WXMP_Error error;
+	XMP_Bool ret = true;
+	if ( sStandardHandler_V2 == NULL )
+	{
+		throw XMP_Error( kXMPErr_Unavailable, "StandardHandler suite unavailable" );
+	}
+	sStandardHandler_V2->mCheckFormatStandardHandler( session, format, path, ret, &error );
+
+	if( error.mErrorID != kXMPErr_NoError )
+	{
+		throw XMP_Error( error.mErrorID, error.mErrorMsg );
+	}
+
+	return ConvertXMP_BoolToBool( ret );
+}
+
+// ============================================================================
+
+bool GetXMPStandard( SessionRef session, XMP_FileFormat format, const StringPtr path, std::string& xmpStr, bool* containsXMP )
+{
+	WXMP_Error error;
+	bool ret = true;
+	XMP_StringPtr outXmp= NULL;
+	XMP_Bool cXMP = kXMP_Bool_False;
+	if ( sStandardHandler_V2 == NULL )
+	{
+		throw XMP_Error( kXMPErr_Unavailable, "StandardHandler suite unavailable" );
+	}
+	sStandardHandler_V2->mGetXMPStandardHandler( session, format, path, &outXmp, &cXMP, &error );
+	*containsXMP = ConvertXMP_BoolToBool( cXMP );
+
+	if( error.mErrorID == kXMPErr_NoFileHandler || error.mErrorID == kXMPErr_BadFileFormat)
+	{
+		ret = false;
+	}
+	else if( error.mErrorID != kXMPErr_NoError )
+	{
+		throw XMP_Error( error.mErrorID, error.mErrorMsg );
+	}
+	xmpStr=outXmp;
+	HostStringReleaseBuffer( (StringPtr)outXmp ) ;
+	return ret;
+}
+
+// ============================================================================
+
+void* RequestAPISuite( const char* apiName, XMP_Uns32 apiVersion )
+{
+	void* suite = NULL;
+	
+	WXMP_Error error;
+	
+	if (GetHostAPIVersion() >= 4)
+	{
+		GetHostAPI()->mRequestAPISuite( apiName, apiVersion, &suite, &error );
+		CheckError(error);
+	}
+	else
+	{
+		throw XMP_Error( kXMPErr_Unavailable, "RequestAPISuite unavailable (host too old)" );
+	}
+	
+
+	return suite;
+}
+
+
 } //namespace XMP_PLUGIN
diff --git a/XMPFilesPlugins/api/source/HostAPIAccess.h b/XMPFilesPlugins/api/source/HostAPIAccess.h
index 3156f81..baae239 100644
--- a/XMPFilesPlugins/api/source/HostAPIAccess.h
+++ b/XMPFilesPlugins/api/source/HostAPIAccess.h
@@ -10,12 +10,24 @@
 #ifndef __HostAPIAccess_h__
 #define __HostAPIAccess_h__	1
 #include "HostAPI.h"
+#include <string>
 
 namespace XMP_PLUGIN
 {
 
+/** @brief Sets the host API struct for the plugin
+ *
+ *  The HostAPI struct will be passed in from the host during plugin initialization.
+ *  The struct will contain a mVersion field which contains the actual version of the host API.
+ *  As the plugin might be newer than the plugin host the plugin must always check if
+ *  a host function is available before calling into the host.
+ *
+ *  @param hostAPI The HostAPI struct. The struct can be smaller than expected.
+ *  @return True if the hostAPI was accepted by the plugin.
+ */
 bool SetHostAPI( HostAPIRef hostAPI );
 
+
 /** @class IOAdapter
  *  @brief This class deals with file I/O. It's a wrapper class over host API's functions hostAPI->mFileIOAPI.
  *
@@ -170,11 +182,24 @@ bool CheckFormatStandard( SessionRef session, XMP_FileFormat format, const Strin
  * @param session		File handler session  (should refer to replacement handler)
  * @param format		The file format identifier
  * @param path			Path to the file that should be proceeded
- * @param meta			Reference to XMPMeta instance. Will be populated with the XMP as read by the standard file handler
+ * @param xmpStr		Reference to serialized XMP packet. Will be populated with the XMP Packet as read by the standard file handler
  * @param containsXMP	Returns true if the standard handler detected XMP
  * @return				true on success
  */
-bool GetXMPStandard( SessionRef session, XMP_FileFormat format, const StringPtr path, XMPMetaRef meta, bool* containsXMP );
+bool GetXMPStandard( SessionRef session, XMP_FileFormat format, const StringPtr path, std::string& xmpStr, bool* containsXMP );
+
+/** @brief Request additional API suite from the host.
+ *
+ *  RequestAPISuite should be called during plugin initialization time
+ *  to request additional versioned APIs from the plugin host. If the name or version
+ *  of the requested API suite is unknown NULL is returned.
+ *
+ *  @param apiName The name of the API suite.
+ *  @param apiVersion The version of the API suite.
+ *  @return pointer to the suite struct or NULL if name/version is unknown.
+ */	
+void* RequestAPISuite( const char* apiName, XMP_Uns32 apiVersion );
+
 
 } //namespace XMP_PLUGIN
 
diff --git a/XMPFilesPlugins/api/source/PluginAPIImpl.cpp b/XMPFilesPlugins/api/source/PluginAPIImpl.cpp
index 2643558..ec22cee 100644
--- a/XMPFilesPlugins/api/source/PluginAPIImpl.cpp
+++ b/XMPFilesPlugins/api/source/PluginAPIImpl.cpp
@@ -7,13 +7,14 @@
 // of the Adobe license agreement accompanying it.
 // =================================================================================================
 
+#include "HostAPIAccess.h"
 #include "PluginBase.h"
+#include "PluginHandler.h"
 #include "PluginRegistry.h"
 
 namespace XMP_PLUGIN
 {
 
-#define PLUGIN_VERSION	1 
 #define XMP_MIN(a, b) (((a) < (b)) ? (a) : (b))
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -74,9 +75,8 @@ static XMPErrorID Static_SetHostAPI( HostAPIRef hostAPI, WXMP_Error * wError )
 
 	wError->mErrorID = kXMPErr_SetHostAPI;
 
-	if( hostAPI && hostAPI->mVersion == PLUGIN_VERSION )
+	if( SetHostAPI( hostAPI ) )
 	{
-		SetHostAPI( hostAPI );
 		wError->mErrorID = kXMPErr_NoError;
 	}
 	
@@ -132,7 +132,7 @@ static XMPErrorID Static_TerminateSession( SessionRef session, WXMP_Error * wErr
 
 // ============================================================================
 
-static XMPErrorID Static_CheckFileFormat( XMP_StringPtr uid, XMP_StringPtr filePath, XMP_IORef fileRef, bool * value, WXMP_Error * wError )
+static XMPErrorID Static_CheckFileFormat( XMP_StringPtr uid, XMP_StringPtr filePath, XMP_IORef fileRef, XMP_Bool * value, WXMP_Error * wError )
 {
 	if( wError == NULL )	return kXMPErr_BadParam;
 
@@ -154,7 +154,7 @@ static XMPErrorID Static_CheckFileFormat( XMP_StringPtr uid, XMP_StringPtr fileP
 
 // ============================================================================
 
-static XMPErrorID Static_CheckFolderFormat( XMP_StringPtr uid, XMP_StringPtr rootPath, XMP_StringPtr gpName, XMP_StringPtr parentName, XMP_StringPtr leafName, bool * value, WXMP_Error * wError )
+static XMPErrorID Static_CheckFolderFormat( XMP_StringPtr uid, XMP_StringPtr rootPath, XMP_StringPtr gpName, XMP_StringPtr parentName, XMP_StringPtr leafName, XMP_Bool * value, WXMP_Error * wError )
 {
 	if( wError == NULL )	return kXMPErr_BadParam;
 
@@ -175,7 +175,7 @@ static XMPErrorID Static_CheckFolderFormat( XMP_StringPtr uid, XMP_StringPtr roo
 
 // ============================================================================
 
-static XMPErrorID Static_GetFileModDate ( SessionRef session, bool * ok, XMP_DateTime * modDate, WXMP_Error * wError )
+static XMPErrorID Static_GetFileModDate ( SessionRef session, XMP_Bool * ok, XMP_DateTime * modDate, WXMP_Error * wError )
 {
 	if( wError == NULL )	return kXMPErr_BadParam;
 
@@ -221,7 +221,7 @@ static XMPErrorID Static_CacheFileData( SessionRef session, XMP_IORef fileRef, X
 
 // ============================================================================
 
-static XMPErrorID Static_UpdateFile( SessionRef session, XMP_IORef fileRef, bool doSafeUpdate, XMP_StringPtr xmpStr, WXMP_Error * wError )
+static XMPErrorID Static_UpdateFile( SessionRef session, XMP_IORef fileRef, XMP_Bool doSafeUpdate, XMP_StringPtr xmpStr, WXMP_Error * wError )
 {
 	if( wError == NULL )	return kXMPErr_BadParam;
 
@@ -232,7 +232,7 @@ static XMPErrorID Static_UpdateFile( SessionRef session, XMP_IORef fileRef, bool
 	{
 		if(thiz)
 		{
-			thiz->updateFile( fileRef, doSafeUpdate, xmpStr );
+			thiz->updateFile( fileRef, ConvertXMP_BoolToBool( doSafeUpdate ), xmpStr );
 			wError->mErrorID = kXMPErr_NoError;
 		}
 	}
@@ -295,6 +295,129 @@ static XMPErrorID Static_ExportFromXMP( SessionRef session, XMPMetaRef xmp, WXMP
 
 // ============================================================================
 
+static XMPErrorID Static_FillMetadataFiles( SessionRef session, StringVectorRef metadataFiles,
+	SetStringVectorProc SetStringVector, WXMP_Error * wError )
+{
+	if( wError == NULL )	return kXMPErr_BadParam;
+
+	wError->mErrorID = kXMPErr_PluginFillMetadataFiles;
+
+	PluginBase* thiz = (PluginBase*) session;
+	try
+	{
+		if(thiz)
+		{
+			thiz->FillMetadataFiles(metadataFiles, SetStringVector);
+			wError->mErrorID = kXMPErr_NoError;
+		}
+	}
+	catch( ... )
+	{
+		HandleException( wError );
+	}
+
+	return wError->mErrorID;
+}
+
+
+static XMPErrorID Static_FillAssociatedResources( SessionRef session, StringVectorRef resourceList,
+	SetStringVectorProc SetStringVector, WXMP_Error * wError )
+{
+	if( wError == NULL )	return kXMPErr_BadParam;
+
+	wError->mErrorID = kXMPErr_PluginFillAssociatedResources;
+
+	PluginBase* thiz = (PluginBase*) session;
+	try
+	{
+		if(thiz)
+		{
+			thiz->FillAssociatedResources(resourceList, SetStringVector);
+			wError->mErrorID = kXMPErr_NoError;
+		}
+	}
+	catch( ... )
+	{
+		HandleException( wError );
+	}
+
+	return wError->mErrorID;
+}
+
+static XMPErrorID Static_ImportToXMPString( SessionRef session, XMP_StringPtr* xmpStr, WXMP_Error * wError )
+{
+	if( wError == NULL )	return kXMPErr_BadParam;
+
+	wError->mErrorID = kXMPErr_PluginImportToXMP;
+	
+	PluginBase* thiz = (PluginBase*) session;
+	try
+	{
+		if(thiz)
+		{
+			thiz->importToXMP( xmpStr );
+			wError->mErrorID = kXMPErr_NoError;
+		}
+	}
+	catch( ... )
+	{
+		HandleException( wError );
+	}
+
+	return wError->mErrorID;
+}
+
+// ============================================================================
+
+static XMPErrorID Static_ExportFromXMPString( SessionRef session, XMP_StringPtr xmpStr, WXMP_Error * wError )
+{
+	if( wError == NULL )	return kXMPErr_BadParam;
+
+	wError->mErrorID = kXMPErr_PluginExportFromXMP;
+
+	PluginBase* thiz = (PluginBase*) session;
+	try
+	{
+		if(thiz)
+		{
+			thiz->exportFromXMP( xmpStr );
+			wError->mErrorID = kXMPErr_NoError;
+		}
+	}
+	catch( ... )
+	{
+		HandleException( wError );
+	}
+
+	return wError->mErrorID;
+}
+
+
+static XMPErrorID Static_IsMetadataWritable( SessionRef session, XMP_Bool * result, WXMP_Error * wError )
+{
+	if( wError == NULL || result == NULL )	return kXMPErr_BadParam;
+
+	wError->mErrorID = kXMPErr_PluginIsMetadataWritable;
+
+	PluginBase* thiz = (PluginBase*) session;
+	try
+	{
+		if(thiz)
+		{
+			*result = false;
+			*result = ConvertBoolToXMP_Bool( thiz->IsMetadataWritable( ) );
+			wError->mErrorID = kXMPErr_NoError;
+		}
+	}
+	catch( ... )
+	{
+		HandleException( wError );
+	}
+
+	return wError->mErrorID;
+}
+// ============================================================================
+
 XMPErrorID InitializePlugin( XMP_StringPtr moduleID, PluginAPIRef pluginAPI, WXMP_Error * wError )
 {
 	if( wError == NULL )	return kXMPErr_BadParam;
@@ -303,6 +426,7 @@ XMPErrorID InitializePlugin( XMP_StringPtr moduleID, PluginAPIRef pluginAPI, WXM
 	
 	if( !pluginAPI || moduleID == NULL )
 	{
+		wError->mErrorID = kXMPErr_BadParam;
 		wError->mErrorMsg = "pluginAPI or moduleID is NULL";
 		return wError->mErrorID;
 	}
@@ -319,11 +443,15 @@ XMPErrorID InitializePlugin( XMP_StringPtr moduleID, PluginAPIRef pluginAPI, WXM
 	
 		RegisterFileHandlers(); // Register all file handlers
 
-		// Initialize all the registered file handlers
-		if( PluginRegistry::initialize() )
+		bool initialized = PluginRegistry::initialize(); // Initialize all the registered file handlers
+
+		if( initialized )
 		{
-			pluginAPI->mVersion = PLUGIN_VERSION;
-			pluginAPI->mSize = sizeof(PluginAPI);
+			XMP_Uns32 size = sizeof(*pluginAPI);
+			
+			// The pluginAPI struct from the (older) host might be smaller than expected
+			// so make sure that we don't write over the end of the struct.
+			pluginAPI->mVersion = XMP_PLUGIN_VERSION;
 			
 			pluginAPI->mTerminatePluginProc = Static_TerminatePlugin;
 			pluginAPI->mSetHostAPIProc      = Static_SetHostAPI;
@@ -340,6 +468,29 @@ XMPErrorID InitializePlugin( XMP_StringPtr moduleID, PluginAPIRef pluginAPI, WXM
 
 			pluginAPI->mImportToXMPProc = Static_ImportToXMP;
 			pluginAPI->mExportFromXMPProc = Static_ExportFromXMP;
+			
+			// version 2
+			if( pluginAPI->mSize > offsetof( PluginAPI, mFillMetadataFilesProc ) )
+			{
+				pluginAPI->mFillMetadataFilesProc = Static_FillMetadataFiles;
+				pluginAPI->mImportToXMPStringProc = Static_ImportToXMPString;
+				pluginAPI->mExportFromXMPStringProc = Static_ExportFromXMPString;
+				pluginAPI->mFillAssociatedResourcesProc = Static_FillAssociatedResources;
+			}
+			
+			// version 3
+			if( pluginAPI->mSize > offsetof( PluginAPI, mIsMetadataWritableProc ) )
+			{
+				pluginAPI->mIsMetadataWritableProc = Static_IsMetadataWritable;
+			}
+			
+			// Compatibility hack for CS6 (plugin version 1):
+			// set mVersion to 1 if pluginAPI is for version 1
+			// because in CS6 plugin version is used to determine the hostAPI version.
+			if (pluginAPI->mSize <= offsetof( PluginAPI, mFillMetadataFilesProc ))
+			{
+				pluginAPI->mVersion = 1;
+			}
 
 			wError->mErrorID = kXMPErr_NoError;
 		}
@@ -351,5 +502,52 @@ XMPErrorID InitializePlugin( XMP_StringPtr moduleID, PluginAPIRef pluginAPI, WXM
 	
 	return wError->mErrorID;
 }
+	
+// ============================================================================
+
+XMPErrorID InitializePlugin2( XMP_StringPtr moduleID, HostAPIRef hostAPI, PluginAPIRef pluginAPI, WXMP_Error * wError )
+{
+	if( wError == NULL )
+	{
+		return kXMPErr_BadParam;	
+	}
+	
+	if( hostAPI == NULL )
+	{
+		wError->mErrorID = kXMPErr_BadParam;
+		wError->mErrorMsg = "hostAPI is NULL";
+		return wError->mErrorID;
+	}
+	
+	wError->mErrorID = kXMPErr_PluginInitialized;
+	
+	try
+	{
+		if( SetHostAPI(hostAPI) )
+		{
+			if( SetupPlugin() )
+			{
+				if( InitializePlugin( moduleID, pluginAPI, wError ) )
+				{
+					wError->mErrorID = kXMPErr_NoError;
+				}
+			}
+			else
+			{
+				wError->mErrorMsg = "SetupPlugin failed";
+			}
+		}
+		else
+		{
+			wError->mErrorMsg = "SetHostAPI failed";			
+		}
+	}
+	catch( ... )
+	{
+		HandleException( wError );
+	}
+
+	return wError->mErrorID;
+}
 
 } //namespace XMP_PLUGIN
diff --git a/XMPFilesPlugins/api/source/PluginBase.cpp b/XMPFilesPlugins/api/source/PluginBase.cpp
index ba1aeff..06c53ae 100644
--- a/XMPFilesPlugins/api/source/PluginBase.cpp
+++ b/XMPFilesPlugins/api/source/PluginBase.cpp
@@ -8,6 +8,8 @@
 // =================================================================================================
 
 #include "PluginBase.h"
+#include "source/XMP_LibUtils.hpp"
+#include "source/Host_IO.hpp"
 #include "XMP.incl_cpp"
 
 #if XMP_WinBuild
@@ -59,10 +61,106 @@ void PluginBase::writeTempFile( XMP_IORef srcFileRef, XMP_IORef tmpFileRef, XMP_
 	this->writeTempFile( srcFile, tmpFile, buffer );
 }
 
+void PluginBase::FillMetadataFiles( StringVectorRef metadataFiles, SetStringVectorProc SetStringVector )
+{
+	if ( metadataFiles == 0 ) 
+		XMP_Throw ( "A result file list vector must be provided", kXMPErr_BadParam );
+
+	std::vector<std::string> fileList;	// Pass a local vector, not the client's.
+	(*SetStringVector)( metadataFiles, 0, 0 );	// Clear the client's result vector.
+	FillMetadataFiles( &fileList );
+
+	// since we are dealing with STL ojbects across different DLL boundaries,
+	// we are extracting const char* to actual path strings, constructing a vector
+	// using these pointers and then passing the address of the underlying data
+	// to the clients procedure which will repopulate its own vector of strings
+	// using this information.
+	if ( ! fileList.empty() ) {
+		const size_t fileCount = fileList.size();
+		std::vector<XMP_StringPtr> ptrArray;
+		ptrArray.reserve ( fileCount );
+		for ( size_t i = 0; i < fileCount; ++i ) {
+			ptrArray.push_back ( fileList[i].c_str() );
+		}
+		(*SetStringVector) ( metadataFiles, ptrArray.data(), fileCount );
+	}
+}
+
+void PluginBase::FillMetadataFiles( std::vector<std::string> * metadataFiles )
+{
+	XMP_OptionBits flags = this->mHandlerFlags;
+	if ( (flags & kXMPFiles_UsesSidecarXMP) ||
+		(flags & kXMPFiles_FolderBasedFormat) ) {
+			XMP_Throw ( "Base implementation of FillMetadataFiles only for embedding handlers", kXMPErr_PluginFillMetadataFiles );
+	}
+
+	metadataFiles->push_back ( this->getPath() );
+}
+
+
+void PluginBase::FillAssociatedResources( StringVectorRef resourceList, SetStringVectorProc SetStringVector )
+{
+	if ( resourceList == 0 ) 
+		XMP_Throw ( "A result file list vector must be provided", kXMPErr_BadParam );
+
+	std::vector<std::string> resList;	// Pass a local vector, not the client's.
+	(*SetStringVector)( resourceList, 0, 0 );	// Clear the client's result vector.
+	FillAssociatedResources( &resList );
+
+	if ( ! resList.empty() ) {
+		const size_t fileCount = resList.size();
+		std::vector<XMP_StringPtr> ptrArray;
+		ptrArray.reserve ( fileCount );
+		for ( size_t i = 0; i < fileCount; ++i ) {
+			ptrArray.push_back ( resList[i].c_str() );
+		}
+		(*SetStringVector) ( resourceList, ptrArray.data(), fileCount );
+	}
+}
+
+
+void PluginBase::FillAssociatedResources( std::vector<std::string> * resourceList ) 
+{	
+	XMP_OptionBits flags = this->mHandlerFlags;
+	if ( (flags & kXMPFiles_HandlerOwnsFile) ||
+		 (flags & kXMPFiles_UsesSidecarXMP) ||
+		 (flags & kXMPFiles_FolderBasedFormat) ) {
+			XMP_Throw ( "GetAssociatedResources is not implemented for this file format", kXMPErr_PluginFillAssociatedResources );
+	}
+	resourceList->push_back ( this->getPath() );
+}
+
 // ============================================================================
 // ============================================================================
 // ============================================================================
 
+
+void PluginBase::importToXMP( XMP_StringPtr* xmpStr ) 
+{
+	// To be implemented by the Plug-In Developer
+	// Generally a Plugin developer should follow the following steps
+	// when implementing this function
+	// a) Create a XMP object from serialized XMP packet.
+	// b) Import the data from Non-XMP content to XMP object
+	// c) Serialize the XMP object to a dynamic buffer.
+	//    Dynamic buffer is allocated using HostAPI HostStringCreateBuffer
+	// d) Copy the dynamic buffer address to xmpStr
+}
+
+// ============================================================================
+
+void PluginBase::exportFromXMP( XMP_StringPtr xmpStr ) 
+{
+	// To be implemented by the Plug-In Developer
+	// Generally a Plugin developer should follow the following steps
+	// when implementing this function
+	// a) Create a XMP object from serialized XMP packet.
+	// b) Export the data from XMP object to non-XMP Content.
+}
+
+
+// ============================================================================
+
 bool PluginBase::getFileModDate ( XMP_DateTime * modDate )
 {
 	XMP_OptionBits flags = this->getHandlerFlags();
@@ -79,6 +177,27 @@ bool PluginBase::getFileModDate ( XMP_DateTime * modDate )
 	return GetModifyDate ( filePath.c_str(), modDate );
 }
 
+bool PluginBase::IsMetadataWritable ( )
+{
+	XMP_OptionBits flags = this->getHandlerFlags();
+	const std::string & filePath = this->getPath();
+	
+	if ( (flags & kXMPFiles_HandlerOwnsFile)   ||
+		 (flags & kXMPFiles_UsesSidecarXMP)    ||
+		 (flags & kXMPFiles_FolderBasedFormat) ||
+		 filePath.empty() )
+	{
+		XMP_Throw ( "IsMetadataWritable is not implemented for this file format", kXMPErr_PluginIsMetadataWritable );
+	}
+
+	try {
+		return Host_IO::Writable( this->getPath().c_str() );
+	} catch ( ... ) {
+
+	}
+	return false;
+}
+
 // ============================================================================
 
 bool PluginBase::checkAbort( bool doAbort /*= false*/)
@@ -94,7 +213,26 @@ bool PluginBase::checkAbort( bool doAbort /*= false*/)
 }
 
 // ============================================================================
+
+
+bool PluginBase::checkFormatStandard( const std::string* path /*= NULL*/ )
+{
+	const StringPtr _path	= (const StringPtr)( path == NULL ? this->getPath().c_str() : path->c_str() );
+
+	return CheckFormatStandard( this, this->getFormat(), _path );
+}
+
 // ============================================================================
+
+bool PluginBase::getXMPStandard( std::string& xmpStr, const std::string* path /*= NULL*/, bool* containsXMP /*= NULL*/ )
+{
+	const StringPtr _path	= (const StringPtr)( path == NULL ? this->getPath().c_str() : path->c_str() );
+
+	bool ret = GetXMPStandard( this, this->getFormat(), _path, xmpStr, containsXMP );
+
+	return ret;
+}
+
 // ============================================================================
 
 #if XMP_WinBuild
diff --git a/XMPFilesPlugins/api/source/PluginBase.h b/XMPFilesPlugins/api/source/PluginBase.h
index 98932e7..a827687 100644
--- a/XMPFilesPlugins/api/source/PluginBase.h
+++ b/XMPFilesPlugins/api/source/PluginBase.h
@@ -14,15 +14,15 @@
 * All plugin should be derived from PluginBase. This is the basic miinimum 
 * functionalty which a  plugin should provide.
 * 
-* @author Praveen Kumar Goyal (pkgoyal)
-* @bug No known bugs.
 ***************************************************************************/
 
 #ifndef PLUGINBASE_H
 #define PLUGINBASE_H
 
+
+#include <cstring>
+#include <vector>
 #include <string>
-#include <string.h>
 #include "HostAPIAccess.h"
 #define TXMP_STRING_TYPE std::string
 #include "XMP.hpp"
@@ -36,8 +36,8 @@ namespace XMP_PLUGIN
 	virtual void cacheFileData( const IOAdapter& file, std::string& xmpStr );
 	virtual void updateFile( const IOAdapter& file, bool doSafeUpdate, const std::string& xmpStr );
 	virtual void writeTempFile( const IOAdapter& srcFile, const IOAdapter& tmpFile, const std::string& xmpStr ) ;
-	virtual void importToXMP( SXMPMeta& xmp );
-	virtual void exportFromXMP( const SXMPMeta& xmp );
+	virtual void importToXMP( XMP_StringPtr* xmpStr  );
+	virtual void exportFromXMP( XMP_StringPtr xmpStr  );
 
     First two functions are pure virtual functions so these should be implemented for sure. 
     Last three functions(eg. writeTempFile, importToXMP, exportToXMP) may not be required by the file
@@ -73,6 +73,35 @@ public:
 	void cacheFileData( XMP_IORef fileRef, XMP_StringPtr* xmpStr );
 	void updateFile( XMP_IORef fileRef, bool doSafeUpdate, XMP_StringPtr xmpStr );
 	void writeTempFile( XMP_IORef srcFileRef, XMP_IORef fileRef, XMP_StringPtr xmpStr );
+	void FillMetadataFiles( StringVectorRef metadataFiles, SetStringVectorProc SetStringVector );
+	void FillAssociatedResources( StringVectorRef resourceList, SetStringVectorProc SetStringVector );
+	/** @brief Check format with standard file handler
+	*
+	* Call the standard file handler to check the format of the data source.
+	* This call expects that this is a replacement file handler. Otherwise
+	* the call fails with an exception.
+	*
+	* @param path	Pointer to the path string of the file to be checked. Pass NULL to check the
+	*				file passed in during initialization (see PluginBase::getPath() )
+	* @return		true on success
+	*/
+	bool checkFormatStandard( const std::string* path = NULL );
+
+	/** @brief Get metadata from standard file handler
+	 *
+	 * Call the standard file handler in order to retrieve XMP from it.
+	 * This call expects that session refers to a replacement file handler. Otherwise
+	 * this call fails with an exception.
+	 * Calls checkFormatStandard internally before calling the actual standard handler.
+	 *
+	 * @param xmpStr		Serialized to XMP packet. Will be populated with XMP read from standard handler.
+	 * @param path			Pointer to the path string of the file to be checked. Pass NULL to check the
+	 *						file passed in during initialization (see PluginBase::getPath() )
+	 * @param containsXMP	Returns true if the standard handler detected XMP
+	 * @return				true on success
+	 */
+	bool getXMPStandard( std::string& xmpStr, const std::string* path = NULL, bool* containsXMP = NULL );
+
 	/** @brief Get file format
 	 *
 	 * Get the file format of this handler. 
@@ -126,12 +155,48 @@ public:
 	 *
 	 */
 	virtual bool getFileModDate ( XMP_DateTime* modDate );
+	virtual void FillMetadataFiles ( std::vector<std::string> * metadataFiles );
+
+	 /** @brief Return the list of all resources associated to the opened filePath
+	 *
+	 * The purpose of the method FillAssociatedResources is to return all files, XMP or non-XMP, 
+	 * that are associated to the current opened filePath.In the case of a typical single file with 
+	 * embedded metadata this is that one file. In the simple sidecar case one or two paths will be 
+     * returned, one if there is no sidecar XMP and two if sidecar XMP exists. For folder-based 
+     * handlers paths to all associated files is returned, including the files and folders necessary
+     * to identify the format.In general, all the returned paths are existent.
+	 * 
+	 * The default implementation only cares about the case of a single file with embedded metadata.
+	 * All other cases will fail and return false.
+	 *
+	 * @param resourceList	A required pointer to return the list of all associated resources.
+	 *
+	 */
+	virtual void FillAssociatedResources ( std::vector<std::string> * resourceList );
+
+	
+	 /** @brief Returns true if the Metadata can be updated for the opened filePath
+	 *
+	 * The purpose of the method IsMetadataWritable is to to check if metadata can be updated or 
+	 * written to the format. In the case of folder-based video formats only if all the metadata  
+	 * files can be written to, true is returned.In other words, false is returned for a 
+     * partial-write state of metadata files in folder-based media formats. 
+	 * 
+	 * The default implementation only cares about the case of a single file with embedded metadata.
+	 * All other cases will fail and return false.
+	 *
+	 * @return	True if the metadata can be updated, otherwise false
+	 *
+	 */
+	virtual bool IsMetadataWritable ( );
 
 	/** Virtual functions which need to be implemented by the plugin Developer in the derived class. 
 	 */
 	virtual void cacheFileData( const IOAdapter& file, std::string& xmpStr ) = 0;
 	virtual void updateFile( const IOAdapter& file, bool doSafeUpdate, const std::string& xmpStr ) = 0;
 	virtual void writeTempFile( const IOAdapter& srcFile, const IOAdapter& tmpFile, const std::string& xmpStr ) {}
+	virtual void importToXMP( XMP_StringPtr* xmpStr );
+	virtual void exportFromXMP( XMP_StringPtr xmpStr );
 private:
 	std::string		mPath;
 	XMP_OptionBits	mHandlerFlags;
@@ -152,6 +217,14 @@ private:
  */
 const char* GetModuleIdentifier();
 
+/** @brief Do additional steps to setup the plugin during plugin initialization.
+ *
+ *  This function will be called during initialization of the plugin and can be
+ *  used to request additional host API suites using RequestAPISuite().
+ *  The plugin initialization will be aborted if false is returned.
+ */
+bool SetupPlugin();
+
 /** @brief Register the file handlers available in the plug-in. 
  *
  *  This function need to be implemented by plugin-developer. This function register the file handlers available in the plugin. 
diff --git a/XMPFilesPlugins/api/source/PluginConst.h b/XMPFilesPlugins/api/source/PluginConst.h
index ba28270..d17e8fb 100644
--- a/XMPFilesPlugins/api/source/PluginConst.h
+++ b/XMPFilesPlugins/api/source/PluginConst.h
@@ -12,37 +12,48 @@
 
 #include "XMP_Const.h"
 
+typedef void * StringVectorRef;
+typedef void (* SetStringVectorProc) ( StringVectorRef vectorRef, XMP_StringPtr * arrayPtr, XMP_Uns32 stringCount );
+
 enum 
 {
 	/// Plugin-internal failures
-	kXMPErr_PluginInternal			= 500,
+	kXMPErr_PluginInternal			      = 500,
 	/// 
-	kXMPErr_PluginInitialized		= 501,
+	kXMPErr_PluginInitialized		      = 501,
 	/// 
-	kXMPErr_PluginTerminate			= 502,
+	kXMPErr_PluginTerminate			      = 502,
 	/// 
-	kXMPErr_PluginSessionInit		= 503,
+	kXMPErr_PluginSessionInit		      = 503,
 	/// 
-	kXMPErr_PluginSessionTerm		= 504,
+	kXMPErr_PluginSessionTerm		      = 504,
 	/// 
-	kXMPErr_PluginCacheFileData		= 505,
+	kXMPErr_PluginCacheFileData		      = 505,
 	/// 
-	kXMPErr_PluginUpdateFile		= 506,
+	kXMPErr_PluginUpdateFile		      = 506,
 	/// 
-	kXMPErr_PluginWriteTempFile		= 507,
+	kXMPErr_PluginWriteTempFile		      = 507,
 	/// 
-	kXMPErr_PluginImportToXMP		= 508,
+	kXMPErr_PluginImportToXMP		      = 508,
 	/// 
-	kXMPErr_PluginExportFromXMP		= 509,
+	kXMPErr_PluginExportFromXMP		      = 509,
 	/// 
-	kXMPErr_PluginCheckFileFormat	= 510,
+	kXMPErr_PluginCheckFileFormat	      = 510,
 	/// 
-	kXMPErr_PluginCheckFolderFormat	= 511,
+	kXMPErr_PluginCheckFolderFormat	      = 511,
 	///
-	kXMPErr_SetHostAPI	            = 512,
+	kXMPErr_SetHostAPI	                  = 512,
 	///
-	kXMPErr_PluginGetFileModDate    = 513,
-
+	kXMPErr_PluginGetFileModDate          = 513,
+	///
+	kXMPErr_PluginFillMetadataFiles       = 514,
+	///
+	kXMPErr_PluginFillAssociatedResources = 515,
+	///
+	kXMPErr_PluginIsMetadataWritable	  = 516,
+	
+	/// last plugin error, please add new errors before this one
+	kXMPErr_PluginLastError
 };
 
 #endif	// __PLUGIN_CONST_H__
diff --git a/XMPFilesPlugins/api/source/PluginHandler.h b/XMPFilesPlugins/api/source/PluginHandler.h
index 85530dd..21c3d43 100644
--- a/XMPFilesPlugins/api/source/PluginHandler.h
+++ b/XMPFilesPlugins/api/source/PluginHandler.h
@@ -14,14 +14,19 @@
 * This contains the prototype for the plug-in based File Handlers. Plug-in need 
 * to implement exported function InitializePlugin.
 * 
-* @author Praveen Kumar Goyal (pkgoyal)
-* @bug No known bugs.
 ***************************************************************************/
 
 #ifndef __Plugin_Handler_hpp__
 #define __Plugin_Handler_hpp__	1
 #include "PluginConst.h"
 
+// versioning
+#define XMP_PLUGIN_VERSION_1	1	// CS6
+#define XMP_PLUGIN_VERSION_2	2	//
+#define XMP_PLUGIN_VERSION_3	3	// CS7
+
+#define XMP_PLUGIN_VERSION		XMP_PLUGIN_VERSION_3
+
 namespace XMP_PLUGIN
 {
 
@@ -114,7 +119,7 @@ typedef XMPErrorID (*TerminateSessionProc)( SessionRef session, WXMP_Error * wEr
  *  @param wError		WXMP_Error structure which will be filled by the API if any error occurs.
  *  @return				kXMPErr_NoError on success otherwise error id of the failure.
  */
-typedef XMPErrorID (*CheckSessionFileFormatProc)( XMP_StringPtr uid, XMP_StringPtr filePath, XMP_IORef fileRef, bool * result, WXMP_Error * wError );
+typedef XMPErrorID (*CheckSessionFileFormatProc)( XMP_StringPtr uid, XMP_StringPtr filePath, XMP_IORef fileRef, XMP_Bool * result, WXMP_Error * wError );
 
 /** 
  *  Function pointer to the function CheckFolderFormat which will be called to
@@ -129,18 +134,18 @@ typedef XMPErrorID (*CheckSessionFileFormatProc)( XMP_StringPtr uid, XMP_StringP
  *  @param wError		WXMP_Error structure which will be filled by the API if any error occurs.
  *  @return				kXMPErr_NoError on success otherwise error id of the failure.
  */
-typedef XMPErrorID (*CheckSessionFolderFormatProc)( XMP_StringPtr uid, XMP_StringPtr rootPath, XMP_StringPtr gpName, XMP_StringPtr parentName, XMP_StringPtr leafName, bool * result, WXMP_Error * wError );
+typedef XMPErrorID (*CheckSessionFolderFormatProc)( XMP_StringPtr uid, XMP_StringPtr rootPath, XMP_StringPtr gpName, XMP_StringPtr parentName, XMP_StringPtr leafName, XMP_Bool * result, WXMP_Error * wError );
 
 /**
  * Function type for GetFileModDate. Returns the most recent file modification date for any file
  * associated with the path that is read to obtain metadata. A static routine in XMPFiles.
  *
  *  @param session		File Handler instance.
- *	@param ok			A pointer to a bool for the eventual public API function result.
+ *	@param ok			A pointer to a XMP_Bool for the eventual public API function result.
  *	@param modDate		A pointer to the date to be returned.
  *  @param wError		WXMP_Error structure which will be filled by the API if any error occurs.
  */
-typedef XMPErrorID (*GetSessionFileModDateProc) ( SessionRef session, bool * ok, XMP_DateTime * modDate, WXMP_Error * wError );
+typedef XMPErrorID (*GetSessionFileModDateProc) ( SessionRef session, XMP_Bool * ok, XMP_DateTime * modDate, WXMP_Error * wError );
 
 /** 
  *  Function pointer to the function CacheFileData which will be called to
@@ -165,7 +170,7 @@ typedef XMPErrorID (*CacheFileDataProc)( SessionRef session, XMP_IORef fileRef,
  *  @param wError		WXMP_Error structure which will be filled by the API if any error occurs.
  *  @return				kXMPErr_NoError on success otherwise error id of the failure.
  */
-typedef XMPErrorID (*UpdateFileProc)( SessionRef session, XMP_IORef fileRef, bool doSafeUpdate, XMP_StringPtr xmpStr, WXMP_Error * wError );
+typedef XMPErrorID (*UpdateFileProc)( SessionRef session, XMP_IORef fileRef, XMP_Bool doSafeUpdate, XMP_StringPtr xmpStr, WXMP_Error * wError );
 
 /** 
  *  Function pointer to the function WriteTempFile. It write the entire file format into a
@@ -203,6 +208,65 @@ typedef XMPErrorID (*ImportToXMPProc)( SessionRef session, XMPMetaRef xmp, WXMP_
  */
 typedef XMPErrorID (*ExportFromXMPProc)( SessionRef session, XMPMetaRef xmp, WXMP_Error * wError );
 
+/** 
+ *  Function pointer to the function FillMetadataFiles. This function returns the list of file paths
+ *  associated with storing the metadata information.
+ *
+ *  @param session					File Handler instance.
+ *  @param metadataFiles			pointer of std::vector of std::string
+ *  @param SetClientStringVector	pointer to client provided function to fill the vector with strings.
+ *  @param wError					WXMP_Error structure which will be filled by the API if any error occurs.
+ *  @return							kXMPErr_NoError on success otherwise error id of the failure.
+ */
+typedef XMPErrorID (*FillMetadataFilesProc)( SessionRef session, StringVectorRef metadataFiles,
+	SetStringVectorProc SetClientStringVector, WXMP_Error * wError );
+
+/** 
+ *  Function pointer to the function FillAssociatedResources. This function returns the list of all file paths
+ *  associated to the opened session 
+ *
+ *  @param session					File Handler instance.
+ *  @param resourceList			    pointer of std::vector of std::string
+ *  @param SetClientStringVector	pointer to client provided function to fill the vector with strings.
+ *  @param wError					WXMP_Error structure which will be filled by the API if any error occurs.
+ *  @return							kXMPErr_NoError on success otherwise error id of the failure.
+ */
+typedef XMPErrorID (*FillAssociatedResourcesProc)( SessionRef session, StringVectorRef resourceList,
+	SetStringVectorProc SetClientStringVector, WXMP_Error * wError );
+
+/** 
+ *  Function pointer to the function ImportToXMP. Any non metadata from a file that is supposed 
+ *  to be mapped into a XMP namespace should be added to the XMP packet using this function.
+ *
+ *  @param session		File Handler instance.
+ *  @param xmpStr		A pointer to a buffer which contain the xmpData.
+ *  @param wError		WXMP_Error structure which will be filled by the API if any error occurs.
+ *  @return				kXMPErr_NoError on success otherwise error id of the failure.
+ */
+typedef XMPErrorID (*ImportToXMPStringProc)( SessionRef session, XMP_StringPtr* xmpStr , WXMP_Error * wError );
+
+/** 
+ *  Function pointer to the function ExportFromXMP. The XMP packet is supposed to be 
+ *  written to the file. If the packet contains any data that should be mapped back to
+ *  native (non-XMP) metadata values then that should happen here.
+ *
+ *  @param session		File Handler instance.
+ *  @param xmpStr		A pointer to a buffer which contain the xmpData.
+ *  @param wError		WXMP_Error structure which will be filled by the API if any error occurs.
+ *  @return				kXMPErr_NoError on success otherwise error id of the failure.
+ */
+typedef XMPErrorID (*ExportFromXMPStringProc)( SessionRef session, XMP_StringPtr xmpStr, WXMP_Error * wError );
+
+/** 
+ *  Function pointer to the function IsMetadataWritable. This function returns if the metadata can be updated  
+ *  for the opened session 
+ *
+ *  @param session					File Handler instance.
+ *  @param result					[out] pointer to a boolen which will be true if the metadata can be updated.
+ *  @return							kXMPErr_NoError on success otherwise error id of the failure.
+ */
+typedef XMPErrorID (*IsMetadataWritableProc)( SessionRef session, XMP_Bool * result, WXMP_Error * wError );
+
 
 /** @struct PluginAPI
  *  @brief This is a Plugin API structure.
@@ -222,6 +286,7 @@ struct PluginAPI
 	 */
 	XMP_Uns32						mVersion;
 	
+	// version 1
 	TerminatePluginProc				mTerminatePluginProc;
 	SetHostAPIProc					mSetHostAPIProc;
 	
@@ -235,23 +300,48 @@ struct PluginAPI
 	CacheFileDataProc				mCacheFileDataProc;
 	UpdateFileProc					mUpdateFileProc;
 	WriteTempFileProc				mWriteTempFileProc;
-	ImportToXMPProc					mImportToXMPProc;
-	ExportFromXMPProc				mExportFromXMPProc;
+	
+	ImportToXMPProc					mImportToXMPProc;			// deprecated in version 2 in favour of mImportToXMPStringProc
+	ExportFromXMPProc				mExportFromXMPProc;			// deprecated in version 2 in favour of mExportFromXMPStringProc
+
+	// version 2
+	FillMetadataFilesProc			mFillMetadataFilesProc;
+	ImportToXMPStringProc			mImportToXMPStringProc;
+	ExportFromXMPStringProc			mExportFromXMPStringProc;
+	FillAssociatedResourcesProc     mFillAssociatedResourcesProc;
+
+	// version 3
+	IsMetadataWritableProc			mIsMetadataWritableProc;
 };
 
 
-/** @brief Plugin Entry point.
+/** @brief Plugin Entry point (legacy).
  *
- *  This is the entry point for the plugin. It will fill \param pluginAPI inside the plugin.
+ *  This is the legacy entry point for the plugin. It will fill \param pluginAPI inside the plugin.
  * 
  *  @param moduleID		It is the module identifier string which is present in plugin's resource 
  *						file 'MODULE_IDENTIFIER.txt". It should be same as the one which is present in plugin's library.
  *  @param pluginAPI	structure pointer to PluginAPI which will be filled by the plugin.
+ *  @param wError		structure pointer to WXMP_Error which will be filled in case of an error.
  *  @return				kXMPErr_NoError on success otherwise error id of the failure.
  */
 DllExport XMPErrorID InitializePlugin( XMP_StringPtr moduleID, PluginAPIRef pluginAPI, WXMP_Error * wError );
 typedef XMPErrorID (*InitializePluginProc)( XMP_StringPtr moduleID, PluginAPIRef pluginAPI, WXMP_Error * wError );
 
+/** @brief Plugin Entry point.
+ *
+ *  This is the entry point for the plugin. It will fill \param pluginAPI inside the plugin.
+ * 
+ *  @param moduleID		It is the module identifier string which is present in plugin's resource 
+ *						file 'MODULE_IDENTIFIER.txt". It should be same as the one which is present in plugin's library.
+ *  @param hostAPI		structure pointer to HostAPI which will be stored by the plugin.
+ *  @param pluginAPI	structure pointer to PluginAPI which will be filled by the plugin.
+ *  @param wError		structure pointer to WXMP_Error which will be filled in case of an error.
+ *  @return				kXMPErr_NoError on success otherwise error id of the failure.
+ */
+DllExport XMPErrorID InitializePlugin2( XMP_StringPtr moduleID, HostAPIRef hostAPI, PluginAPIRef pluginAPI, WXMP_Error * wError );
+typedef XMPErrorID (*InitializePlugin2Proc)( XMP_StringPtr moduleID, HostAPIRef hostAPI, PluginAPIRef pluginAPI, WXMP_Error * wError );
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/XMPFilesPlugins/api/source/PluginRegistry.h b/XMPFilesPlugins/api/source/PluginRegistry.h
index 9523493..acfe3bf 100644
--- a/XMPFilesPlugins/api/source/PluginRegistry.h
+++ b/XMPFilesPlugins/api/source/PluginRegistry.h
@@ -7,16 +7,6 @@
 // of the Adobe license agreement accompanying it.
 // =================================================================================================
 
-/**************************************************************************
-* @file PluginRegistry.h
-* @brief Classes to register multiple file hanlder in one plugin
-*
-* It contains classes to give easy way to register multiple file handler in one plugin.
-* 
-* @author Praveen Kumar Goyal (pkgoyal)
-* @bug No known bugs.
-***************************************************************************/
-
 #ifndef PLUGINREGISTRY_H
 #define PLUGINREGISTRY_H
 #include "PluginHandler.h"