diff --git a/trunk/src/com/jpexs/decompiler/flash/FrameNode.java b/trunk/src/com/jpexs/decompiler/flash/FrameNode.java
index b47f0f0ab..07fe164e8 100644
--- a/trunk/src/com/jpexs/decompiler/flash/FrameNode.java
+++ b/trunk/src/com/jpexs/decompiler/flash/FrameNode.java
@@ -16,8 +16,6 @@
  */
 package com.jpexs.decompiler.flash;
 
-import com.jpexs.decompiler.flash.gui.abc.TreeElementItem;
-
 /**
  *
  * @author JPEXS
diff --git a/trunk/src/com/jpexs/decompiler/flash/PackageNode.java b/trunk/src/com/jpexs/decompiler/flash/PackageNode.java
index f06f8dbd5..6b58fe78c 100644
--- a/trunk/src/com/jpexs/decompiler/flash/PackageNode.java
+++ b/trunk/src/com/jpexs/decompiler/flash/PackageNode.java
@@ -16,8 +16,6 @@
  */
 package com.jpexs.decompiler.flash;
 
-import com.jpexs.decompiler.flash.gui.abc.TreeElementItem;
-
 /**
  *
  * @author JPEXS
diff --git a/trunk/src/com/jpexs/decompiler/flash/SWF.java b/trunk/src/com/jpexs/decompiler/flash/SWF.java
index 1d2a1f4a6..fc2ca0a1a 100644
--- a/trunk/src/com/jpexs/decompiler/flash/SWF.java
+++ b/trunk/src/com/jpexs/decompiler/flash/SWF.java
@@ -55,7 +55,6 @@ import com.jpexs.decompiler.flash.flv.AUDIODATA;
 import com.jpexs.decompiler.flash.flv.FLVOutputStream;
 import com.jpexs.decompiler.flash.flv.FLVTAG;
 import com.jpexs.decompiler.flash.flv.VIDEODATA;
-import com.jpexs.decompiler.flash.gui.SWFSourceInfo;
 import com.jpexs.decompiler.flash.gui.abc.ClassesListTreeModel;
 import com.jpexs.decompiler.flash.helpers.collections.MyEntry;
 import com.jpexs.decompiler.flash.tags.ABCContainerTag;
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/SWFSourceInfo.java b/trunk/src/com/jpexs/decompiler/flash/SWFSourceInfo.java
similarity index 93%
rename from trunk/src/com/jpexs/decompiler/flash/gui/SWFSourceInfo.java
rename to trunk/src/com/jpexs/decompiler/flash/SWFSourceInfo.java
index 1d5066d6b..a0ca7436a 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/SWFSourceInfo.java
+++ b/trunk/src/com/jpexs/decompiler/flash/SWFSourceInfo.java
@@ -14,7 +14,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.jpexs.decompiler.flash.gui;
+package com.jpexs.decompiler.flash;
 
 import java.io.InputStream;
 
diff --git a/trunk/src/com/jpexs/decompiler/flash/StringNode.java b/trunk/src/com/jpexs/decompiler/flash/StringNode.java
index e5e151ab5..c03d4a418 100644
--- a/trunk/src/com/jpexs/decompiler/flash/StringNode.java
+++ b/trunk/src/com/jpexs/decompiler/flash/StringNode.java
@@ -16,8 +16,6 @@
  */
 package com.jpexs.decompiler.flash;
 
-import com.jpexs.decompiler.flash.gui.abc.TreeElementItem;
-
 /**
  *
  * @author JPEXS
diff --git a/trunk/src/com/jpexs/decompiler/flash/TagNode.java b/trunk/src/com/jpexs/decompiler/flash/TagNode.java
index a5a159803..ee30d8057 100644
--- a/trunk/src/com/jpexs/decompiler/flash/TagNode.java
+++ b/trunk/src/com/jpexs/decompiler/flash/TagNode.java
@@ -18,8 +18,6 @@ package com.jpexs.decompiler.flash;
 
 import com.jpexs.decompiler.flash.action.Action;
 import com.jpexs.decompiler.flash.configuration.Configuration;
-import com.jpexs.decompiler.flash.gui.TreeNode;
-import com.jpexs.decompiler.flash.gui.abc.TreeElementItem;
 import com.jpexs.decompiler.flash.helpers.FileTextWriter;
 import com.jpexs.decompiler.flash.tags.DefineBitsJPEG2Tag;
 import com.jpexs.decompiler.flash.tags.DefineBitsJPEG3Tag;
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/abc/TreeElementItem.java b/trunk/src/com/jpexs/decompiler/flash/TreeElementItem.java
similarity index 91%
rename from trunk/src/com/jpexs/decompiler/flash/gui/abc/TreeElementItem.java
rename to trunk/src/com/jpexs/decompiler/flash/TreeElementItem.java
index e78f5e9df..8e42ba5d4 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/abc/TreeElementItem.java
+++ b/trunk/src/com/jpexs/decompiler/flash/TreeElementItem.java
@@ -14,7 +14,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.jpexs.decompiler.flash.gui.abc;
+package com.jpexs.decompiler.flash;
 
 /**
  *
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/TreeNode.java b/trunk/src/com/jpexs/decompiler/flash/TreeNode.java
similarity index 88%
rename from trunk/src/com/jpexs/decompiler/flash/gui/TreeNode.java
rename to trunk/src/com/jpexs/decompiler/flash/TreeNode.java
index dfa94686b..9122aca40 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/TreeNode.java
+++ b/trunk/src/com/jpexs/decompiler/flash/TreeNode.java
@@ -14,9 +14,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.jpexs.decompiler.flash.gui;
-
-import com.jpexs.decompiler.flash.SWF;
+package com.jpexs.decompiler.flash;
 
 /**
  *
diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/ScriptPack.java b/trunk/src/com/jpexs/decompiler/flash/abc/ScriptPack.java
index 2235b2966..564155484 100644
--- a/trunk/src/com/jpexs/decompiler/flash/abc/ScriptPack.java
+++ b/trunk/src/com/jpexs/decompiler/flash/abc/ScriptPack.java
@@ -16,12 +16,12 @@
  */
 package com.jpexs.decompiler.flash.abc;
 
