diff --git a/libsrc/ffdec_lib/testdata/exporting/exporting_as2.html b/libsrc/ffdec_lib/testdata/exporting/as2/exporting_as2.html
similarity index 100%
rename from libsrc/ffdec_lib/testdata/exporting/exporting_as2.html
rename to libsrc/ffdec_lib/testdata/exporting/as2/exporting_as2.html
diff --git a/libsrc/ffdec_lib/testdata/exporting/as2/exporting_as2.swf b/libsrc/ffdec_lib/testdata/exporting/as2/exporting_as2.swf
new file mode 100644
index 000000000..3bf581fb3
Binary files /dev/null and b/libsrc/ffdec_lib/testdata/exporting/as2/exporting_as2.swf differ
diff --git a/libsrc/ffdec_lib/testdata/exporting/as2/exporting_as2/DOMDocument.xml b/libsrc/ffdec_lib/testdata/exporting/as2/exporting_as2/DOMDocument.xml
new file mode 100644
index 000000000..4044b9977
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/exporting/as2/exporting_as2/DOMDocument.xml
@@ -0,0 +1,49 @@
+<DOMDocument xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://ns.adobe.com/xfl/2008/" currentTimeline="1" xflVersion="2.2" creatorInfo="Adobe Flash Professional CS6" platform="Windows" versionInfo="Saved by Adobe Flash Windows 12.0 build 481" majorVersion="12" buildNumber="481" nextSceneIdentifier="2" playOptionsPlayLoop="false" playOptionsPlayPages="false" playOptionsPlayFrameActions="false" autoSaveHasPrompted="true">
+     <symbols>
+          <Include href="RectExport.xml" itemID="66aa6933-0000029e" lastModified="1722446214"/>
+          <Include href="RectExportInFrame1.xml" itemID="66aa6923-0000029b" lastModified="1722488159"/>
+     </symbols>
+     <timelines>
+          <DOMTimeline name="Scene 1">
+               <layers>
+                    <DOMLayer name="Layer 1" color="#4FFF4F" current="true" isSelected="true">
+                         <frames>
+                              <DOMFrame index="0" duration="9" keyMode="9728">
+                                   <elements/>
+                              </DOMFrame>
+                              <DOMFrame index="9" keyMode="9728">
+                                   <elements>
+                                        <DOMSymbolInstance libraryItemName="RectExport" centerPoint3DX="184.45" centerPoint3DY="156.5">
+                                             <matrix>
+                                                  <Matrix tx="111.95" ty="92"/>
+                                             </matrix>
+                                             <transformationPoint>
+                                                  <Point x="72.5" y="64.5"/>
+                                             </transformationPoint>
+                                        </DOMSymbolInstance>
+                                   </elements>
+                              </DOMFrame>
+                              <DOMFrame index="10" keyMode="9728">
+                                   <elements>
+                                        <DOMSymbolInstance libraryItemName="RectExportInFrame1" centerPoint3DX="184.45" centerPoint3DY="156.5">
+                                             <matrix>
+                                                  <Matrix tx="111.95" ty="92"/>
+                                             </matrix>
+                                             <transformationPoint>
+                                                  <Point x="72.5" y="64.5"/>
+                                             </transformationPoint>
+                                        </DOMSymbolInstance>
+                                   </elements>
+                              </DOMFrame>
+                         </frames>
+                    </DOMLayer>
+               </layers>
+          </DOMTimeline>
+     </timelines>
+     <PrinterSettings/>
+     <publishHistory>
+          <PublishItem publishSize="718" publishTime="1722488180"/>
+          <PublishItem publishSize="719" publishTime="1722488169"/>
+          <PublishItem publishSize="693" publishTime="1722446226"/>
+     </publishHistory>
+</DOMDocument>
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/exporting/exporting_as2/LIBRARY/RectExport.xml b/libsrc/ffdec_lib/testdata/exporting/as2/exporting_as2/LIBRARY/RectExport.xml
similarity index 100%
rename from libsrc/ffdec_lib/testdata/exporting/exporting_as2/LIBRARY/RectExport.xml
rename to libsrc/ffdec_lib/testdata/exporting/as2/exporting_as2/LIBRARY/RectExport.xml
diff --git a/libsrc/ffdec_lib/testdata/exporting/as2/exporting_as2/LIBRARY/RectExportInFrame1.xml b/libsrc/ffdec_lib/testdata/exporting/as2/exporting_as2/LIBRARY/RectExportInFrame1.xml
new file mode 100644
index 000000000..c39aadb25
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/exporting/as2/exporting_as2/LIBRARY/RectExportInFrame1.xml
@@ -0,0 +1,35 @@
+<DOMSymbolItem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://ns.adobe.com/xfl/2008/" name="RectExportInFrame1" itemID="66aa6923-0000029b" linkageExportForAS="true" linkageIdentifier="RectExportInFrame1" lastModified="1722488159">
+  <timeline>
+    <DOMTimeline name="RectExportInFrame1">
+      <layers>
+        <DOMLayer name="Layer 1" color="#4FFF4F" current="true" isSelected="true">
+          <frames>
+            <DOMFrame index="0" keyMode="9728">
+              <elements>
+                <DOMShape>
+                  <fills>
+                    <FillStyle index="1">
+                      <SolidColor color="#FF0000"/>
+                    </FillStyle>
+                  </fills>
+                  <strokes>
+                    <StrokeStyle index="1">
+                      <SolidStroke scaleMode="normal">
+                        <fill>
+                          <SolidColor color="#ECECEC"/>
+                        </fill>
+                      </SolidStroke>
+                    </StrokeStyle>
+                  </strokes>
+                  <edges>
+                    <Edge fillStyle1="1" strokeStyle="1" edges="!2900 2580S6|0 2580!0 2580|0 0!0 0|2900 0!2900 0|2900 2580"/>
+                  </edges>
+                </DOMShape>
+              </elements>
+            </DOMFrame>
+          </frames>
+        </DOMLayer>
+      </layers>
+    </DOMTimeline>
+  </timeline>
+</DOMSymbolItem>
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/exporting/exporting_as2/META-INF/metadata.xml b/libsrc/ffdec_lib/testdata/exporting/as2/exporting_as2/META-INF/metadata.xml
similarity index 85%
rename from libsrc/ffdec_lib/testdata/exporting/exporting_as2/META-INF/metadata.xml
rename to libsrc/ffdec_lib/testdata/exporting/as2/exporting_as2/META-INF/metadata.xml
index 4afd400f8..3d3724c6f 100644
--- a/libsrc/ffdec_lib/testdata/exporting/exporting_as2/META-INF/metadata.xml
+++ b/libsrc/ffdec_lib/testdata/exporting/as2/exporting_as2/META-INF/metadata.xml
@@ -5,8 +5,8 @@
             xmlns:xmp="http://ns.adobe.com/xap/1.0/">
          <xmp:CreatorTool>Adobe Flash Professional CS6 - build 481</xmp:CreatorTool>
          <xmp:CreateDate>2024-07-31T10:15:08-07:00</xmp:CreateDate>
