diff --git a/trunk/test/com/jpexs/decompiler/flash/ActionScript2AssemblerTest.java b/trunk/test/com/jpexs/decompiler/flash/ActionScript2AssemblerTest.java
index 2c1b4e99c..e5563d384 100644
--- a/trunk/test/com/jpexs/decompiler/flash/ActionScript2AssemblerTest.java
+++ b/trunk/test/com/jpexs/decompiler/flash/ActionScript2AssemblerTest.java
@@ -23,7 +23,7 @@ import com.jpexs.decompiler.flash.configuration.Configuration;
 import com.jpexs.decompiler.flash.helpers.CodeFormatting;
 import com.jpexs.decompiler.flash.helpers.HilightedTextWriter;
 import com.jpexs.decompiler.flash.tags.DoActionTag;
-import com.jpexs.decompiler.graph.ExportMode;
+import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
 import java.io.BufferedInputStream;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -65,7 +65,7 @@ public class ActionScript2AssemblerTest extends ActionStript2TestBase {
             Action.actionsToSource(doa, doa.getActions(), "", writer);
             String actualResult = writer.toString();
             writer = new HilightedTextWriter(new CodeFormatting(), false);
-            doa.getASMSource(ExportMode.PCODE, writer, null);
+            doa.getASMSource(ScriptExportMode.PCODE, writer, null);
             String decompiled = writer.toString();
 
             assertEquals(actualResult.trim(), "ok = false;");
diff --git a/trunk/test/com/jpexs/decompiler/flash/ActionScript3Test.java b/trunk/test/com/jpexs/decompiler/flash/ActionScript3Test.java
index 0fe3159cd..c75b74c43 100644
--- a/trunk/test/com/jpexs/decompiler/flash/ActionScript3Test.java
+++ b/trunk/test/com/jpexs/decompiler/flash/ActionScript3Test.java
@@ -18,12 +18,12 @@ package com.jpexs.decompiler.flash;
 
 import com.jpexs.decompiler.flash.abc.ABC;
 import com.jpexs.decompiler.flash.configuration.Configuration;
+import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
 import com.jpexs.decompiler.flash.helpers.CodeFormatting;
 import com.jpexs.decompiler.flash.helpers.HilightedTextWriter;
 import com.jpexs.decompiler.flash.helpers.NulWriter;
 import com.jpexs.decompiler.flash.tags.DoABCDefineTag;
 import com.jpexs.decompiler.flash.tags.Tag;
-import com.jpexs.decompiler.graph.ExportMode;
 import com.jpexs.decompiler.graph.GraphTargetItem;
 import java.io.BufferedInputStream;
 import java.io.FileInputStream;
@@ -71,9 +71,9 @@ public class ActionScript3Test {
         assertTrue(bodyIndex > -1);
         HilightedTextWriter writer = null;
         try {
-            abc.bodies[bodyIndex].convert(methodName, ExportMode.SOURCE, isStatic, -1/*FIX?*/, clsIndex, abc, null, abc.constants, abc.method_info, new Stack<GraphTargetItem>(), false, new NulWriter(), new ArrayList<String>(), abc.instance_info[clsIndex].instance_traits, true);
+            abc.bodies[bodyIndex].convert(methodName, ScriptExportMode.AS, isStatic, -1/*FIX?*/, clsIndex, abc, null, abc.constants, abc.method_info, new Stack<GraphTargetItem>(), false, new NulWriter(), new ArrayList<String>(), abc.instance_info[clsIndex].instance_traits, true);
             writer = new HilightedTextWriter(new CodeFormatting(), false);
-            abc.bodies[bodyIndex].toString(methodName, ExportMode.SOURCE, isStatic, -1/*FIX?*/, clsIndex, abc, null, abc.constants, abc.method_info, new Stack<GraphTargetItem>(), false, writer, new ArrayList<String>(), abc.instance_info[clsIndex].instance_traits);
+            abc.bodies[bodyIndex].toString(methodName, ScriptExportMode.AS, isStatic, -1/*FIX?*/, clsIndex, abc, null, abc.constants, abc.method_info, new Stack<GraphTargetItem>(), false, writer, new ArrayList<String>(), abc.instance_info[clsIndex].instance_traits);
         } catch (InterruptedException ex) {
             fail();
         }
diff --git a/trunk/test/com/jpexs/decompiler/flash/ExportTest.java b/trunk/test/com/jpexs/decompiler/flash/ExportTest.java
index 6673e2dc5..5fe9c27fe 100644
--- a/trunk/test/com/jpexs/decompiler/flash/ExportTest.java
+++ b/trunk/test/com/jpexs/decompiler/flash/ExportTest.java
@@ -17,7 +17,7 @@
 package com.jpexs.decompiler.flash;
 
 import com.jpexs.decompiler.flash.configuration.Configuration;
-import com.jpexs.decompiler.graph.ExportMode;
+import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FilenameFilter;
@@ -81,19 +81,19 @@ public class ExportTest {
 
     @Test(dataProvider = "swfFiles")
     public void testDecompileAS(File f) {
-        testDecompile(f, ExportMode.SOURCE);
+        testDecompile(f, ScriptExportMode.AS);
     }
 
     @Test(dataProvider = "swfFiles")
     public void testDecompilePcode(File f) {
-        testDecompile(f, ExportMode.PCODE);
+        testDecompile(f, ScriptExportMode.PCODE);
     }
 
-    public void testDecompile(File f, ExportMode exportMode) {
+    public void testDecompile(File f, ScriptExportMode exportMode) {
         try {
             SWF swf = new SWF(new FileInputStream(f), false);
             Configuration.debugCopy.set(true);
-            String folderName = exportMode == ExportMode.SOURCE ? "output" : "outputp";
+            String folderName = exportMode == ScriptExportMode.AS ? "output" : "outputp";
             File fdir = new File(TESTDATADIR + File.separator + folderName + File.separator + f.getName());
             fdir.mkdirs();
 
diff --git a/trunk/test/com/jpexs/decompiler/flash/generators/AS3Generator.java b/trunk/test/com/jpexs/decompiler/flash/generators/AS3Generator.java
index e318e27df..684651fe1 100644
--- a/trunk/test/com/jpexs/decompiler/flash/generators/AS3Generator.java
+++ b/trunk/test/com/jpexs/decompiler/flash/generators/AS3Generator.java
@@ -21,11 +21,11 @@ import com.jpexs.decompiler.flash.abc.ABC;
 import com.jpexs.decompiler.flash.abc.types.traits.Trait;
 import com.jpexs.decompiler.flash.abc.types.traits.TraitMethodGetterSetter;
 import com.jpexs.decompiler.flash.configuration.Configuration;
+import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
 import com.jpexs.decompiler.flash.helpers.CodeFormatting;
 import com.jpexs.decompiler.flash.helpers.HilightedTextWriter;
 import com.jpexs.decompiler.flash.tags.DoABCDefineTag;
 import com.jpexs.decompiler.flash.tags.Tag;
-import com.jpexs.decompiler.graph.ExportMode;
 import com.jpexs.decompiler.graph.GraphTargetItem;
 import java.io.BufferedInputStream;
 import java.io.FileInputStream;
@@ -64,7 +64,7 @@ public class AS3Generator {
                     s.append(name);
                     s.append("\", ");
                     HilightedTextWriter src = new HilightedTextWriter(new CodeFormatting(), false);
-                    abc.findBody(((TraitMethodGetterSetter) t).method_info).toString("", ExportMode.SOURCE, false, -1/*FIX?*/, classId, abc, null, abc.constants, abc.method_info, new Stack<GraphTargetItem>(), false, src, new ArrayList<String>(), abc.instance_info[classId].instance_traits);
+                    abc.findBody(((TraitMethodGetterSetter) t).method_info).toString("", ScriptExportMode.AS, false, -1/*FIX?*/, classId, abc, null, abc.constants, abc.method_info, new Stack<GraphTargetItem>(), false, src, new ArrayList<String>(), abc.instance_info[classId].instance_traits);
                     String[] srcs = src.toString().split("[\r\n]+");
                     for (int i = 0; i < srcs.length; i++) {
                         String ss = srcs[i];