diff --git a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript3AssembledDecompileTest.java b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript3AssembledDecompileTest.java
index 0fdf5b366..18374d1c3 100644
--- a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript3AssembledDecompileTest.java
+++ b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript3AssembledDecompileTest.java
@@ -12,7 +12,7 @@ public class ActionScript3AssembledDecompileTest extends ActionScript3DecompileT
 
     @BeforeClass
     public void init() throws IOException, InterruptedException {
-        addSwf("assembled", "testdata/custom/bin/custom.swf");
+        addSwf("assembled", "testdata/as3_assembled/bin/as3_assembled.swf");
     }
 
     @Test
diff --git a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript3ClassTest.java b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript3ClassTest.java
index d77bcaaa6..e977aaa6e 100644
--- a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript3ClassTest.java
+++ b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript3ClassTest.java
@@ -24,7 +24,7 @@ public class ActionScript3ClassTest extends ActionScript3DecompileTestBase {
 
     @BeforeClass
     public void init() throws IOException, InterruptedException {
-        addSwf("standard", "testdata/flashdevelop/bin/Main.flex.swf");
+        addSwf("standard", "testdata/as3_new/bin/as3_new.flex.swf");
     }
 
     private void decompileScriptPack(String path, String expectedResult) {
@@ -55,6 +55,7 @@ public class ActionScript3ClassTest extends ActionScript3DecompileTestBase {
         expectedResult = cleanPCode(expectedResult);
         assertEquals(actualResult, expectedResult);
     }
+
     @Test
     public void testMyPackage1TestClass() {
         decompileScriptPack("tests_classes.mypackage1.TestClass", "package tests_classes.mypackage1\n"
diff --git a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript3ClassicDecompileTest.java b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript3ClassicDecompileTest.java
index 5a9573027..5f7eb8473 100644
--- a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript3ClassicDecompileTest.java
+++ b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript3ClassicDecompileTest.java
@@ -12,7 +12,7 @@ public class ActionScript3ClassicDecompileTest extends ActionScript3DecompileTes
 
     @BeforeClass
     public void init() throws IOException, InterruptedException {
-        addSwf("classic", "testdata/flashdevelop/bin/Main.flex.swf");
+        addSwf("classic", "testdata/as3_new/bin/as3_new.flex.swf");
     }
 
     @Test
diff --git a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript3CrossCompileDecompileTest.java b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript3CrossCompileDecompileTest.java
index 223369b95..f32ca599f 100644
--- a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript3CrossCompileDecompileTest.java
+++ b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript3CrossCompileDecompileTest.java
@@ -13,8 +13,8 @@ public class ActionScript3CrossCompileDecompileTest extends ActionScript3Decompi
 
     @BeforeClass
     public void init() throws IOException, InterruptedException {
-        addSwf("flex", "testdata/cross_compile/bin/Main.flex.swf");
-        addSwf("air", "testdata/cross_compile/bin/Main.air.swf");
+        addSwf("flex", "testdata/as3_cross_compile/bin/as3_cross_compile.flex.swf");
+        addSwf("air", "testdata/as3_cross_compile/bin/as3_cross_compile.air.swf");
     }
 
     @DataProvider
diff --git a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript3CrossCompileSwfToolsDecompileTest.java b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript3CrossCompileSwfToolsDecompileTest.java
index d7037390a..420f9e0fa 100644
--- a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript3CrossCompileSwfToolsDecompileTest.java
+++ b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript3CrossCompileSwfToolsDecompileTest.java
@@ -12,7 +12,7 @@ public class ActionScript3CrossCompileSwfToolsDecompileTest extends ActionScript
 
     @BeforeClass
     public void init() throws IOException, InterruptedException {
-        addSwf("swftools", "testdata/cross_compile/bin/Main.swftools.swf");
+        addSwf("swftools", "testdata/as3_cross_compile/bin/as3_cross_compile.swftools.swf");
     }
 
     @Test
diff --git a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript3OptinalParametersTest.java b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript3OptinalParametersTest.java
index 64b3e614a..ca29543b3 100644
--- a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript3OptinalParametersTest.java
+++ b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript3OptinalParametersTest.java
@@ -21,7 +21,7 @@ public class ActionScript3OptinalParametersTest extends ActionScript3DecompileTe
 
     @BeforeClass
     public void init() throws IOException, InterruptedException {
-        addSwf("standard", "testdata/flashdevelop/bin/Main.flex.swf");
+        addSwf("standard", "testdata/as3_new/bin/as3_new.flex.swf");
     }
     @Test
     public void testOptionalParameters() {
diff --git a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/generators/AS3Generator.java b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/generators/AS3Generator.java
index 23436a619..a1e38f871 100644
--- a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/generators/AS3Generator.java
+++ b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/generators/AS3Generator.java
@@ -170,14 +170,14 @@ public class AS3Generator {
         Configuration.autoDeobfuscate.set(false);
 
 
-        useFile("ActionScript3ClassicDecompileTest", new String[][]{{"testdata/flashdevelop/bin/Main.flex.swf", "classic"}}, false);
+        useFile("ActionScript3ClassicDecompileTest", new String[][]{{"testdata/as3_new/bin/as3_new.flex.swf", "classic"}}, false);
         useFile("ActionScript3CrossCompileDecompileTest", new String[][]{
-            {"testdata/cross_compile/bin/Main.flex.swf", "flex"},
-            {"testdata/cross_compile/bin/Main.air.swf", "air"}
+            {"testdata/as3_cross_compile/bin/as3_cross_compile.flex.swf", "flex"},
+            {"testdata/as3_cross_compile/bin/as3_cross_compile.air.swf", "air"}
         }, true);
         useFile("ActionScript3CrossCompileSwfToolsDecompileTest", new String[][]{
-            {"testdata/cross_compile/bin/Main.swftools.swf", "swftools"},}, false);
-        useFile("ActionScript3AssembledDecompileTest", new String[][]{{"testdata/custom/bin/custom.swf", "assembled"}}, false);
+            {"testdata/as3_cross_compile/bin/as3_cross_compile.swftools.swf", "swftools"},}, false);
+        useFile("ActionScript3AssembledDecompileTest", new String[][]{{"testdata/as3_assembled/bin/as3_assembled.swf", "assembled"}}, false);
 
         System.exit(0);
     }
diff --git a/libsrc/ffdec_lib/testdata/custom/abc/custom-0.abc b/libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0.abc
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/abc/custom-0.abc
rename to libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0.abc
diff --git a/libsrc/ffdec_lib/testdata/custom/abc/custom-0/Main.class.asasm b/libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/Main.class.asasm
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/abc/custom-0/Main.class.asasm
rename to libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/Main.class.asasm
diff --git a/libsrc/ffdec_lib/testdata/custom/abc/custom-0/Main.script.asasm b/libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/Main.script.asasm
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/abc/custom-0/Main.script.asasm
rename to libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/Main.script.asasm
diff --git a/libsrc/ffdec_lib/testdata/custom/abc/custom-0/custom-0.main.abc b/libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/as3_assembled-0.main.abc
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/abc/custom-0/custom-0.main.abc
rename to libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/as3_assembled-0.main.abc
diff --git a/libsrc/ffdec_lib/testdata/custom/abc/custom-0/custom-0.main.asasm b/libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/as3_assembled-0.main.asasm
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/abc/custom-0/custom-0.main.asasm
rename to libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/as3_assembled-0.main.asasm
diff --git a/libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/Template.class.asasm b/libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/Template.class.asasm
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/Template.class.asasm
rename to libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/Template.class.asasm
diff --git a/libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/Template.script.asasm b/libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/Template.script.asasm
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/Template.script.asasm
rename to libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/Template.script.asasm
diff --git a/libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestDoubleDup.class.asasm b/libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestDoubleDup.class.asasm
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestDoubleDup.class.asasm
rename to libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestDoubleDup.class.asasm
diff --git a/libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestDoubleDup.script.asasm b/libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestDoubleDup.script.asasm
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestDoubleDup.script.asasm
rename to libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestDoubleDup.script.asasm
diff --git a/libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestDup.class.asasm b/libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestDup.class.asasm
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestDup.class.asasm
rename to libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestDup.class.asasm
diff --git a/libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestDup.script.asasm b/libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestDup.script.asasm
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestDup.script.asasm
rename to libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestDup.script.asasm
diff --git a/libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestDupAssignment.class.asasm b/libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestDupAssignment.class.asasm
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestDupAssignment.class.asasm
rename to libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestDupAssignment.class.asasm
diff --git a/libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestDupAssignment.script.asasm b/libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestDupAssignment.script.asasm
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestDupAssignment.script.asasm
rename to libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestDupAssignment.script.asasm
diff --git a/libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestForEach.class.asasm b/libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestForEach.class.asasm
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestForEach.class.asasm
rename to libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestForEach.class.asasm
diff --git a/libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestForEach.script.asasm b/libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestForEach.script.asasm
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestForEach.script.asasm
rename to libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestForEach.script.asasm
diff --git a/libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestForEachCoerced.class.asasm b/libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestForEachCoerced.class.asasm
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestForEachCoerced.class.asasm
rename to libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestForEachCoerced.class.asasm
diff --git a/libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestForEachCoerced.script.asasm b/libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestForEachCoerced.script.asasm
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestForEachCoerced.script.asasm
rename to libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestForEachCoerced.script.asasm
diff --git a/libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestIncrement.class.asasm b/libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestIncrement.class.asasm
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestIncrement.class.asasm
rename to libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestIncrement.class.asasm
diff --git a/libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestIncrement.script.asasm b/libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestIncrement.script.asasm
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestIncrement.script.asasm
rename to libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestIncrement.script.asasm
diff --git a/libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestIncrement2.class.asasm b/libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestIncrement2.class.asasm
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestIncrement2.class.asasm
rename to libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestIncrement2.class.asasm
diff --git a/libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestIncrement2.script.asasm b/libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestIncrement2.script.asasm
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestIncrement2.script.asasm
rename to libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestIncrement2.script.asasm
diff --git a/libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestIncrement3.class.asasm b/libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestIncrement3.class.asasm
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestIncrement3.class.asasm
rename to libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestIncrement3.class.asasm
diff --git a/libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestIncrement3.script.asasm b/libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestIncrement3.script.asasm
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestIncrement3.script.asasm
rename to libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestIncrement3.script.asasm
diff --git a/libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestSetSlotDup.class.asasm b/libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestSetSlotDup.class.asasm
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestSetSlotDup.class.asasm
rename to libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestSetSlotDup.class.asasm
diff --git a/libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestSetSlotDup.script.asasm b/libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestSetSlotDup.script.asasm
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestSetSlotDup.script.asasm
rename to libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestSetSlotDup.script.asasm
diff --git a/libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestSetSlotFindProperty.class.asasm b/libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestSetSlotFindProperty.class.asasm
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestSetSlotFindProperty.class.asasm
rename to libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestSetSlotFindProperty.class.asasm
diff --git a/libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestSetSlotFindProperty.script.asasm b/libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestSetSlotFindProperty.script.asasm
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestSetSlotFindProperty.script.asasm
rename to libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestSetSlotFindProperty.script.asasm
diff --git a/libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestSwitch.class.asasm b/libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestSwitch.class.asasm
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestSwitch.class.asasm
rename to libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestSwitch.class.asasm
diff --git a/libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestSwitch.script.asasm b/libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestSwitch.script.asasm
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestSwitch.script.asasm
rename to libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestSwitch.script.asasm
diff --git a/libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestSwitchDefault.class.asasm b/libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestSwitchDefault.class.asasm
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestSwitchDefault.class.asasm
rename to libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestSwitchDefault.class.asasm
diff --git a/libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestSwitchDefault.script.asasm b/libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestSwitchDefault.script.asasm
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/abc/custom-0/tests/TestSwitchDefault.script.asasm
rename to libsrc/ffdec_lib/testdata/as3_assembled/abc/as3_assembled-0/tests/TestSwitchDefault.script.asasm
diff --git a/libsrc/ffdec_lib/testdata/custom/custom.as3proj b/libsrc/ffdec_lib/testdata/as3_assembled/as3_assembled.as3proj
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/custom.as3proj
rename to libsrc/ffdec_lib/testdata/as3_assembled/as3_assembled.as3proj
diff --git a/libsrc/ffdec_lib/testdata/custom/bin/custom.swf b/libsrc/ffdec_lib/testdata/as3_assembled/bin/as3_assembled.swf
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/bin/custom.swf
rename to libsrc/ffdec_lib/testdata/as3_assembled/bin/as3_assembled.swf
diff --git a/libsrc/ffdec_lib/testdata/cross_compile/bin/expressInstall.swf b/libsrc/ffdec_lib/testdata/as3_assembled/bin/expressInstall.swf
similarity index 100%
rename from libsrc/ffdec_lib/testdata/cross_compile/bin/expressInstall.swf
rename to libsrc/ffdec_lib/testdata/as3_assembled/bin/expressInstall.swf
diff --git a/libsrc/ffdec_lib/testdata/custom/bin/index.html b/libsrc/ffdec_lib/testdata/as3_assembled/bin/index.html
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/bin/index.html
rename to libsrc/ffdec_lib/testdata/as3_assembled/bin/index.html
diff --git a/libsrc/ffdec_lib/testdata/cross_compile/bin/js/swfobject.js b/libsrc/ffdec_lib/testdata/as3_assembled/bin/js/swfobject.js
similarity index 100%
rename from libsrc/ffdec_lib/testdata/cross_compile/bin/js/swfobject.js
rename to libsrc/ffdec_lib/testdata/as3_assembled/bin/js/swfobject.js
diff --git a/libsrc/ffdec_lib/testdata/custom/obj/customConfig.old b/libsrc/ffdec_lib/testdata/as3_assembled/obj/as3_assembledConfig.old
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/obj/customConfig.old
rename to libsrc/ffdec_lib/testdata/as3_assembled/obj/as3_assembledConfig.old
diff --git a/libsrc/ffdec_lib/testdata/custom/obj/customConfig.xml b/libsrc/ffdec_lib/testdata/as3_assembled/obj/as3_assembledConfig.xml
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/obj/customConfig.xml
rename to libsrc/ffdec_lib/testdata/as3_assembled/obj/as3_assembledConfig.xml
diff --git a/libsrc/ffdec_lib/testdata/custom/run_abcexport.bat b/libsrc/ffdec_lib/testdata/as3_assembled/run_abcexport.bat
similarity index 71%
rename from libsrc/ffdec_lib/testdata/custom/run_abcexport.bat
rename to libsrc/ffdec_lib/testdata/as3_assembled/run_abcexport.bat
index f95298490..7cae697ac 100644
--- a/libsrc/ffdec_lib/testdata/custom/run_abcexport.bat
+++ b/libsrc/ffdec_lib/testdata/as3_assembled/run_abcexport.bat
@@ -1,7 +1,8 @@
 @echo off
 set RABCDASM_PATH=c:\RABCDasm
+set SWFNAME=as3_assembled
 rd /s /q .\abc
-%RABCDASM_PATH%\abcexport.exe .\bin\custom.swf
+%RABCDASM_PATH%\abcexport.exe .\bin\%SWFNAME%.swf
 mkdir .\abc
 move .\bin\*.abc abc\>NUL
 set ABC_DIR=.\abc
diff --git a/libsrc/ffdec_lib/testdata/as3_assembled/run_rabcasm.bat b/libsrc/ffdec_lib/testdata/as3_assembled/run_rabcasm.bat
new file mode 100644
index 000000000..e64b064e4
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/as3_assembled/run_rabcasm.bat
@@ -0,0 +1,6 @@
+@echo off
+set RABCDASM_PATH=c:\RABCDasm
+set SWFNAME=as3_assembled
+%RABCDASM_PATH%\rabcasm.exe abc\%SWFNAME%-0\%SWFNAME%-0.main.asasm
+%RABCDASM_PATH%\abcreplace.exe bin\%SWFNAME%.swf 0 abc\%SWFNAME%-0\%SWFNAME%-0.main.abc
+pause
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/custom/src/Main.as b/libsrc/ffdec_lib/testdata/as3_assembled/src/Main.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/src/Main.as
rename to libsrc/ffdec_lib/testdata/as3_assembled/src/Main.as
diff --git a/libsrc/ffdec_lib/testdata/custom/src/tests/TestDupAssignment.as b/libsrc/ffdec_lib/testdata/as3_assembled/src/tests/TestDupAssignment.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/src/tests/TestDupAssignment.as
rename to libsrc/ffdec_lib/testdata/as3_assembled/src/tests/TestDupAssignment.as
diff --git a/libsrc/ffdec_lib/testdata/cross_compile/cross_compile.as3proj b/libsrc/ffdec_lib/testdata/as3_cross_compile/as3_cross_compile.as3proj
similarity index 97%
rename from libsrc/ffdec_lib/testdata/cross_compile/cross_compile.as3proj
rename to libsrc/ffdec_lib/testdata/as3_cross_compile/as3_cross_compile.as3proj
index 19d21f07d..229ddda42 100644
--- a/libsrc/ffdec_lib/testdata/cross_compile/cross_compile.as3proj
+++ b/libsrc/ffdec_lib/testdata/as3_cross_compile/as3_cross_compile.as3proj
@@ -4,7 +4,7 @@
   <output>
     <movie outputType="Application" />
     <movie input="" />
-    <movie path="bin\Main.flex.swf" />
+    <movie path="bin\as3_cross_compile.flex.swf" />
     <movie fps="30" />
     <movie width="800" />
     <movie height="600" />
diff --git a/libsrc/ffdec_lib/testdata/as3_cross_compile/bin/as3_cross_compile.air.swf b/libsrc/ffdec_lib/testdata/as3_cross_compile/bin/as3_cross_compile.air.swf
new file mode 100644
index 000000000..a7d2b248d
Binary files /dev/null and b/libsrc/ffdec_lib/testdata/as3_cross_compile/bin/as3_cross_compile.air.swf differ
diff --git a/libsrc/ffdec_lib/testdata/as3_cross_compile/bin/as3_cross_compile.flex.swf b/libsrc/ffdec_lib/testdata/as3_cross_compile/bin/as3_cross_compile.flex.swf
new file mode 100644
index 000000000..33e04e850
Binary files /dev/null and b/libsrc/ffdec_lib/testdata/as3_cross_compile/bin/as3_cross_compile.flex.swf differ
diff --git a/libsrc/ffdec_lib/testdata/as3_cross_compile/bin/as3_cross_compile.flex_apache.swf b/libsrc/ffdec_lib/testdata/as3_cross_compile/bin/as3_cross_compile.flex_apache.swf
new file mode 100644
index 000000000..4142e288c
Binary files /dev/null and b/libsrc/ffdec_lib/testdata/as3_cross_compile/bin/as3_cross_compile.flex_apache.swf differ
diff --git a/libsrc/ffdec_lib/testdata/cross_compile/bin/Main.swftools.swf b/libsrc/ffdec_lib/testdata/as3_cross_compile/bin/as3_cross_compile.swftools.swf
similarity index 100%
rename from libsrc/ffdec_lib/testdata/cross_compile/bin/Main.swftools.swf
rename to libsrc/ffdec_lib/testdata/as3_cross_compile/bin/as3_cross_compile.swftools.swf
diff --git a/libsrc/ffdec_lib/testdata/custom/bin/expressInstall.swf b/libsrc/ffdec_lib/testdata/as3_cross_compile/bin/expressInstall.swf
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/bin/expressInstall.swf
rename to libsrc/ffdec_lib/testdata/as3_cross_compile/bin/expressInstall.swf
diff --git a/libsrc/ffdec_lib/testdata/cross_compile/bin/index.html b/libsrc/ffdec_lib/testdata/as3_cross_compile/bin/index.html
similarity index 100%
rename from libsrc/ffdec_lib/testdata/cross_compile/bin/index.html
rename to libsrc/ffdec_lib/testdata/as3_cross_compile/bin/index.html
diff --git a/libsrc/ffdec_lib/testdata/custom/bin/js/swfobject.js b/libsrc/ffdec_lib/testdata/as3_cross_compile/bin/js/swfobject.js
similarity index 100%
rename from libsrc/ffdec_lib/testdata/custom/bin/js/swfobject.js
rename to libsrc/ffdec_lib/testdata/as3_cross_compile/bin/js/swfobject.js
diff --git a/libsrc/ffdec_lib/testdata/as3_cross_compile/build_air_debug.bat b/libsrc/ffdec_lib/testdata/as3_cross_compile/build_air_debug.bat
new file mode 100644
index 000000000..35668d86d
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/as3_cross_compile/build_air_debug.bat
@@ -0,0 +1,4 @@
+@echo off
+set COMPILERKIND=air
+set SWFNAME=as3_cross_compile
+call c:\air\bin\mxmlc.bat -warnings=false -debug=true -output bin/%SWFNAME%.%COMPILERKIND%.swf src/Main.as 1> buildlog.%COMPILERKIND%.txt 2>&1
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/cross_compile/build_debug.bat b/libsrc/ffdec_lib/testdata/as3_cross_compile/build_debug.bat
similarity index 100%
rename from libsrc/ffdec_lib/testdata/cross_compile/build_debug.bat
rename to libsrc/ffdec_lib/testdata/as3_cross_compile/build_debug.bat
diff --git a/libsrc/ffdec_lib/testdata/as3_cross_compile/build_flex_apache_debug.bat b/libsrc/ffdec_lib/testdata/as3_cross_compile/build_flex_apache_debug.bat
new file mode 100644
index 000000000..9254f2700
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/as3_cross_compile/build_flex_apache_debug.bat
@@ -0,0 +1,4 @@
+@echo off
+set COMPILERKIND=flex_apache
+set SWFNAME=as3_cross_compile
+call c:\flex_apache\bin\mxmlc.bat -warnings=false -debug=true -output bin/%SWFNAME%.%COMPILERKIND%.swf src/Main.as 1> buildlog.%COMPILERKIND%.txt 2>&1
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/as3_cross_compile/build_flex_debug.bat b/libsrc/ffdec_lib/testdata/as3_cross_compile/build_flex_debug.bat
new file mode 100644
index 000000000..ef39749a8
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/as3_cross_compile/build_flex_debug.bat
@@ -0,0 +1,4 @@
+@echo off
+set COMPILERKIND=flex
+set SWFNAME=as3_cross_compile
+c:\flex\bin\mxmlc.exe -warnings=false -debug=true -output bin/%SWFNAME%.%COMPILERKIND%.swf src/Main.as 1> buildlog.%COMPILERKIND%.txt 2>&1
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/as3_cross_compile/build_swftools_debug.bat b/libsrc/ffdec_lib/testdata/as3_cross_compile/build_swftools_debug.bat
new file mode 100644
index 000000000..0330fc2fe
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/as3_cross_compile/build_swftools_debug.bat
@@ -0,0 +1,5 @@
+@echo off
+set COMPILERKIND=swftools
+set SWFNAME=as3_cross_compile
+cd src
+c:\swftools\as3compile.exe Main.as -o ..\bin\%SWFNAME%.%COMPILERKIND%.swf 1> ../buildlog.%COMPILERKIND%.txt 2>&1
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/cross_compile/obj/cross_compileConfig.old b/libsrc/ffdec_lib/testdata/as3_cross_compile/obj/as3_cross_compileConfig.old
similarity index 92%
rename from libsrc/ffdec_lib/testdata/cross_compile/obj/cross_compileConfig.old
rename to libsrc/ffdec_lib/testdata/as3_cross_compile/obj/as3_cross_compileConfig.old
index 55f0c7a30..bb0ddf145 100644
--- a/libsrc/ffdec_lib/testdata/cross_compile/obj/cross_compileConfig.old
+++ b/libsrc/ffdec_lib/testdata/as3_cross_compile/obj/as3_cross_compileConfig.old
@@ -32,12 +32,12 @@
     </define>
     <verbose-stacktraces>true</verbose-stacktraces>
     <source-path append="true">
-      <path-element>C:\Dropbox\Programovani\JavaSE\FFDec\libsrc\ffdec_lib\testdata\cross_compile\src</path-element>
+      <path-element>C:\Dropbox\Programovani\JavaSE\FFDec\libsrc\ffdec_lib\testdata\as3_cross_compile\src</path-element>
       <path-element>C:\Program Files (x86)\FlashDevelop\Library\AS3\classes</path-element>
     </source-path>
   </compiler>
   <file-specs>
-    <path-element>C:\Dropbox\Programovani\JavaSE\FFDec\libsrc\ffdec_lib\testdata\cross_compile\src\Main.as</path-element>
+    <path-element>C:\Dropbox\Programovani\JavaSE\FFDec\libsrc\ffdec_lib\testdata\as3_cross_compile\src\Main.as</path-element>
   </file-specs>
   <default-background-color>#FFFFFF</default-background-color>
   <default-frame-rate>30</default-frame-rate>
diff --git a/libsrc/ffdec_lib/testdata/cross_compile/obj/cross_compileConfig.xml b/libsrc/ffdec_lib/testdata/as3_cross_compile/obj/as3_cross_compileConfig.xml
similarity index 89%
rename from libsrc/ffdec_lib/testdata/cross_compile/obj/cross_compileConfig.xml
rename to libsrc/ffdec_lib/testdata/as3_cross_compile/obj/as3_cross_compileConfig.xml
index 55f0c7a30..5ed894363 100644
--- a/libsrc/ffdec_lib/testdata/cross_compile/obj/cross_compileConfig.xml
+++ b/libsrc/ffdec_lib/testdata/as3_cross_compile/obj/as3_cross_compileConfig.xml
@@ -16,7 +16,7 @@
     </define>
     <define append="true">
       <name>CONFIG::timeStamp</name>
-      <value>'02.02.2021'</value>
+      <value>'03.02.2021'</value>
     </define>
     <define append="true">
       <name>CONFIG::air</name>
@@ -32,12 +32,12 @@
     </define>
     <verbose-stacktraces>true</verbose-stacktraces>
     <source-path append="true">
-      <path-element>C:\Dropbox\Programovani\JavaSE\FFDec\libsrc\ffdec_lib\testdata\cross_compile\src</path-element>
+      <path-element>C:\Dropbox\Programovani\JavaSE\FFDec\libsrc\ffdec_lib\testdata\as3_cross_compile\src</path-element>
       <path-element>C:\Program Files (x86)\FlashDevelop\Library\AS3\classes</path-element>
     </source-path>
   </compiler>
   <file-specs>
-    <path-element>C:\Dropbox\Programovani\JavaSE\FFDec\libsrc\ffdec_lib\testdata\cross_compile\src\Main.as</path-element>
+    <path-element>C:\Dropbox\Programovani\JavaSE\FFDec\libsrc\ffdec_lib\testdata\as3_cross_compile\src\Main.as</path-element>
   </file-specs>
   <default-background-color>#FFFFFF</default-background-color>
   <default-frame-rate>30</default-frame-rate>
diff --git a/libsrc/ffdec_lib/testdata/cross_compile/src/Main.as b/libsrc/ffdec_lib/testdata/as3_cross_compile/src/Main.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/cross_compile/src/Main.as
rename to libsrc/ffdec_lib/testdata/as3_cross_compile/src/Main.as
diff --git a/libsrc/ffdec_lib/testdata/cross_compile/src/tests/TestTryCatch.as b/libsrc/ffdec_lib/testdata/as3_cross_compile/src/tests/TestTryCatch.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/cross_compile/src/tests/TestTryCatch.as
rename to libsrc/ffdec_lib/testdata/as3_cross_compile/src/tests/TestTryCatch.as
diff --git a/libsrc/ffdec_lib/testdata/cross_compile/src/tests/TestTryCatchExceptionUsage.as b/libsrc/ffdec_lib/testdata/as3_cross_compile/src/tests/TestTryCatchExceptionUsage.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/cross_compile/src/tests/TestTryCatchExceptionUsage.as
rename to libsrc/ffdec_lib/testdata/as3_cross_compile/src/tests/TestTryCatchExceptionUsage.as
diff --git a/libsrc/ffdec_lib/testdata/cross_compile/src/tests/TestTryCatchIfInTry.as b/libsrc/ffdec_lib/testdata/as3_cross_compile/src/tests/TestTryCatchIfInTry.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/cross_compile/src/tests/TestTryCatchIfInTry.as
rename to libsrc/ffdec_lib/testdata/as3_cross_compile/src/tests/TestTryCatchIfInTry.as
diff --git a/libsrc/ffdec_lib/testdata/cross_compile/src/tests/TestTryCatchInWhile.as b/libsrc/ffdec_lib/testdata/as3_cross_compile/src/tests/TestTryCatchInWhile.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/cross_compile/src/tests/TestTryCatchInWhile.as
rename to libsrc/ffdec_lib/testdata/as3_cross_compile/src/tests/TestTryCatchInWhile.as
diff --git a/libsrc/ffdec_lib/testdata/cross_compile/src/tests/TestTryCatchInWhile2.as b/libsrc/ffdec_lib/testdata/as3_cross_compile/src/tests/TestTryCatchInWhile2.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/cross_compile/src/tests/TestTryCatchInWhile2.as
rename to libsrc/ffdec_lib/testdata/as3_cross_compile/src/tests/TestTryCatchInWhile2.as
diff --git a/libsrc/ffdec_lib/testdata/cross_compile/src/tests/TestTryCatchLoop.as b/libsrc/ffdec_lib/testdata/as3_cross_compile/src/tests/TestTryCatchLoop.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/cross_compile/src/tests/TestTryCatchLoop.as
rename to libsrc/ffdec_lib/testdata/as3_cross_compile/src/tests/TestTryCatchLoop.as
diff --git a/libsrc/ffdec_lib/testdata/cross_compile/src/tests/TestTryFinally.as b/libsrc/ffdec_lib/testdata/as3_cross_compile/src/tests/TestTryFinally.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/cross_compile/src/tests/TestTryFinally.as
rename to libsrc/ffdec_lib/testdata/as3_cross_compile/src/tests/TestTryFinally.as
diff --git a/libsrc/ffdec_lib/testdata/cross_compile/src/tests/TestTryFinallyDirectReturnInFinally.as b/libsrc/ffdec_lib/testdata/as3_cross_compile/src/tests/TestTryFinallyDirectReturnInFinally.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/cross_compile/src/tests/TestTryFinallyDirectReturnInFinally.as
rename to libsrc/ffdec_lib/testdata/as3_cross_compile/src/tests/TestTryFinallyDirectReturnInFinally.as
diff --git a/libsrc/ffdec_lib/testdata/cross_compile/src/tests/TestTryFinallyLoop.as b/libsrc/ffdec_lib/testdata/as3_cross_compile/src/tests/TestTryFinallyLoop.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/cross_compile/src/tests/TestTryFinallyLoop.as
rename to libsrc/ffdec_lib/testdata/as3_cross_compile/src/tests/TestTryFinallyLoop.as
diff --git a/libsrc/ffdec_lib/testdata/cross_compile/src/tests/TestTryFinallyLoopInFinally.as b/libsrc/ffdec_lib/testdata/as3_cross_compile/src/tests/TestTryFinallyLoopInFinally.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/cross_compile/src/tests/TestTryFinallyLoopInFinally.as
rename to libsrc/ffdec_lib/testdata/as3_cross_compile/src/tests/TestTryFinallyLoopInFinally.as
diff --git a/libsrc/ffdec_lib/testdata/cross_compile/src/tests/TestTryFinallyMultipleCatch.as b/libsrc/ffdec_lib/testdata/as3_cross_compile/src/tests/TestTryFinallyMultipleCatch.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/cross_compile/src/tests/TestTryFinallyMultipleCatch.as
rename to libsrc/ffdec_lib/testdata/as3_cross_compile/src/tests/TestTryFinallyMultipleCatch.as
diff --git a/libsrc/ffdec_lib/testdata/cross_compile/src/tests/TestTryFinallyNoCatch.as b/libsrc/ffdec_lib/testdata/as3_cross_compile/src/tests/TestTryFinallyNoCatch.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/cross_compile/src/tests/TestTryFinallyNoCatch.as
rename to libsrc/ffdec_lib/testdata/as3_cross_compile/src/tests/TestTryFinallyNoCatch.as
diff --git a/libsrc/ffdec_lib/testdata/cross_compile/src/tests/TestTryFinallyReturn.as b/libsrc/ffdec_lib/testdata/as3_cross_compile/src/tests/TestTryFinallyReturn.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/cross_compile/src/tests/TestTryFinallyReturn.as
rename to libsrc/ffdec_lib/testdata/as3_cross_compile/src/tests/TestTryFinallyReturn.as
diff --git a/libsrc/ffdec_lib/testdata/cross_compile/src/tests/TestTryFinallyReturnInFinally.as b/libsrc/ffdec_lib/testdata/as3_cross_compile/src/tests/TestTryFinallyReturnInFinally.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/cross_compile/src/tests/TestTryFinallyReturnInFinally.as
rename to libsrc/ffdec_lib/testdata/as3_cross_compile/src/tests/TestTryFinallyReturnInFinally.as
diff --git a/libsrc/ffdec_lib/testdata/cross_compile/src/tests/TestTryFinallyReturnNested.as b/libsrc/ffdec_lib/testdata/as3_cross_compile/src/tests/TestTryFinallyReturnNested.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/cross_compile/src/tests/TestTryFinallyReturnNested.as
rename to libsrc/ffdec_lib/testdata/as3_cross_compile/src/tests/TestTryFinallyReturnNested.as
diff --git a/libsrc/ffdec_lib/testdata/cross_compile/src/tests/TestTryFinallyReturnVoid.as b/libsrc/ffdec_lib/testdata/as3_cross_compile/src/tests/TestTryFinallyReturnVoid.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/cross_compile/src/tests/TestTryFinallyReturnVoid.as
rename to libsrc/ffdec_lib/testdata/as3_cross_compile/src/tests/TestTryFinallyReturnVoid.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/flashdevelop.as3proj b/libsrc/ffdec_lib/testdata/as3_new/as3_new.as3proj
similarity index 98%
rename from libsrc/ffdec_lib/testdata/flashdevelop/flashdevelop.as3proj
rename to libsrc/ffdec_lib/testdata/as3_new/as3_new.as3proj
index a8df93d1c..546b49160 100644
--- a/libsrc/ffdec_lib/testdata/flashdevelop/flashdevelop.as3proj
+++ b/libsrc/ffdec_lib/testdata/as3_new/as3_new.as3proj
@@ -4,7 +4,7 @@
   <output>
     <movie outputType="Application" />
     <movie input="" />
-    <movie path="bin\Main.flex.swf" />
+    <movie path="bin\as3_new.flex.swf" />
     <movie fps="30" />
     <movie width="800" />
     <movie height="600" />
diff --git a/libsrc/ffdec_lib/testdata/as3_new/bin/as3_new.air.swf b/libsrc/ffdec_lib/testdata/as3_new/bin/as3_new.air.swf
new file mode 100644
index 000000000..eff1649d0
Binary files /dev/null and b/libsrc/ffdec_lib/testdata/as3_new/bin/as3_new.air.swf differ
diff --git a/libsrc/ffdec_lib/testdata/as3_new/bin/as3_new.flex.swf b/libsrc/ffdec_lib/testdata/as3_new/bin/as3_new.flex.swf
new file mode 100644
index 000000000..12d0c206d
Binary files /dev/null and b/libsrc/ffdec_lib/testdata/as3_new/bin/as3_new.flex.swf differ
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/bin/expressInstall.swf b/libsrc/ffdec_lib/testdata/as3_new/bin/expressInstall.swf
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/bin/expressInstall.swf
rename to libsrc/ffdec_lib/testdata/as3_new/bin/expressInstall.swf
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/bin/index.html b/libsrc/ffdec_lib/testdata/as3_new/bin/index.html
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/bin/index.html
rename to libsrc/ffdec_lib/testdata/as3_new/bin/index.html
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/bin/js/swfobject.js b/libsrc/ffdec_lib/testdata/as3_new/bin/js/swfobject.js
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/bin/js/swfobject.js
rename to libsrc/ffdec_lib/testdata/as3_new/bin/js/swfobject.js
diff --git a/libsrc/ffdec_lib/testdata/as3_new/build_air_debug.bat b/libsrc/ffdec_lib/testdata/as3_new/build_air_debug.bat
new file mode 100644
index 000000000..105b1199d
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/as3_new/build_air_debug.bat
@@ -0,0 +1,4 @@
+@echo off
+set COMPILERKIND=air
+set SWFNAME=as3_new
+call c:\air\bin\mxmlc.bat -warnings=false -debug=true -output bin/%SWFNAME%.%COMPILERKIND%.swf src/Main.as 1> buildlog.%COMPILERKIND%.txt 2>&1
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/as3_new/build_flex_debug.bat b/libsrc/ffdec_lib/testdata/as3_new/build_flex_debug.bat
new file mode 100644
index 000000000..0e5cd7aab
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/as3_new/build_flex_debug.bat
@@ -0,0 +1,4 @@
+@echo off
+set COMPILERKIND=flex
+set SWFNAME=as3_new
+c:\flex\bin\mxmlc.exe -warnings=false -debug=true -output bin/%SWFNAME%.%COMPILERKIND%.swf src/Main.as 1> buildlog.%COMPILERKIND%.txt 2>&1
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/obj/flashdevelopConfig.old b/libsrc/ffdec_lib/testdata/as3_new/obj/as3_newConfig.old
similarity index 92%
rename from libsrc/ffdec_lib/testdata/flashdevelop/obj/flashdevelopConfig.old
rename to libsrc/ffdec_lib/testdata/as3_new/obj/as3_newConfig.old
index 0801f40d8..7015913ec 100644
--- a/libsrc/ffdec_lib/testdata/flashdevelop/obj/flashdevelopConfig.old
+++ b/libsrc/ffdec_lib/testdata/as3_new/obj/as3_newConfig.old
@@ -32,12 +32,12 @@
     </define>
     <verbose-stacktraces>true</verbose-stacktraces>
     <source-path append="true">
-      <path-element>C:\Dropbox\Programovani\JavaSE\FFDec\libsrc\ffdec_lib\testdata\flashdevelop\src</path-element>
+      <path-element>C:\Dropbox\Programovani\JavaSE\FFDec\libsrc\ffdec_lib\testdata\as3_new\src</path-element>
       <path-element>C:\Program Files (x86)\FlashDevelop\Library\AS3\classes</path-element>
     </source-path>
   </compiler>
   <file-specs>
-    <path-element>C:\Dropbox\Programovani\JavaSE\FFDec\libsrc\ffdec_lib\testdata\flashdevelop\src\Main.as</path-element>
+    <path-element>C:\Dropbox\Programovani\JavaSE\FFDec\libsrc\ffdec_lib\testdata\as3_new\src\Main.as</path-element>
   </file-specs>
   <default-background-color>#FFFFFF</default-background-color>
   <default-frame-rate>30</default-frame-rate>
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/obj/flashdevelopConfig.xml b/libsrc/ffdec_lib/testdata/as3_new/obj/as3_newConfig.xml
similarity index 90%
rename from libsrc/ffdec_lib/testdata/flashdevelop/obj/flashdevelopConfig.xml
rename to libsrc/ffdec_lib/testdata/as3_new/obj/as3_newConfig.xml
index 0801f40d8..60b1928bd 100644
--- a/libsrc/ffdec_lib/testdata/flashdevelop/obj/flashdevelopConfig.xml
+++ b/libsrc/ffdec_lib/testdata/as3_new/obj/as3_newConfig.xml
@@ -16,7 +16,7 @@
     </define>
     <define append="true">
       <name>CONFIG::timeStamp</name>
-      <value>'02.02.2021'</value>
+      <value>'03.02.2021'</value>
     </define>
     <define append="true">
       <name>CONFIG::air</name>
@@ -32,12 +32,12 @@
     </define>
     <verbose-stacktraces>true</verbose-stacktraces>
     <source-path append="true">
-      <path-element>C:\Dropbox\Programovani\JavaSE\FFDec\libsrc\ffdec_lib\testdata\flashdevelop\src</path-element>
+      <path-element>C:\Dropbox\Programovani\JavaSE\FFDec\libsrc\ffdec_lib\testdata\as3_new\src</path-element>
       <path-element>C:\Program Files (x86)\FlashDevelop\Library\AS3\classes</path-element>
     </source-path>
   </compiler>
   <file-specs>
-    <path-element>C:\Dropbox\Programovani\JavaSE\FFDec\libsrc\ffdec_lib\testdata\flashdevelop\src\Main.as</path-element>
+    <path-element>C:\Dropbox\Programovani\JavaSE\FFDec\libsrc\ffdec_lib\testdata\as3_new\src\Main.as</path-element>
   </file-specs>
   <default-background-color>#FFFFFF</default-background-color>
   <default-frame-rate>30</default-frame-rate>
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/Main.as b/libsrc/ffdec_lib/testdata/as3_new/src/Main.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/Main.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/Main.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestArguments.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestArguments.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestArguments.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestArguments.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestCatchFinally.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestCatchFinally.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestCatchFinally.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestCatchFinally.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestChain2.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestChain2.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestChain2.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestChain2.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestChainedAssignments.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestChainedAssignments.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestChainedAssignments.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestChainedAssignments.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestComplexExpressions.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestComplexExpressions.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestComplexExpressions.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestComplexExpressions.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestContinueLevels.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestContinueLevels.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestContinueLevels.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestContinueLevels.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestDecl2.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestDecl2.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestDecl2.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestDecl2.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestDeclarations.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestDeclarations.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestDeclarations.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestDeclarations.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestDefaultNotLastGrouped.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestDefaultNotLastGrouped.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestDefaultNotLastGrouped.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestDefaultNotLastGrouped.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestDoWhile.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestDoWhile.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestDoWhile.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestDoWhile.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestDoWhile2.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestDoWhile2.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestDoWhile2.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestDoWhile2.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestDoWhile3.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestDoWhile3.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestDoWhile3.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestDoWhile3.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestDotParent.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestDotParent.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestDotParent.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestDotParent.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestExpressions.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestExpressions.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestExpressions.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestExpressions.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestFinallyZeroJump.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestFinallyZeroJump.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestFinallyZeroJump.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestFinallyZeroJump.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestFor.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestFor.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestFor.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestFor.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestForAnd.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestForAnd.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestForAnd.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestForAnd.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestForBreak.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestForBreak.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestForBreak.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestForBreak.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestForContinue.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestForContinue.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestForContinue.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestForContinue.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestForEach.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestForEach.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestForEach.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestForEach.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestForEachObjectArray.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestForEachObjectArray.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestForEachObjectArray.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestForEachObjectArray.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestForEachObjectAttribute.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestForEachObjectAttribute.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestForEachObjectAttribute.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestForEachObjectAttribute.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestForGoto.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestForGoto.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestForGoto.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestForGoto.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestForIn.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestForIn.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestForIn.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestForIn.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestForXml.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestForXml.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestForXml.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestForXml.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestGotos.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestGotos.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestGotos.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestGotos.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestGotos2.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestGotos2.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestGotos2.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestGotos2.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestGotos3.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestGotos3.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestGotos3.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestGotos3.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestGotos4.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestGotos4.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestGotos4.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestGotos4.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestGotos5.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestGotos5.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestGotos5.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestGotos5.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestGotos6.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestGotos6.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestGotos6.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestGotos6.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestGotos7.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestGotos7.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestGotos7.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestGotos7.as
diff --git a/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestHello.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestHello.as
new file mode 100644
index 000000000..14adab912
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestHello.as
@@ -0,0 +1,11 @@
+package tests
+{
+	
+	public class TestHello
+	{
+		public function run():*
+		{
+			trace("hello");
+		}
+	}
+}
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestIf.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestIf.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestIf.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestIf.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestIfElse.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestIfElse.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestIfElse.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestIfElse.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestIfInIf.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestIfInIf.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestIfInIf.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestIfInIf.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestInc2.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestInc2.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestInc2.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestInc2.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestIncDec.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestIncDec.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestIncDec.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestIncDec.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestInlineFunctions.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestInlineFunctions.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestInlineFunctions.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestInlineFunctions.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestInnerFunctions.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestInnerFunctions.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestInnerFunctions.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestInnerFunctions.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestInnerIf.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestInnerIf.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestInnerIf.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestInnerIf.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestInnerTry.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestInnerTry.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestInnerTry.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestInnerTry.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestLogicalComputing.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestLogicalComputing.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestLogicalComputing.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestLogicalComputing.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestManualConvert.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestManualConvert.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestManualConvert.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestManualConvert.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestMissingDefault.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestMissingDefault.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestMissingDefault.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestMissingDefault.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestMultipleCondition.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestMultipleCondition.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestMultipleCondition.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestMultipleCondition.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestNamedAnonFunctions.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestNamedAnonFunctions.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestNamedAnonFunctions.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestNamedAnonFunctions.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestNames.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestNames.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestNames.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestNames.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestOptionalParameters.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestOptionalParameters.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestOptionalParameters.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestOptionalParameters.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestParamNames.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestParamNames.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestParamNames.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestParamNames.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestParamsCount.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestParamsCount.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestParamsCount.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestParamsCount.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestPrecedence.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestPrecedence.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestPrecedence.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestPrecedence.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestPrecedenceX.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestPrecedenceX.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestPrecedenceX.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestPrecedenceX.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestProperty.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestProperty.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestProperty.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestProperty.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestRegExp.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestRegExp.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestRegExp.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestRegExp.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestRest.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestRest.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestRest.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestRest.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestStrictEquals.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestStrictEquals.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestStrictEquals.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestStrictEquals.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestStringConcat.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestStringConcat.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestStringConcat.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestStringConcat.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestStrings.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestStrings.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestStrings.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestStrings.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestSwitch.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestSwitch.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestSwitch.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestSwitch.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestSwitchComma.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestSwitchComma.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestSwitchComma.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestSwitchComma.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestSwitchDefault.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestSwitchDefault.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestSwitchDefault.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestSwitchDefault.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestTernarOperator.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestTernarOperator.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestTernarOperator.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestTernarOperator.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestTry.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestTry.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestTry.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestTry.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestTryReturn.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestTryReturn.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestTryReturn.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestTryReturn.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestTryReturn2.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestTryReturn2.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestTryReturn2.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestTryReturn2.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestUsagesTry.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestUsagesTry.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestUsagesTry.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestUsagesTry.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestVector.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestVector.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestVector.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestVector.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestVector2.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestVector2.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestVector2.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestVector2.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestWhileAnd.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestWhileAnd.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestWhileAnd.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestWhileAnd.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestWhileContinue.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestWhileContinue.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestWhileContinue.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestWhileContinue.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestWhileTry.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestWhileTry.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestWhileTry.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestWhileTry.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestWhileTry2.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestWhileTry2.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestWhileTry2.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestWhileTry2.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestXml.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestXml.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests/TestXml.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests/TestXml.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests_classes/mypackage1/SetupMyPackage1.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests_classes/mypackage1/SetupMyPackage1.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests_classes/mypackage1/SetupMyPackage1.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests_classes/mypackage1/SetupMyPackage1.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests_classes/mypackage1/TestClass.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests_classes/mypackage1/TestClass.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests_classes/mypackage1/TestClass.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests_classes/mypackage1/TestClass.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests_classes/mypackage1/TestClass2.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests_classes/mypackage1/TestClass2.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests_classes/mypackage1/TestClass2.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests_classes/mypackage1/TestClass2.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests_classes/mypackage1/TestInterface.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests_classes/mypackage1/TestInterface.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests_classes/mypackage1/TestInterface.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests_classes/mypackage1/TestInterface.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests_classes/mypackage1/myNamespace.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests_classes/mypackage1/myNamespace.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests_classes/mypackage1/myNamespace.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests_classes/mypackage1/myNamespace.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests_classes/mypackage2/SetupMyPackage2.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests_classes/mypackage2/SetupMyPackage2.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests_classes/mypackage2/SetupMyPackage2.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests_classes/mypackage2/SetupMyPackage2.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests_classes/mypackage2/TestClass.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests_classes/mypackage2/TestClass.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests_classes/mypackage2/TestClass.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests_classes/mypackage2/TestClass.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests_classes/mypackage2/TestInterface.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests_classes/mypackage2/TestInterface.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests_classes/mypackage2/TestInterface.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests_classes/mypackage2/TestInterface.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests_classes/mypackage3/SetupMyPackage3.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests_classes/mypackage3/SetupMyPackage3.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests_classes/mypackage3/SetupMyPackage3.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests_classes/mypackage3/SetupMyPackage3.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests_classes/mypackage3/TestClass.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests_classes/mypackage3/TestClass.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests_classes/mypackage3/TestClass.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests_classes/mypackage3/TestClass.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests_classes/mypackage3/TestInterface.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests_classes/mypackage3/TestInterface.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests_classes/mypackage3/TestInterface.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests_classes/mypackage3/TestInterface.as
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/src/tests_other/myInternal.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests_other/myInternal.as
similarity index 100%
rename from libsrc/ffdec_lib/testdata/flashdevelop/src/tests_other/myInternal.as
rename to libsrc/ffdec_lib/testdata/as3_new/src/tests_other/myInternal.as
diff --git a/libsrc/ffdec_lib/testdata/cross_compile/bin/Main.air.swf b/libsrc/ffdec_lib/testdata/cross_compile/bin/Main.air.swf
deleted file mode 100644
index 32af58436..000000000
Binary files a/libsrc/ffdec_lib/testdata/cross_compile/bin/Main.air.swf and /dev/null differ
diff --git a/libsrc/ffdec_lib/testdata/cross_compile/bin/Main.flex.swf b/libsrc/ffdec_lib/testdata/cross_compile/bin/Main.flex.swf
deleted file mode 100644
index ac746e768..000000000
Binary files a/libsrc/ffdec_lib/testdata/cross_compile/bin/Main.flex.swf and /dev/null differ
diff --git a/libsrc/ffdec_lib/testdata/cross_compile/bin/Main.flex_apache.swf b/libsrc/ffdec_lib/testdata/cross_compile/bin/Main.flex_apache.swf
deleted file mode 100644
index a514cdfd3..000000000
Binary files a/libsrc/ffdec_lib/testdata/cross_compile/bin/Main.flex_apache.swf and /dev/null differ
diff --git a/libsrc/ffdec_lib/testdata/cross_compile/build_air_debug.bat b/libsrc/ffdec_lib/testdata/cross_compile/build_air_debug.bat
deleted file mode 100644
index 232d09b75..000000000
--- a/libsrc/ffdec_lib/testdata/cross_compile/build_air_debug.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-set COMPILERKIND=air
-call c:\air\bin\mxmlc.bat -warnings=false -debug=true -output bin/Main.%COMPILERKIND%.swf src/Main.as 1> buildlog.%COMPILERKIND%.txt 2>&1
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/cross_compile/build_flex_apache_debug.bat b/libsrc/ffdec_lib/testdata/cross_compile/build_flex_apache_debug.bat
deleted file mode 100644
index c7617f10c..000000000
--- a/libsrc/ffdec_lib/testdata/cross_compile/build_flex_apache_debug.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-set COMPILERKIND=flex_apache
-call c:\flex_apache\bin\mxmlc.bat -warnings=false -debug=true -output bin/Main.%COMPILERKIND%.swf src/Main.as 1> buildlog.%COMPILERKIND%.txt 2>&1
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/cross_compile/build_flex_debug.bat b/libsrc/ffdec_lib/testdata/cross_compile/build_flex_debug.bat
deleted file mode 100644
index 76c857b14..000000000
--- a/libsrc/ffdec_lib/testdata/cross_compile/build_flex_debug.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-set COMPILERKIND=flex
-c:\flex\bin\mxmlc.exe -warnings=false -debug=true -output bin/Main.%COMPILERKIND%.swf src/Main.as 1> buildlog.%COMPILERKIND%.txt 2>&1
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/cross_compile/build_stub.bat b/libsrc/ffdec_lib/testdata/cross_compile/build_stub.bat
deleted file mode 100644
index b153e4d13..000000000
--- a/libsrc/ffdec_lib/testdata/cross_compile/build_stub.bat
+++ /dev/null
@@ -1,19 +0,0 @@
-@echo off
-set ISDEBUG=false
-if "%1" == "debug" goto blockset
-goto block2
-:blockset
-set ISDEBUG=true
-:block2
-set COMPILERPATH=%2
-set COMPILERKIND=%3
-rem if not exist %COMPILERPATH% goto notex
-%COMPILERPATH% -warnings=false -debug=%ISDEBUG% -output bin/Main.%COMPILERKIND%.swf src/Main.as > buildlog.%COMPILERKIND%.txt
-if errorlevel==1 goto failed
-goto end
-:notex
-echo Flex/AIR SDK not found. Download and unpack Flex/AIR SDK into some directory and add it to PATH variable
-goto end
-:failed
-pause
-:end
diff --git a/libsrc/ffdec_lib/testdata/cross_compile/build_swftools_debug.bat b/libsrc/ffdec_lib/testdata/cross_compile/build_swftools_debug.bat
deleted file mode 100644
index 2ccf2fb56..000000000
--- a/libsrc/ffdec_lib/testdata/cross_compile/build_swftools_debug.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo off
-set COMPILERKIND=swftools
-cd src
-c:\swftools\as3compile.exe Main.as -o ..\bin\Main.%COMPILERKIND%.swf 1> ../buildlog.%COMPILERKIND%.txt 2>&1
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/custom/run_rabcasm.bat b/libsrc/ffdec_lib/testdata/custom/run_rabcasm.bat
deleted file mode 100644
index fdabc7fdf..000000000
--- a/libsrc/ffdec_lib/testdata/custom/run_rabcasm.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-@echo off
-set RABCDASM_PATH=c:\RABCDasm
-%RABCDASM_PATH%\rabcasm.exe abc\custom-0\custom-0.main.asasm
-%RABCDASM_PATH%\abcreplace.exe bin\custom.swf 0 abc\custom-0\custom-0.main.abc
-pause
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/bin/Main.air.swf b/libsrc/ffdec_lib/testdata/flashdevelop/bin/Main.air.swf
deleted file mode 100644
index f0a441616..000000000
Binary files a/libsrc/ffdec_lib/testdata/flashdevelop/bin/Main.air.swf and /dev/null differ
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/bin/Main.flex.swf b/libsrc/ffdec_lib/testdata/flashdevelop/bin/Main.flex.swf
deleted file mode 100644
index c4bdc2e41..000000000
Binary files a/libsrc/ffdec_lib/testdata/flashdevelop/bin/Main.flex.swf and /dev/null differ
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/build_air_debug.bat b/libsrc/ffdec_lib/testdata/flashdevelop/build_air_debug.bat
deleted file mode 100644
index 232d09b75..000000000
--- a/libsrc/ffdec_lib/testdata/flashdevelop/build_air_debug.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-set COMPILERKIND=air
-call c:\air\bin\mxmlc.bat -warnings=false -debug=true -output bin/Main.%COMPILERKIND%.swf src/Main.as 1> buildlog.%COMPILERKIND%.txt 2>&1
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/testdata/flashdevelop/build_flex_debug.bat b/libsrc/ffdec_lib/testdata/flashdevelop/build_flex_debug.bat
deleted file mode 100644
index 76c857b14..000000000
--- a/libsrc/ffdec_lib/testdata/flashdevelop/build_flex_debug.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-set COMPILERKIND=flex
-c:\flex\bin\mxmlc.exe -warnings=false -debug=true -output bin/Main.%COMPILERKIND%.swf src/Main.as 1> buildlog.%COMPILERKIND%.txt 2>&1
\ No newline at end of file