-         <xmp:MetadataDate>2024-07-31T10:16:02-07:00</xmp:MetadataDate>
-         <xmp:ModifyDate>2024-07-31T10:16:02-07:00</xmp:ModifyDate>
+         <xmp:MetadataDate>2024-07-31T21:56:07-07:00</xmp:MetadataDate>
+         <xmp:ModifyDate>2024-07-31T21:56:07-07:00</xmp:ModifyDate>
       </rdf:Description>
       <rdf:Description rdf:about=""
             xmlns:dc="http://purl.org/dc/elements/1.1/">
@@ -15,7 +15,7 @@
       <rdf:Description rdf:about=""
             xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"
             xmlns:stEvt="http://ns.adobe.com/xap/1.0/sType/ResourceEvent#">
-         <xmpMM:InstanceID>xmp.iid:6F5B8FC95B4FEF118CE7A8CD847568D7</xmpMM:InstanceID>
+         <xmpMM:InstanceID>xmp.iid:D4738656C14FEF119527A7276211BF58</xmpMM:InstanceID>
          <xmpMM:DocumentID>xmp.did:6F5B8FC95B4FEF118CE7A8CD847568D7</xmpMM:DocumentID>
          <xmpMM:OriginalDocumentID>xmp.did:6F5B8FC95B4FEF118CE7A8CD847568D7</xmpMM:OriginalDocumentID>
          <xmpMM:History>
@@ -26,6 +26,12 @@
                   <stEvt:when>2024-07-31T10:15:08-07:00</stEvt:when>
                   <stEvt:softwareAgent>Adobe Flash Professional CS6 - build 481</stEvt:softwareAgent>
                </rdf:li>
+               <rdf:li rdf:parseType="Resource">
+                  <stEvt:action>created</stEvt:action>
+                  <stEvt:instanceID>xmp.iid:D4738656C14FEF119527A7276211BF58</stEvt:instanceID>
+                  <stEvt:when>2024-07-31T10:15:08-07:00</stEvt:when>
+                  <stEvt:softwareAgent>Adobe Flash Professional CS6 - build 481</stEvt:softwareAgent>
+               </rdf:li>
             </rdf:Seq>
          </xmpMM:History>
       </rdf:Description>