+import com.jpexs.decompiler.flash.TreeElementItem;
 import com.jpexs.decompiler.flash.abc.types.MethodBody;
 import com.jpexs.decompiler.flash.abc.types.Multiname;
 import com.jpexs.decompiler.flash.abc.types.Namespace;
 import com.jpexs.decompiler.flash.abc.types.traits.Trait;
 import com.jpexs.decompiler.flash.configuration.Configuration;
-import com.jpexs.decompiler.flash.gui.abc.TreeElementItem;
 import com.jpexs.decompiler.flash.helpers.FileTextWriter;
 import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
 import com.jpexs.decompiler.flash.helpers.NulWriter;
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/Main.java b/trunk/src/com/jpexs/decompiler/flash/gui/Main.java
index 581d1eca5..3bb2e2ea9 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/Main.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/Main.java
@@ -19,6 +19,7 @@ package com.jpexs.decompiler.flash.gui;
 import com.jpexs.decompiler.flash.ApplicationInfo;
 import com.jpexs.decompiler.flash.EventListener;
 import com.jpexs.decompiler.flash.SWF;
+import com.jpexs.decompiler.flash.SWFSourceInfo;
 import com.jpexs.decompiler.flash.Version;
 import com.jpexs.decompiler.flash.abc.avm2.AVM2Code;
 import com.jpexs.decompiler.flash.configuration.Configuration;
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java b/trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java
index 3089bf05a..5e0dcded1 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java
@@ -23,6 +23,8 @@ import com.jpexs.decompiler.flash.PackageNode;
 import com.jpexs.decompiler.flash.SWF;
 import com.jpexs.decompiler.flash.SWFOutputStream;
 import com.jpexs.decompiler.flash.TagNode;
+import com.jpexs.decompiler.flash.TreeElementItem;
+import com.jpexs.decompiler.flash.TreeNode;
 import com.jpexs.decompiler.flash.abc.ABC;
 import com.jpexs.decompiler.flash.abc.RenameType;
 import com.jpexs.decompiler.flash.abc.ScriptPack;
@@ -36,7 +38,6 @@ import com.jpexs.decompiler.flash.gui.abc.ClassesListTreeModel;
 import com.jpexs.decompiler.flash.gui.abc.DeobfuscationDialog;
 import com.jpexs.decompiler.flash.gui.abc.LineMarkedEditorPane;
 import com.jpexs.decompiler.flash.gui.abc.TreeElement;
-import com.jpexs.decompiler.flash.gui.abc.TreeElementItem;
 import com.jpexs.decompiler.flash.gui.action.ActionPanel;
 import com.jpexs.decompiler.flash.gui.player.FlashPlayerPanel;
 import com.jpexs.decompiler.flash.gui.player.PlayerControls;
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/SWFRoot.java b/trunk/src/com/jpexs/decompiler/flash/gui/SWFRoot.java
index 6d1f470af..553a2c99f 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/SWFRoot.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/SWFRoot.java
@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.gui;
 
 import com.jpexs.decompiler.flash.SWF;
 import com.jpexs.decompiler.flash.TagNode;
