diff --git a/CHANGELOG.md b/CHANGELOG.md
index 040ea9774..8b8b599de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,10 +22,11 @@ All notable changes to this project will be documented in this file.
 - AS1/2 - Single DoAction tag inside frame is now displayed directly as frame node
   so there is no longer need to expand frame nodes (useful for fast switching scripts)
 - AS1/2 - Scripts from default package (not these inside `__Packages`) are now
-  exported/imported to/from the folder named `__defaultPackage` for all languages
-  instead of localized `<default package>` before.
+  exported/imported to/from main scripts folder instead of localized `<default package>` before.
+  (Only happened when package flattening was on)
   This may break backwards compatibility. For importing scripts from older
-  versions of FFDec, you should rename the folder to the new name.
+  versions of FFDec, you should move the scripts from `<default package>`
+  to main scripts folder.
   
 
 ### Fixed
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
index 9644a00b1..e113748e2 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
@@ -351,8 +351,8 @@ public final class SWF implements SWFContainerItem, Timelined, Openable {
 
     /**
      * Map of characterId to CharacterTag including imported tags. The
-     * CharacterTags.getCharacterId() does not necessarily be the characterId
-     * in the map since there can be imported CharacterTags from other SWFs.
+     * CharacterTags.getCharacterId() does not necessarily be the characterId in
+     * the map since there can be imported CharacterTags from other SWFs.
      */
     @Internal
     private volatile Map<Integer, CharacterTag> charactersWithImported;
@@ -3219,6 +3219,16 @@ public final class SWF implements SWFContainerItem, Timelined, Openable {
         }
         Map<String, ASMSource> asmsToExport = new LinkedHashMap<>();
         for (TreeItem treeItem : getFirstLevelASMNodes(null)) {
+            if (treeItem instanceof AS2Package) {
+                AS2Package pkg = (AS2Package) treeItem;
+                if (pkg.isDefaultPackage()) {
+                    getASMs(exportFileNames, treeItem, nodesToExport, exportAll, asmsToExport,
+                            "",
+                            ""
+                    );
+                    continue;
+                }
+            }
             getASMs(exportFileNames, treeItem, nodesToExport, exportAll, asmsToExport,
                     File.separator + getASMPath(true, treeItem),
                     File.separator + getASMPath(false, treeItem)
@@ -3325,9 +3335,6 @@ public final class SWF implements SWFContainerItem, Timelined, Openable {
 
         if (treeItem instanceof AS2Package) {
             AS2Package pkg = (AS2Package) treeItem;
-            if (pkg.isDefaultPackage() && exportFileName) {
-                return "__defaultPackage";
-            }
             if (pkg.isFlat()) {
                 String[] parts = pkg.toString().split("\\.");
                 for (int i = 0; i < parts.length; i++) {
@@ -5119,7 +5126,7 @@ public final class SWF implements SWFContainerItem, Timelined, Openable {
         setModified(true);
         tags.remove(tag);
         updateCharacters();
-        readOnlyTags = null;        
+        readOnlyTags = null;
     }
 
     /**
@@ -6220,12 +6227,12 @@ public final class SWF implements SWFContainerItem, Timelined, Openable {
         if (CancellableWorker.isInterrupted()) {
             throw new InterruptedException();
         }
-        if (uninitializedAs2ClassTraits == null) {            
+        if (uninitializedAs2ClassTraits == null) {
             calculateAs2UninitializedClassTraits();
         }
         return uninitializedAs2ClassTraits;
     }
-    
+
     public boolean needsCalculatingAS2UninitializeClassTraits(ASMSource src) {
         if (!isAS3()) {
             if (src instanceof DoInitActionTag) {
@@ -6249,9 +6256,10 @@ public final class SWF implements SWFContainerItem, Timelined, Openable {
 
     /**
      * Checks whether SWF was freed
+     *
      * @return True if destroyed
      */
     public boolean isDestroyed() {
         return destroyed;
-    }        
+    }
 }