diff --git a/libsrc/ffdec_lib/testdata/exporting/exporting/MobileSettings.xml b/libsrc/ffdec_lib/testdata/exporting/as2/exporting_as2/MobileSettings.xml
similarity index 100%
rename from libsrc/ffdec_lib/testdata/exporting/exporting/MobileSettings.xml
rename to libsrc/ffdec_lib/testdata/exporting/as2/exporting_as2/MobileSettings.xml
diff --git a/libsrc/ffdec_lib/testdata/exporting/exporting_as2/PublishSettings.xml b/libsrc/ffdec_lib/testdata/exporting/as2/exporting_as2/PublishSettings.xml
similarity index 100%
rename from libsrc/ffdec_lib/testdata/exporting/exporting_as2/PublishSettings.xml
rename to libsrc/ffdec_lib/testdata/exporting/as2/exporting_as2/PublishSettings.xml
diff --git a/libsrc/ffdec_lib/testdata/exporting/as2/exporting_as2/bin/SymDepend.cache b/libsrc/ffdec_lib/testdata/exporting/as2/exporting_as2/bin/SymDepend.cache
new file mode 100644
index 000000000..3c0ac2176
Binary files /dev/null and b/libsrc/ffdec_lib/testdata/exporting/as2/exporting_as2/bin/SymDepend.cache differ
diff --git a/libsrc/ffdec_lib/testdata/exporting/exporting_as2/exporting_as2.xfl b/libsrc/ffdec_lib/testdata/exporting/as2/exporting_as2/exporting_as2.xfl
similarity index 100%
rename from libsrc/ffdec_lib/testdata/exporting/exporting_as2/exporting_as2.xfl
rename to libsrc/ffdec_lib/testdata/exporting/as2/exporting_as2/exporting_as2.xfl
diff --git a/libsrc/ffdec_lib/testdata/exporting/as2_class/as2_pkg/RectExport.as b/libsrc/ffdec_lib/testdata/exporting/as2_class/as2_pkg/RectExport.as
new file mode 100644
index 000000000..ce951ac90
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/exporting/as2_class/as2_pkg/RectExport.as
@@ -0,0 +1,4 @@
+class as2_pkg.RectExport {
+    public function RectExport() {
+    }
+}
diff --git a/libsrc/ffdec_lib/testdata/exporting/as2_pkg/RectExportInFrame1.as b/libsrc/ffdec_lib/testdata/exporting/as2_class/as2_pkg/RectExportInFrame1.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/exporting/as2_pkg/RectExportInFrame1.as
rename to libsrc/ffdec_lib/testdata/exporting/as2_class/as2_pkg/RectExportInFrame1.as
diff --git a/libsrc/ffdec_lib/testdata/exporting/as2_class/exporting_as2_class.html b/libsrc/ffdec_lib/testdata/exporting/as2_class/exporting_as2_class.html
new file mode 100644
index 000000000..969c4d355
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/exporting/as2_class/exporting_as2_class.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+	<head>
+		<title>exporting_as2_class</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<style type="text/css" media="screen">
+		html, body { height:100%; background-color: #ffffff;}
+		body { margin:0; padding:0; overflow:hidden; }
+		#flashContent { width:100%; height:100%; }
+		</style>
+	</head>
+	<body>
+		<div id="flashContent">
+			<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" width="550" height="400" id="exporting_as2_class" align="middle">
+				<param name="movie" value="exporting_as2_class.swf" />
+				<param name="quality" value="high" />
+				<param name="bgcolor" value="#ffffff" />
+				<param name="play" value="true" />
+				<param name="loop" value="true" />
+				<param name="wmode" value="window" />
+				<param name="scale" value="showall" />
+				<param name="menu" value="true" />
+				<param name="devicefont" value="false" />
+				<param name="salign" value="" />
+				<param name="allowScriptAccess" value="sameDomain" />
+				<!--[if !IE]>-->
+				<object type="application/x-shockwave-flash" data="exporting_as2_class.swf" width="550" height="400">
+					<param name="movie" value="exporting_as2_class.swf" />
+					<param name="quality" value="high" />
+					<param name="bgcolor" value="#ffffff" />
+					<param name="play" value="true" />
+					<param name="loop" value="true" />
+					<param name="wmode" value="window" />
+					<param name="scale" value="showall" />
+					<param name="menu" value="true" />
+					<param name="devicefont" value="false" />
+					<param name="salign" value="" />
+					<param name="allowScriptAccess" value="sameDomain" />
+				<!--<![endif]-->
+					<a href="http://www.adobe.com/go/getflash">
+						<img src="http://www.adobe.com/images/shared/download_buttons/get_flash_player.gif" alt="Get Adobe Flash player" />
+					</a>
+				<!--[if !IE]>-->
+				</object>
+				<!--<![endif]-->
+			</object>
+		</div>
+	</body>
+</html>
diff --git a/libsrc/ffdec_lib/testdata/exporting/as2_class/exporting_as2_class.swf b/libsrc/ffdec_lib/testdata/exporting/as2_class/exporting_as2_class.swf
new file mode 100644
index 000000000..9da762f14
Binary files /dev/null and b/libsrc/ffdec_lib/testdata/exporting/as2_class/exporting_as2_class.swf differ
diff --git a/libsrc/ffdec_lib/testdata/exporting/exporting_as2/DOMDocument.xml b/libsrc/ffdec_lib/testdata/exporting/as2_class/exporting_as2_class/DOMDocument.xml
similarity index 88%
rename from libsrc/ffdec_lib/testdata/exporting/exporting_as2/DOMDocument.xml
rename to libsrc/ffdec_lib/testdata/exporting/as2_class/exporting_as2_class/DOMDocument.xml
index 23f50e1eb..5a654263c 100644
--- a/libsrc/ffdec_lib/testdata/exporting/exporting_as2/DOMDocument.xml
+++ b/libsrc/ffdec_lib/testdata/exporting/as2_class/exporting_as2_class/DOMDocument.xml
@@ -1,10 +1,10 @@
 <DOMDocument xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://ns.adobe.com/xfl/2008/" currentTimeline="1" xflVersion="2.2" creatorInfo="Adobe Flash Professional CS6" platform="Windows" versionInfo="Saved by Adobe Flash Windows 12.0 build 481" majorVersion="12" buildNumber="481" nextSceneIdentifier="2" playOptionsPlayLoop="false" playOptionsPlayPages="false" playOptionsPlayFrameActions="false">
      <symbols>
-          <Include href="RectExport.xml" itemID="66aa6933-0000029e" lastModified="1722446214"/>
-          <Include href="RectExportInFrame1.xml" itemID="66aa6923-0000029b" lastModified="1722446315"/>
+          <Include href="RectExport.xml" itemID="66aa6933-0000029e" lastModified="1722488277"/>
+          <Include href="RectExportInFrame1.xml" itemID="66aa6923-0000029b" lastModified="1722488269"/>
      </symbols>
      <timelines>
-          <DOMTimeline name="Scene 1" currentFrame="10">
+          <DOMTimeline name="Scene 1">
                <layers>
                     <DOMLayer name="Layer 1" color="#4FFF4F" current="true" isSelected="true">
                          <frames>
@@ -25,7 +25,7 @@
                               </DOMFrame>
                               <DOMFrame index="10" keyMode="9728">
                                    <elements>
-                                        <DOMSymbolInstance libraryItemName="RectExportInFrame1" selected="true" centerPoint3DX="184.45" centerPoint3DY="156.5">
+                                        <DOMSymbolInstance libraryItemName="RectExportInFrame1" centerPoint3DX="184.45" centerPoint3DY="156.5">
                                              <matrix>
                                                   <Matrix tx="111.95" ty="92"/>
                                              </matrix>
@@ -41,7 +41,5 @@
           </DOMTimeline>
      </timelines>
      <PrinterSettings/>
-     <publishHistory>
-          <PublishItem publishSize="693" publishTime="1722446226"/>
-     </publishHistory>
+     <publishHistory/>
 </DOMDocument>
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/exporting/as2_class/exporting_as2_class/LIBRARY/RectExport.xml b/libsrc/ffdec_lib/testdata/exporting/as2_class/exporting_as2_class/LIBRARY/RectExport.xml
new file mode 100644
index 000000000..ed3c45e3f
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/exporting/as2_class/exporting_as2_class/LIBRARY/RectExport.xml
@@ -0,0 +1,35 @@
+<DOMSymbolItem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://ns.adobe.com/xfl/2008/" name="RectExport" itemID="66aa6933-0000029e" linkageExportForAS="true" linkageExportInFirstFrame="false" linkageIdentifier="RectExport" linkageClassName="as2_pkg.RectExport" lastModified="1722488277">
+  <timeline>
+    <DOMTimeline name="RectExport">
+      <layers>
+        <DOMLayer name="Layer 1" color="#4FFF4F" current="true" isSelected="true">
+          <frames>
+            <DOMFrame index="0" keyMode="9728">
+              <elements>
+                <DOMShape>
+                  <fills>
+                    <FillStyle index="1">
+                      <SolidColor color="#0066FF"/>
+                    </FillStyle>
+                  </fills>
+                  <strokes>
+                    <StrokeStyle index="1">
+                      <SolidStroke scaleMode="normal">
+                        <fill>
+                          <SolidColor color="#ECECEC"/>
+                        </fill>
+                      </SolidStroke>
+                    </StrokeStyle>
+                  </strokes>
+                  <edges>
+                    <Edge fillStyle1="1" strokeStyle="1" edges="!2900 0S6|2900 2580!2900 2580|0 2580!0 2580|0 0!0 0|2900 0"/>
+                  </edges>
+                </DOMShape>
+              </elements>
+            </DOMFrame>
+          </frames>
+        </DOMLayer>
+      </layers>
+    </DOMTimeline>
+  </timeline>
+</DOMSymbolItem>
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/exporting/exporting_as2/LIBRARY/RectExportInFrame1.xml b/libsrc/ffdec_lib/testdata/exporting/as2_class/exporting_as2_class/LIBRARY/RectExportInFrame1.xml
similarity index 96%
rename from libsrc/ffdec_lib/testdata/exporting/exporting_as2/LIBRARY/RectExportInFrame1.xml
rename to libsrc/ffdec_lib/testdata/exporting/as2_class/exporting_as2_class/LIBRARY/RectExportInFrame1.xml
index 92b395bbf..4f14dfad8 100644
--- a/libsrc/ffdec_lib/testdata/exporting/exporting_as2/LIBRARY/RectExportInFrame1.xml
+++ b/libsrc/ffdec_lib/testdata/exporting/as2_class/exporting_as2_class/LIBRARY/RectExportInFrame1.xml
@@ -1,4 +1,4 @@
-<DOMSymbolItem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://ns.adobe.com/xfl/2008/" name="RectExportInFrame1" itemID="66aa6923-0000029b" linkageExportForAS="true" linkageIdentifier="RectExportInFrame1" linkageClassName="as2_pkg.RectExportInFrame1" lastModified="1722446315">
+<DOMSymbolItem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://ns.adobe.com/xfl/2008/" name="RectExportInFrame1" itemID="66aa6923-0000029b" linkageExportForAS="true" linkageIdentifier="RectExportInFrame1" linkageClassName="as2_pkg.RectExportInFrame1" lastModified="1722488269">
   <timeline>
     <DOMTimeline name="RectExportInFrame1">
       <layers>
diff --git a/libsrc/ffdec_lib/testdata/exporting/as2_class/exporting_as2_class/META-INF/metadata.xml b/libsrc/ffdec_lib/testdata/exporting/as2_class/exporting_as2_class/META-INF/metadata.xml
new file mode 100644
index 000000000..15742bdfe
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/exporting/as2_class/exporting_as2_class/META-INF/metadata.xml
@@ -0,0 +1,55 @@
+<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 5.3-c011 66.145661, 2012/02/06-14:56:27        ">
+   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+      <rdf:Description rdf:about=""
+            xmlns:xmp="http://ns.adobe.com/xap/1.0/">
+         <xmp:CreatorTool>Adobe Flash Professional CS6 - build 481</xmp:CreatorTool>
+         <xmp:CreateDate>2024-07-31T21:56:25-07:00</xmp:CreateDate>
+         <xmp:MetadataDate>2024-07-31T21:56:40-07:00</xmp:MetadataDate>
+         <xmp:ModifyDate>2024-07-31T21:56:40-07:00</xmp:ModifyDate>
+      </rdf:Description>
+      <rdf:Description rdf:about=""
+            xmlns:dc="http://purl.org/dc/elements/1.1/">
+         <dc:format>application/vnd.adobe.fla</dc:format>
+      </rdf:Description>
+      <rdf:Description rdf:about=""
+            xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"
+            xmlns:stEvt="http://ns.adobe.com/xap/1.0/sType/ResourceEvent#">
+         <xmpMM:InstanceID>xmp.iid:D7738656C14FEF119527A7276211BF58</xmpMM:InstanceID>
+         <xmpMM:DocumentID>xmp.did:D7738656C14FEF119527A7276211BF58</xmpMM:DocumentID>
+         <xmpMM:OriginalDocumentID>xmp.did:D7738656C14FEF119527A7276211BF58</xmpMM:OriginalDocumentID>
+         <xmpMM:History>
+            <rdf:Seq>
+               <rdf:li rdf:parseType="Resource">
+                  <stEvt:action>created</stEvt:action>
+                  <stEvt:instanceID>xmp.iid:D7738656C14FEF119527A7276211BF58</stEvt:instanceID>
+                  <stEvt:when>2024-07-31T21:56:25-07:00</stEvt:when>
+                  <stEvt:softwareAgent>Adobe Flash Professional CS6 - build 481</stEvt:softwareAgent>
+               </rdf:li>
+            </rdf:Seq>
+         </xmpMM:History>
+      </rdf:Description>
+   </rdf:RDF>
+</x:xmpmeta>
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                           
+<?xpacket end="w"?>
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/exporting/exporting_as2/MobileSettings.xml b/libsrc/ffdec_lib/testdata/exporting/as2_class/exporting_as2_class/MobileSettings.xml
similarity index 100%
rename from libsrc/ffdec_lib/testdata/exporting/exporting_as2/MobileSettings.xml
rename to libsrc/ffdec_lib/testdata/exporting/as2_class/exporting_as2_class/MobileSettings.xml
diff --git a/libsrc/ffdec_lib/testdata/exporting/as2_class/exporting_as2_class/PublishSettings.xml b/libsrc/ffdec_lib/testdata/exporting/as2_class/exporting_as2_class/PublishSettings.xml
new file mode 100644
index 000000000..9ae13ceb8
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/exporting/as2_class/exporting_as2_class/PublishSettings.xml
@@ -0,0 +1,206 @@
+<flash_profiles>
+<flash_profile version="1.0" name="Default" current="true">
+  <PublishFormatProperties enabled="true">
+    <defaultNames>1</defaultNames>
+    <flash>1</flash>
+    <projectorWin>0</projectorWin>
+    <projectorMac>0</projectorMac>
+    <html>1</html>
+    <gif>0</gif>
+    <jpeg>0</jpeg>
+    <png>0</png>
+    <qt>0</qt>
+    <rnwk>0</rnwk>
+    <swc>0</swc>
+    <flashDefaultName>1</flashDefaultName>
+    <projectorWinDefaultName>1</projectorWinDefaultName>
+    <projectorMacDefaultName>1</projectorMacDefaultName>
+    <htmlDefaultName>1</htmlDefaultName>
+    <gifDefaultName>1</gifDefaultName>
+    <jpegDefaultName>1</jpegDefaultName>
+    <pngDefaultName>1</pngDefaultName>
+    <qtDefaultName>1</qtDefaultName>
+    <rnwkDefaultName>1</rnwkDefaultName>
+    <swcDefaultName>1</swcDefaultName>
+    <flashFileName>exporting_as2_class.swf</flashFileName>
+    <projectorWinFileName>exporting_as2_class.exe</projectorWinFileName>
+    <projectorMacFileName>exporting_as2_class.app</projectorMacFileName>
+    <htmlFileName>exporting_as2_class.html</htmlFileName>
+    <gifFileName>exporting_as2_class.gif</gifFileName>
+    <jpegFileName>exporting_as2_class.jpg</jpegFileName>
+    <pngFileName>exporting_as2_class.png</pngFileName>
+    <qtFileName>exporting_as2_class.mov</qtFileName>
+    <rnwkFileName>exporting_as2_class.smil</rnwkFileName>
+    <swcFileName>exporting_as2_class.swc</swcFileName>
+  </PublishFormatProperties>
+  <PublishHtmlProperties enabled="true">
+    <VersionDetectionIfAvailable>0</VersionDetectionIfAvailable>
+    <VersionInfo>12,0,0,0;11,2,0,0;11,1,0,0;10,3,0,0;10,2,153,0;10,1,52,0;9,0,124,0;8,0,24,0;7,0,14,0;6,0,79,0;5,0,58,0;4,0,32,0;3,0,8,0;2,0,1,12;1,0,0,1;</VersionInfo>
+    <UsingDefaultContentFilename>1</UsingDefaultContentFilename>
+    <UsingDefaultAlternateFilename>1</UsingDefaultAlternateFilename>
+    <ContentFilename>exporting_as2_class.xfl_content.html</ContentFilename>
+    <AlternateFilename>exporting_as2_class.xfl_alternate.html</AlternateFilename>
+    <UsingOwnAlternateFile>0</UsingOwnAlternateFile>
+    <OwnAlternateFilename></OwnAlternateFilename>
+    <Width>550</Width>
+    <Height>400</Height>
+    <Align>0</Align>
+    <Units>0</Units>
+    <Loop>1</Loop>
+    <StartPaused>0</StartPaused>
+    <Scale>0</Scale>
+    <HorizontalAlignment>1</HorizontalAlignment>
+    <VerticalAlignment>1</VerticalAlignment>
+    <Quality>4</Quality>
+    <DeblockingFilter>0</DeblockingFilter>
+    <WindowMode>0</WindowMode>
+    <DisplayMenu>1</DisplayMenu>
+    <DeviceFont>0</DeviceFont>
+    <TemplateFileName>C:\Users\MyUser\AppData\Local\Adobe\Flash CS6\en_US\Configuration\HTML\Default.html</TemplateFileName>
+    <showTagWarnMsg>1</showTagWarnMsg>
+  </PublishHtmlProperties>
+  <PublishFlashProperties enabled="true">
+    <TopDown></TopDown>
+    <FireFox></FireFox>
+    <Report>0</Report>
+    <Protect>0</Protect>
+    <OmitTraceActions>0</OmitTraceActions>
+    <Quality>80</Quality>
+    <DeblockingFilter>0</DeblockingFilter>
+    <StreamFormat>0</StreamFormat>
+    <StreamCompress>7</StreamCompress>
+    <EventFormat>0</EventFormat>
+    <EventCompress>7</EventCompress>
+    <OverrideSounds>0</OverrideSounds>
+    <Version>15</Version>
+    <ExternalPlayer>FlashPlayer11.2</ExternalPlayer>
+    <ActionScriptVersion>2</ActionScriptVersion>
+    <PackageExportFrame>1</PackageExportFrame>
+    <PackagePaths></PackagePaths>
+    <AS3PackagePaths>.</AS3PackagePaths>
+    <AS3ConfigConst>CONFIG::FLASH_AUTHORING=&quot;true&quot;;</AS3ConfigConst>
+    <DebuggingPermitted>0</DebuggingPermitted>
+    <DebuggingPassword></DebuggingPassword>
+    <CompressMovie>1</CompressMovie>
+    <CompressionType>0</CompressionType>
+    <InvisibleLayer>1</InvisibleLayer>
+    <DeviceSound>0</DeviceSound>
+    <StreamUse8kSampleRate>0</StreamUse8kSampleRate>
+    <EventUse8kSampleRate>0</EventUse8kSampleRate>
+    <UseNetwork>0</UseNetwork>
+    <DocumentClass></DocumentClass>
+    <AS3Strict>2</AS3Strict>
+    <AS3Coach>4</AS3Coach>
+    <AS3AutoDeclare>4096</AS3AutoDeclare>
+    <AS3Dialect>AS3</AS3Dialect>
+    <AS3ExportFrame>1</AS3ExportFrame>
+    <AS3Optimize>1</AS3Optimize>
+    <ExportSwc>0</ExportSwc>
+    <ScriptStuckDelay>15</ScriptStuckDelay>
+    <IncludeXMP>1</IncludeXMP>
+    <HardwareAcceleration>0</HardwareAcceleration>
+    <AS3Flags>4102</AS3Flags>
+    <DefaultLibraryLinkage>rsl</DefaultLibraryLinkage>
+    <RSLPreloaderMethod>wrap</RSLPreloaderMethod>
+    <RSLPreloaderSWF>$(AppConfig)/ActionScript 3.0/rsls/loader_animation.swf</RSLPreloaderSWF>
+    <LibraryPath>
+      <library-path-entry>
+        <swc-path>$(AppConfig)/ActionScript 3.0/libs</swc-path>
+        <linkage>merge</linkage>
+      </library-path-entry>
+      <library-path-entry>
+        <swc-path>$(AppConfig)/ActionScript 3.0/libs/11.0/textLayout.swc</swc-path>
+        <linkage usesDefault="true">rsl</linkage>
+        <rsl-url>http://fpdownload.adobe.com/pub/swz/tlf/2.0.0.232/textLayout_2.0.0.232.swz</rsl-url>
+        <policy-file-url>http://fpdownload.adobe.com/pub/swz/crossdomain.xml</policy-file-url>
+        <rsl-url>textLayout_2.0.0.232.swz</rsl-url>
+      </library-path-entry>
+    </LibraryPath>
+    <LibraryVersions>
+      <library-version>
+        <swc-path>$(AppConfig)/ActionScript 3.0/libs/11.0/textLayout.swc</swc-path>
+        <feature name="tlfText" majorVersion="2" minorVersion="0" build="232"/>
+        <rsl-url>http://fpdownload.adobe.com/pub/swz/tlf/2.0.0.232/textLayout_2.0.0.232.swz</rsl-url>
+        <policy-file-url>http://fpdownload.adobe.com/pub/swz/crossdomain.xml</policy-file-url>
+        <rsl-url>textLayout_2.0.0.232.swz</rsl-url>
+      </library-version>
+    </LibraryVersions>
+  </PublishFlashProperties>
+  <PublishJpegProperties enabled="true">
+    <Width>550</Width>
+    <Height>400</Height>
+    <Progressive>0</Progressive>
+    <DPI>4718592</DPI>
+    <Size>0</Size>
+    <Quality>80</Quality>
+    <MatchMovieDim>1</MatchMovieDim>
+  </PublishJpegProperties>
+  <PublishRNWKProperties enabled="true">
+    <exportFlash>1</exportFlash>
+    <flashBitRate>0</flashBitRate>
+    <exportAudio>1</exportAudio>
+    <audioFormat>0</audioFormat>
+    <singleRateAudio>0</singleRateAudio>
+    <realVideoRate>100000</realVideoRate>
+    <speed28K>1</speed28K>
+    <speed56K>1</speed56K>
+    <speedSingleISDN>0</speedSingleISDN>
+    <speedDualISDN>0</speedDualISDN>
+    <speedCorporateLAN>0</speedCorporateLAN>
+    <speed256K>0</speed256K>
+    <speed384K>0</speed384K>
+    <speed512K>0</speed512K>
+    <exportSMIL>1</exportSMIL>
+  </PublishRNWKProperties>
+  <PublishGifProperties enabled="true">
+    <Width>550</Width>
+    <Height>400</Height>
+    <Animated>0</Animated>
+    <MatchMovieDim>1</MatchMovieDim>
+    <Loop>1</Loop>
+    <LoopCount></LoopCount>
+    <OptimizeColors>1</OptimizeColors>
+    <Interlace>0</Interlace>
+    <Smooth>1</Smooth>
+    <DitherSolids>0</DitherSolids>
+    <RemoveGradients>0</RemoveGradients>
+    <TransparentOption></TransparentOption>
+    <TransparentAlpha>128</TransparentAlpha>
+    <DitherOption></DitherOption>
+    <PaletteOption></PaletteOption>
+    <MaxColors>255</MaxColors>
+    <PaletteName></PaletteName>
+  </PublishGifProperties>
+  <PublishPNGProperties enabled="true">
+    <Width>550</Width>
+    <Height>400</Height>
+    <OptimizeColors>1</OptimizeColors>
+    <Interlace>0</Interlace>
+    <Transparent>0</Transparent>
+    <Smooth>1</Smooth>
+    <DitherSolids>0</DitherSolids>
+    <RemoveGradients>0</RemoveGradients>
+    <MatchMovieDim>1</MatchMovieDim>
+    <DitherOption></DitherOption>
+    <FilterOption></FilterOption>
+    <PaletteOption></PaletteOption>
+    <BitDepth>24-bit with Alpha</BitDepth>
+    <MaxColors>255</MaxColors>
+    <PaletteName></PaletteName>
+  </PublishPNGProperties>
+  <PublishQTProperties enabled="true">
+    <Width>550</Width>
+    <Height>400</Height>
+    <MatchMovieDim>1</MatchMovieDim>
+    <UseQTSoundCompression>0</UseQTSoundCompression>
+    <AlphaOption></AlphaOption>
+    <LayerOption></LayerOption>
+    <QTSndSettings>00000000</QTSndSettings>
+    <ControllerOption>0</ControllerOption>
+    <Looping>0</Looping>
+    <PausedAtStart>0</PausedAtStart>
+    <PlayEveryFrame>0</PlayEveryFrame>
+    <Flatten>1</Flatten>
+  </PublishQTProperties>
+</flash_profile>
+</flash_profiles>
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/exporting/as2_class/exporting_as2_class/bin/SymDepend.cache b/libsrc/ffdec_lib/testdata/exporting/as2_class/exporting_as2_class/bin/SymDepend.cache
new file mode 100644
index 000000000..d0a611964
Binary files /dev/null and b/libsrc/ffdec_lib/testdata/exporting/as2_class/exporting_as2_class/bin/SymDepend.cache differ
diff --git a/libsrc/ffdec_lib/testdata/exporting/exporting/exporting.xfl b/libsrc/ffdec_lib/testdata/exporting/as2_class/exporting_as2_class/exporting_as2_class.xfl
similarity index 100%
rename from libsrc/ffdec_lib/testdata/exporting/exporting/exporting.xfl
rename to libsrc/ffdec_lib/testdata/exporting/as2_class/exporting_as2_class/exporting_as2_class.xfl
diff --git a/libsrc/ffdec_lib/testdata/exporting/exporting.html b/libsrc/ffdec_lib/testdata/exporting/as3/exporting.html
similarity index 100%
rename from libsrc/ffdec_lib/testdata/exporting/exporting.html
rename to libsrc/ffdec_lib/testdata/exporting/as3/exporting.html
diff --git a/libsrc/ffdec_lib/testdata/exporting/exporting.swf b/libsrc/ffdec_lib/testdata/exporting/as3/exporting.swf
similarity index 100%
rename from libsrc/ffdec_lib/testdata/exporting/exporting.swf
rename to libsrc/ffdec_lib/testdata/exporting/as3/exporting.swf
diff --git a/libsrc/ffdec_lib/testdata/exporting/exporting/DOMDocument.xml b/libsrc/ffdec_lib/testdata/exporting/as3/exporting/DOMDocument.xml
similarity index 100%
rename from libsrc/ffdec_lib/testdata/exporting/exporting/DOMDocument.xml
rename to libsrc/ffdec_lib/testdata/exporting/as3/exporting/DOMDocument.xml
diff --git a/libsrc/ffdec_lib/testdata/exporting/exporting/LIBRARY/RectExport.xml b/libsrc/ffdec_lib/testdata/exporting/as3/exporting/LIBRARY/RectExport.xml
similarity index 100%
rename from libsrc/ffdec_lib/testdata/exporting/exporting/LIBRARY/RectExport.xml
rename to libsrc/ffdec_lib/testdata/exporting/as3/exporting/LIBRARY/RectExport.xml
diff --git a/libsrc/ffdec_lib/testdata/exporting/exporting/LIBRARY/RectExportInFrame1.xml b/libsrc/ffdec_lib/testdata/exporting/as3/exporting/LIBRARY/RectExportInFrame1.xml
similarity index 100%
rename from libsrc/ffdec_lib/testdata/exporting/exporting/LIBRARY/RectExportInFrame1.xml
rename to libsrc/ffdec_lib/testdata/exporting/as3/exporting/LIBRARY/RectExportInFrame1.xml
diff --git a/libsrc/ffdec_lib/testdata/exporting/exporting/META-INF/metadata.xml b/libsrc/ffdec_lib/testdata/exporting/as3/exporting/META-INF/metadata.xml
similarity index 100%
rename from libsrc/ffdec_lib/testdata/exporting/exporting/META-INF/metadata.xml
rename to libsrc/ffdec_lib/testdata/exporting/as3/exporting/META-INF/metadata.xml
diff --git a/libsrc/ffdec_lib/testdata/exporting/as3/exporting/MobileSettings.xml b/libsrc/ffdec_lib/testdata/exporting/as3/exporting/MobileSettings.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/libsrc/ffdec_lib/testdata/exporting/exporting/PublishSettings.xml b/libsrc/ffdec_lib/testdata/exporting/as3/exporting/PublishSettings.xml
similarity index 100%
rename from libsrc/ffdec_lib/testdata/exporting/exporting/PublishSettings.xml
rename to libsrc/ffdec_lib/testdata/exporting/as3/exporting/PublishSettings.xml
diff --git a/libsrc/ffdec_lib/testdata/exporting/exporting/bin/SymDepend.cache b/libsrc/ffdec_lib/testdata/exporting/as3/exporting/bin/SymDepend.cache
similarity index 100%
rename from libsrc/ffdec_lib/testdata/exporting/exporting/bin/SymDepend.cache
rename to libsrc/ffdec_lib/testdata/exporting/as3/exporting/bin/SymDepend.cache
diff --git a/libsrc/ffdec_lib/testdata/exporting/as3/exporting/exporting.xfl b/libsrc/ffdec_lib/testdata/exporting/as3/exporting/exporting.xfl
new file mode 100644
index 000000000..860a820ec
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/exporting/as3/exporting/exporting.xfl
@@ -0,0 +1 @@
+PROXY-CS5
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/exporting/exporting_as2.swf b/libsrc/ffdec_lib/testdata/exporting/exporting_as2.swf
deleted file mode 100644
index 4d298cf4d..000000000
Binary files a/libsrc/ffdec_lib/testdata/exporting/exporting_as2.swf and /dev/null differ
diff --git a/libsrc/ffdec_lib/testdata/exporting/exporting_as2/bin/SymDepend.cache b/libsrc/ffdec_lib/testdata/exporting/exporting_as2/bin/SymDepend.cache
deleted file mode 100644
index ba0c5e381..000000000
Binary files a/libsrc/ffdec_lib/testdata/exporting/exporting_as2/bin/SymDepend.cache and /dev/null differ