+import com.jpexs.decompiler.flash.TreeNode;
 import java.util.List;
 
 /**
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/TagTreeModel.java b/trunk/src/com/jpexs/decompiler/flash/gui/TagTreeModel.java
index 3994db916..81126002e 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/TagTreeModel.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/TagTreeModel.java
@@ -20,7 +20,7 @@ import com.jpexs.decompiler.flash.FrameNode;
 import com.jpexs.decompiler.flash.SWF;
 import com.jpexs.decompiler.flash.StringNode;
 import com.jpexs.decompiler.flash.TagNode;
-import com.jpexs.decompiler.flash.gui.abc.ABCPanel;
+import com.jpexs.decompiler.flash.TreeNode;
 import com.jpexs.decompiler.flash.gui.abc.ClassesListTreeModel;
 import com.jpexs.decompiler.flash.gui.abc.TreeElement;
 import com.jpexs.decompiler.flash.tags.DefineSpriteTag;
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/TagTreeRoot.java b/trunk/src/com/jpexs/decompiler/flash/gui/TagTreeRoot.java
index 0b99a3526..64182d8ab 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/TagTreeRoot.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/TagTreeRoot.java
@@ -17,6 +17,7 @@
 package com.jpexs.decompiler.flash.gui;
 
 import com.jpexs.decompiler.flash.SWF;
+import com.jpexs.decompiler.flash.TreeNode;
 
 /**
  *
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/abc/ClassesListTree.java b/trunk/src/com/jpexs/decompiler/flash/gui/abc/ClassesListTree.java
index ddd7ba4c2..57a1f009e 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/abc/ClassesListTree.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/ClassesListTree.java
@@ -17,14 +17,12 @@
 package com.jpexs.decompiler.flash.gui.abc;
 
 import com.jpexs.decompiler.flash.SWF;
-import com.jpexs.decompiler.flash.abc.ClassPath;
 import com.jpexs.decompiler.flash.abc.ScriptPack;
 import com.jpexs.decompiler.flash.abc.types.traits.Trait;
 import com.jpexs.decompiler.flash.abc.types.traits.TraitClass;
 import com.jpexs.decompiler.flash.gui.AppStrings;
 import com.jpexs.decompiler.flash.gui.Main;
 import com.jpexs.decompiler.flash.gui.View;
-import com.jpexs.decompiler.flash.helpers.collections.MyEntry;
 import com.jpexs.decompiler.flash.tags.ABCContainerTag;
 import com.jpexs.helpers.CancellableWorker;
 import java.util.ArrayList;
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/abc/ClassesListTreeModel.java b/trunk/src/com/jpexs/decompiler/flash/gui/abc/ClassesListTreeModel.java
index 93387cba8..7fdf0e44f 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/abc/ClassesListTreeModel.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/ClassesListTreeModel.java
@@ -17,12 +17,13 @@
 package com.jpexs.decompiler.flash.gui.abc;
 
 import com.jpexs.decompiler.flash.SWF;
+import com.jpexs.decompiler.flash.TreeElementItem;
+import com.jpexs.decompiler.flash.TreeNode;
 import com.jpexs.decompiler.flash.abc.ClassPath;
 import com.jpexs.decompiler.flash.abc.ScriptPack;
 import com.jpexs.decompiler.flash.abc.types.traits.Trait;
 import com.jpexs.decompiler.flash.abc.types.traits.TraitClass;
 import com.jpexs.decompiler.flash.gui.AppStrings;
-import com.jpexs.decompiler.flash.gui.TreeNode;
 import com.jpexs.decompiler.flash.helpers.collections.MyEntry;
 import java.util.ArrayList;
 import java.util.List;
@@ -84,7 +85,6 @@ public class ClassesListTreeModel implements TreeModel, TreeElementItem {
     private SWF swf;
     private Tree classTree;
     private List<MyEntry<ClassPath, ScriptPack>> list;
-    private String filter;
     private List<TreeModelListener> listeners = new ArrayList<>();
 
     public List<MyEntry<ClassPath, ScriptPack>> getList() {
@@ -110,7 +110,6 @@ public class ClassesListTreeModel implements TreeModel, TreeElementItem {
     }
     
     public final void setFilter(String filter) {
-        this.filter = filter;
         classTree = new Tree(swf);
         for (MyEntry<ClassPath, ScriptPack> item : list) {
             if (filter != null) {
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/abc/Tree.java b/trunk/src/com/jpexs/decompiler/flash/gui/abc/Tree.java
index 1bbd646b3..8e850d055 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/abc/Tree.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/Tree.java
@@ -17,6 +17,7 @@
 package com.jpexs.decompiler.flash.gui.abc;
 
 import com.jpexs.decompiler.flash.SWF;
+import com.jpexs.decompiler.flash.TreeElementItem;
 import java.util.StringTokenizer;
 
 public class Tree {
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/abc/TreeElement.java b/trunk/src/com/jpexs/decompiler/flash/gui/abc/TreeElement.java
index 86a7d8919..e71ff3cfd 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/abc/TreeElement.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/TreeElement.java
@@ -17,7 +17,8 @@
 package com.jpexs.decompiler.flash.gui.abc;
 
 import com.jpexs.decompiler.flash.SWF;
-import com.jpexs.decompiler.flash.gui.TreeNode;
+import com.jpexs.decompiler.flash.TreeElementItem;
+import com.jpexs.decompiler.flash.TreeNode;
 import java.util.*;
 import javax.swing.tree.TreePath;
 
diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/base/ContainerItem.java b/trunk/src/com/jpexs/decompiler/flash/tags/base/ContainerItem.java
index e0e8ceab2..f1d635626 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/base/ContainerItem.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/base/ContainerItem.java
@@ -17,7 +17,7 @@
 package com.jpexs.decompiler.flash.tags.base;
 
 import com.jpexs.decompiler.flash.SWF;
-import com.jpexs.decompiler.flash.gui.abc.TreeElementItem;
+import com.jpexs.decompiler.flash.TreeElementItem;
 
 /**
  * Object which contains other objects