diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/AppStrings.java b/trunk/src/com/jpexs/decompiler/flash/AppStrings.java
similarity index 92%
rename from trunk/src/com/jpexs/decompiler/flash/gui/AppStrings.java
rename to trunk/src/com/jpexs/decompiler/flash/AppStrings.java
index 5e7c7706e..334e05c11 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/AppStrings.java
+++ b/trunk/src/com/jpexs/decompiler/flash/AppStrings.java
@@ -14,8 +14,9 @@
  *  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 com.jpexs.decompiler.flash.gui.MainFrame;
 import java.util.ResourceBundle;
 
 /**
diff --git a/trunk/src/com/jpexs/decompiler/flash/SWF.java b/trunk/src/com/jpexs/decompiler/flash/SWF.java
index 2cebe99f8..c2af251d0 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.AS2PackageNodeItem;
 import com.jpexs.decompiler.flash.helpers.collections.MyEntry;
 import com.jpexs.decompiler.flash.tags.ABCContainerTag;
 import com.jpexs.decompiler.flash.tags.DefineBinaryDataTag;
@@ -87,6 +86,10 @@ import com.jpexs.decompiler.flash.tags.base.RemoveTag;
 import com.jpexs.decompiler.flash.tags.base.ShapeTag;
 import com.jpexs.decompiler.flash.tags.base.SoundStreamHeadTypeTag;
 import com.jpexs.decompiler.flash.tags.base.TextTag;
+import com.jpexs.decompiler.flash.treeitems.AS2PackageNodeItem;
+import com.jpexs.decompiler.flash.treeitems.AS3PackageNodeItem;
+import com.jpexs.decompiler.flash.treeitems.FrameNodeItem;
+import com.jpexs.decompiler.flash.treeitems.TreeItem;
 import com.jpexs.decompiler.flash.treenodes.AS2PackageNode;
 import com.jpexs.decompiler.flash.treenodes.ContainerNode;
 import com.jpexs.decompiler.flash.treenodes.FrameNode;
diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/ScriptPack.java b/trunk/src/com/jpexs/decompiler/flash/abc/ScriptPack.java
index 5a7d05013..d8abd9e3b 100644
--- a/trunk/src/com/jpexs/decompiler/flash/abc/ScriptPack.java
+++ b/trunk/src/com/jpexs/decompiler/flash/abc/ScriptPack.java
@@ -17,7 +17,6 @@
 package com.jpexs.decompiler.flash.abc;
 
 import com.jpexs.decompiler.flash.SWF;
-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;
@@ -27,6 +26,7 @@ import com.jpexs.decompiler.flash.helpers.FileTextWriter;
 import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
 import com.jpexs.decompiler.flash.helpers.NulWriter;
 import com.jpexs.decompiler.flash.tags.ABCContainerTag;
+import com.jpexs.decompiler.flash.treeitems.TreeElementItem;
 import com.jpexs.decompiler.graph.ExportMode;
 import com.jpexs.helpers.CancellableWorker;
 import com.jpexs.helpers.Helper;
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/Action.java b/trunk/src/com/jpexs/decompiler/flash/action/Action.java
index 7d012c9f4..8c79c4980 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/Action.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/Action.java
@@ -16,6 +16,7 @@
  */
 package com.jpexs.decompiler.flash.action;
 
+import com.jpexs.decompiler.flash.AppStrings;
 import com.jpexs.decompiler.flash.DisassemblyListener;
 import com.jpexs.decompiler.flash.SWF;
 import com.jpexs.decompiler.flash.SWFInputStream;
@@ -47,7 +48,6 @@ import com.jpexs.decompiler.flash.action.swf5.*;
 import com.jpexs.decompiler.flash.action.swf7.ActionDefineFunction2;
 import com.jpexs.decompiler.flash.configuration.Configuration;
 import com.jpexs.decompiler.flash.ecma.Null;
-import com.jpexs.decompiler.flash.gui.AppStrings;
 import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
 import com.jpexs.decompiler.flash.helpers.HilightedTextWriter;
 import com.jpexs.decompiler.flash.helpers.NulWriter;
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/AdvancedSettingsDialog.java b/trunk/src/com/jpexs/decompiler/flash/gui/AdvancedSettingsDialog.java
index a74e99a7c..8447bb575 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/AdvancedSettingsDialog.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/AdvancedSettingsDialog.java
@@ -16,6 +16,7 @@
  */
 package com.jpexs.decompiler.flash.gui;
 
+import com.jpexs.decompiler.flash.AppStrings;
 import com.jpexs.decompiler.flash.configuration.Configuration;
 import com.jpexs.decompiler.flash.configuration.ConfigurationItem;
 import java.lang.reflect.Field;
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/AppDialog.java b/trunk/src/com/jpexs/decompiler/flash/gui/AppDialog.java
index 6081f4e08..e415a1f9b 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/AppDialog.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/AppDialog.java
@@ -16,6 +16,7 @@
  */
 package com.jpexs.decompiler.flash.gui;
 
+import com.jpexs.decompiler.flash.AppStrings;
 import com.jpexs.decompiler.flash.configuration.Configuration;
 import java.util.ResourceBundle;
 import javax.swing.JDialog;
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/AppFrame.java b/trunk/src/com/jpexs/decompiler/flash/gui/AppFrame.java
index 6e75882c4..0a22da26f 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/AppFrame.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/AppFrame.java
@@ -16,6 +16,7 @@
  */
 package com.jpexs.decompiler.flash.gui;
 
+import com.jpexs.decompiler.flash.AppStrings;
 import java.util.ResourceBundle;
 import javax.swing.JFrame;
 
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/AppRibbonFrame.java b/trunk/src/com/jpexs/decompiler/flash/gui/AppRibbonFrame.java
index 28e492ec9..d421ab343 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/AppRibbonFrame.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/AppRibbonFrame.java
@@ -16,6 +16,7 @@
  */
 package com.jpexs.decompiler.flash.gui;
 
+import com.jpexs.decompiler.flash.AppStrings;
 import java.util.ResourceBundle;
 import org.pushingpixels.flamingo.api.ribbon.JRibbonFrame;
 
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/FontEmbedDialog.java b/trunk/src/com/jpexs/decompiler/flash/gui/FontEmbedDialog.java
index 2a79b0a3a..15d5365da 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/FontEmbedDialog.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/FontEmbedDialog.java
@@ -16,6 +16,7 @@
  */
 package com.jpexs.decompiler.flash.gui;
 
+import com.jpexs.decompiler.flash.AppStrings;
 import com.jpexs.decompiler.flash.tags.base.FontTag;
 import com.jpexs.decompiler.flash.tags.font.CharacterRanges;
 import java.awt.Container;
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/GuiAbortRetryIgnoreHandler.java b/trunk/src/com/jpexs/decompiler/flash/gui/GuiAbortRetryIgnoreHandler.java
index 03fb4e5d9..2e1fa3ac5 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/GuiAbortRetryIgnoreHandler.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/GuiAbortRetryIgnoreHandler.java
@@ -17,6 +17,7 @@
 package com.jpexs.decompiler.flash.gui;
 
 import com.jpexs.decompiler.flash.AbortRetryIgnoreHandler;
+import com.jpexs.decompiler.flash.AppStrings;
 import javax.swing.JOptionPane;
 
 /**
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/ImagePanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/ImagePanel.java
index 0aaaf5ce7..5bb5f3e3b 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/ImagePanel.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/ImagePanel.java
@@ -16,6 +16,7 @@
  */
 package com.jpexs.decompiler.flash.gui;
 
+import com.jpexs.decompiler.flash.AppStrings;
 import com.jpexs.decompiler.flash.SWF;
 import com.jpexs.decompiler.flash.gui.player.FlashDisplay;
 import com.jpexs.decompiler.flash.tags.base.CharacterTag;
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/LoadFromCacheFrame.java b/trunk/src/com/jpexs/decompiler/flash/gui/LoadFromCacheFrame.java
index f95fdd002..cf1aab6af 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/LoadFromCacheFrame.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/LoadFromCacheFrame.java
@@ -19,6 +19,7 @@ package com.jpexs.decompiler.flash.gui;
 import com.jpexs.browsers.cache.CacheEntry;
 import com.jpexs.browsers.cache.CacheImplementation;
 import com.jpexs.browsers.cache.CacheReader;
+import com.jpexs.decompiler.flash.AppStrings;
 import com.jpexs.decompiler.flash.configuration.Configuration;
 import com.jpexs.helpers.Helper;
 import com.jpexs.helpers.ReReadableInputStream;
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/LoadFromMemoryFrame.java b/trunk/src/com/jpexs/decompiler/flash/gui/LoadFromMemoryFrame.java
index a67a446ea..d30f01303 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/LoadFromMemoryFrame.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/LoadFromMemoryFrame.java
@@ -16,6 +16,7 @@
  */
 package com.jpexs.decompiler.flash.gui;
 
+import com.jpexs.decompiler.flash.AppStrings;
 import com.jpexs.decompiler.flash.SWF;
 import com.jpexs.decompiler.flash.configuration.Configuration;
 import com.jpexs.helpers.Helper;
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/Main.java b/trunk/src/com/jpexs/decompiler/flash/gui/Main.java
index c0cd4b687..3adbb03af 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/Main.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/Main.java
@@ -16,6 +16,7 @@
  */
 package com.jpexs.decompiler.flash.gui;
 
+import com.jpexs.decompiler.flash.AppStrings;
 import com.jpexs.decompiler.flash.ApplicationInfo;
 import com.jpexs.decompiler.flash.EventListener;
 import com.jpexs.decompiler.flash.SWF;
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/MainPanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/MainPanel.java
index 3aa19224e..f120b8314 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/MainPanel.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/MainPanel.java
@@ -17,11 +17,10 @@
 package com.jpexs.decompiler.flash.gui;
 
 import com.jpexs.decompiler.flash.AbortRetryIgnoreHandler;
+import com.jpexs.decompiler.flash.AppStrings;
 import com.jpexs.decompiler.flash.ApplicationInfo;
-import com.jpexs.decompiler.flash.FrameNodeItem;
 import com.jpexs.decompiler.flash.SWF;
 import com.jpexs.decompiler.flash.SWFOutputStream;
-import com.jpexs.decompiler.flash.TreeItem;
 import com.jpexs.decompiler.flash.abc.ABC;
 import com.jpexs.decompiler.flash.abc.RenameType;
 import com.jpexs.decompiler.flash.abc.ScriptPack;
@@ -34,7 +33,7 @@ import com.jpexs.decompiler.flash.gui.abc.ABCPanel;
 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.treenodes.TreeElement;
 import com.jpexs.decompiler.flash.gui.action.ActionPanel;
 import com.jpexs.decompiler.flash.gui.player.FlashPlayerPanel;
 import com.jpexs.decompiler.flash.gui.player.PlayerControls;
@@ -91,6 +90,8 @@ import com.jpexs.decompiler.flash.tags.base.SoundStreamHeadTypeTag;
 import com.jpexs.decompiler.flash.tags.base.TextTag;
 import com.jpexs.decompiler.flash.tags.gfx.DefineCompactedFont;
 import com.jpexs.decompiler.flash.tags.text.ParseException;
+import com.jpexs.decompiler.flash.treeitems.FrameNodeItem;
+import com.jpexs.decompiler.flash.treeitems.TreeItem;
 import com.jpexs.decompiler.flash.treenodes.SWFRoot;
 import com.jpexs.decompiler.flash.treenodes.TagNode;
 import com.jpexs.decompiler.flash.treenodes.TreeNode;
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/SWFPreviwPanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/SWFPreviwPanel.java
index 0b3f4f496..bae1cf15c 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/SWFPreviwPanel.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/SWFPreviwPanel.java
@@ -16,6 +16,7 @@
  */
 package com.jpexs.decompiler.flash.gui;
 
+import com.jpexs.decompiler.flash.AppStrings;
 import com.jpexs.decompiler.flash.SWF;
 import com.jpexs.decompiler.flash.gui.player.FlashDisplay;
 import com.jpexs.decompiler.flash.gui.player.PlayerControls;
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/SelectLanguageDialog.java b/trunk/src/com/jpexs/decompiler/flash/gui/SelectLanguageDialog.java
index 006a5ad86..43f8f05bb 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/SelectLanguageDialog.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/SelectLanguageDialog.java
@@ -16,6 +16,7 @@
  */
 package com.jpexs.decompiler.flash.gui;
 
+import com.jpexs.decompiler.flash.AppStrings;
 import com.jpexs.decompiler.flash.configuration.Configuration;
 import java.awt.BorderLayout;
 import java.awt.Container;
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/SwfInMemory.java b/trunk/src/com/jpexs/decompiler/flash/gui/SwfInMemory.java
index d40cdfd44..add9f96a6 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/SwfInMemory.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/SwfInMemory.java
@@ -16,6 +16,7 @@
  */
 package com.jpexs.decompiler.flash.gui;
 
+import com.jpexs.decompiler.flash.AppStrings;
 import com.jpexs.helpers.ReReadableInputStream;
 import java.util.ResourceBundle;
 
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/TagTree.java b/trunk/src/com/jpexs/decompiler/flash/gui/TagTree.java
index 7a7868fd0..e7da67426 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/TagTree.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/TagTree.java
@@ -16,11 +16,7 @@
  */
 package com.jpexs.decompiler.flash.gui;
 
-import com.jpexs.decompiler.flash.AS3PackageNodeItem;
-import com.jpexs.decompiler.flash.FrameNodeItem;
 import com.jpexs.decompiler.flash.SWF;
-import com.jpexs.decompiler.flash.TreeElementItem;
-import com.jpexs.decompiler.flash.TreeItem;
 import com.jpexs.decompiler.flash.abc.ScriptPack;
 import com.jpexs.decompiler.flash.tags.DefineBinaryDataTag;
 import com.jpexs.decompiler.flash.tags.DefineBitsJPEG2Tag;
@@ -53,6 +49,11 @@ import com.jpexs.decompiler.flash.tags.SoundStreamHeadTag;
 import com.jpexs.decompiler.flash.tags.Tag;
 import com.jpexs.decompiler.flash.tags.base.ASMSource;
 import com.jpexs.decompiler.flash.tags.gfx.DefineCompactedFont;
+import com.jpexs.decompiler.flash.treeitems.AS2PackageNodeItem;
+import com.jpexs.decompiler.flash.treeitems.AS3PackageNodeItem;
+import com.jpexs.decompiler.flash.treeitems.FrameNodeItem;
+import com.jpexs.decompiler.flash.treeitems.TreeElementItem;
+import com.jpexs.decompiler.flash.treeitems.TreeItem;
 import com.jpexs.decompiler.flash.treenodes.TreeNode;
 import java.awt.Color;
 import java.awt.Component;
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/TagTreeModel.java b/trunk/src/com/jpexs/decompiler/flash/gui/TagTreeModel.java
index e7d0bd923..8e42f6d51 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/TagTreeModel.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/TagTreeModel.java
@@ -16,19 +16,20 @@
  */
 package com.jpexs.decompiler.flash.gui;
 
-import com.jpexs.decompiler.flash.FrameNodeItem;
 import com.jpexs.decompiler.flash.SWF;
-import com.jpexs.decompiler.flash.StringItem;
-import com.jpexs.decompiler.flash.TreeElementItem;
 import com.jpexs.decompiler.flash.gui.abc.ClassesListTreeModel;
-import com.jpexs.decompiler.flash.gui.abc.TreeElement;
+import com.jpexs.decompiler.flash.gui.abc.treenodes.ClassesListNode;
+import com.jpexs.decompiler.flash.gui.abc.treenodes.TreeElement;
 import com.jpexs.decompiler.flash.tags.DefineSpriteTag;
 import com.jpexs.decompiler.flash.tags.ExportAssetsTag;
 import com.jpexs.decompiler.flash.tags.SoundStreamBlockTag;
 import com.jpexs.decompiler.flash.tags.Tag;
 import com.jpexs.decompiler.flash.tags.base.ContainerItem;
 import com.jpexs.decompiler.flash.tags.base.SoundStreamHeadTypeTag;
-import com.jpexs.decompiler.flash.treenodes.ClassesListNode;
+import com.jpexs.decompiler.flash.treeitems.FrameNodeItem;
+import com.jpexs.decompiler.flash.treeitems.StringItem;
+import com.jpexs.decompiler.flash.treeitems.TreeElementItem;
+import com.jpexs.decompiler.flash.treeitems.TreeItem;
 import com.jpexs.decompiler.flash.treenodes.ContainerNode;
 import com.jpexs.decompiler.flash.treenodes.FrameNode;
 import com.jpexs.decompiler.flash.treenodes.SWFRoot;
@@ -210,7 +211,7 @@ public class TagTreeModel implements TreeModel {
         return ret;
     }
 
-    private List<TreeNode> searchTag(TreeElementItem obj, TreeNode parent, List<TreeNode> path) {
+    private List<TreeNode> searchTag(TreeItem obj, TreeNode parent, List<TreeNode> path) {
         List<TreeNode> ret = null;
         int cnt = getChildCount(parent);
         for (int i = 0; i < cnt; i++) {
@@ -244,7 +245,7 @@ public class TagTreeModel implements TreeModel {
         return swfToSwfRoot.get(swf);
     }
 
-    public TreePath getTagPath(TreeElementItem obj) {
+    public TreePath getTagPath(TreeItem obj) {
         List<TreeNode> path = new ArrayList<>();
         path.add(getRoot());
         path = searchTag(obj, getRoot(), path);
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
index 7686307a8..3068f58ad 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
@@ -16,6 +16,7 @@
  */
 package com.jpexs.decompiler.flash.gui.abc;
 
+import com.jpexs.decompiler.flash.AppStrings;
 import com.jpexs.decompiler.flash.SWF;
 import com.jpexs.decompiler.flash.abc.ABC;
 import com.jpexs.decompiler.flash.abc.ClassPath;
@@ -36,7 +37,6 @@ import com.jpexs.decompiler.flash.abc.types.traits.TraitMethodGetterSetter;
 import com.jpexs.decompiler.flash.abc.types.traits.TraitSlotConst;
 import com.jpexs.decompiler.flash.abc.types.traits.Traits;
 import com.jpexs.decompiler.flash.configuration.Configuration;
-import com.jpexs.decompiler.flash.gui.AppStrings;
 import com.jpexs.decompiler.flash.gui.HeaderLabel;
 import com.jpexs.decompiler.flash.gui.Main;
 import com.jpexs.decompiler.flash.gui.MainPanel;
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 aa425bdaf..e6d1d9c96 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/abc/ClassesListTreeModel.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/ClassesListTreeModel.java
@@ -16,14 +16,15 @@
  */
 package com.jpexs.decompiler.flash.gui.abc;
 
+import com.jpexs.decompiler.flash.AppStrings;
 import com.jpexs.decompiler.flash.SWF;
-import com.jpexs.decompiler.flash.TreeElementItem;
 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.abc.treenodes.TreeElement;
 import com.jpexs.decompiler.flash.helpers.collections.MyEntry;
+import com.jpexs.decompiler.flash.treeitems.TreeElementItem;
 import com.jpexs.decompiler.flash.treenodes.TreeNode;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/abc/DecompiledEditorPane.java b/trunk/src/com/jpexs/decompiler/flash/gui/abc/DecompiledEditorPane.java
index 58ded436c..d21bf6aa4 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/abc/DecompiledEditorPane.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/DecompiledEditorPane.java
@@ -16,6 +16,7 @@
  */
 package com.jpexs.decompiler.flash.gui.abc;
 
+import com.jpexs.decompiler.flash.AppStrings;
 import com.jpexs.decompiler.flash.abc.ABC;
 import com.jpexs.decompiler.flash.abc.ScriptPack;
 import com.jpexs.decompiler.flash.abc.avm2.AVM2Code;
@@ -26,7 +27,6 @@ import com.jpexs.decompiler.flash.abc.types.traits.TraitFunction;
 import com.jpexs.decompiler.flash.abc.types.traits.TraitMethodGetterSetter;
 import com.jpexs.decompiler.flash.abc.types.traits.TraitSlotConst;
 import com.jpexs.decompiler.flash.configuration.Configuration;
-import com.jpexs.decompiler.flash.gui.AppStrings;
 import com.jpexs.decompiler.flash.gui.View;
 import com.jpexs.decompiler.flash.helpers.HilightedText;
 import com.jpexs.decompiler.flash.helpers.HilightedTextWriter;
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/abc/DetailPanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/abc/DetailPanel.java
index 7a3a15642..59482b369 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/abc/DetailPanel.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/DetailPanel.java
@@ -16,8 +16,8 @@
  */
 package com.jpexs.decompiler.flash.gui.abc;
 
+import com.jpexs.decompiler.flash.AppStrings;
 import com.jpexs.decompiler.flash.abc.types.traits.Trait;
-import com.jpexs.decompiler.flash.gui.AppStrings;
 import com.jpexs.decompiler.flash.gui.HeaderLabel;
 import com.jpexs.decompiler.flash.gui.View;
 import com.jpexs.helpers.CancellableWorker;
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/abc/DialogMissingSymbolHandler.java b/trunk/src/com/jpexs/decompiler/flash/gui/abc/DialogMissingSymbolHandler.java
index 7956665fd..1724ad8eb 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/abc/DialogMissingSymbolHandler.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/DialogMissingSymbolHandler.java
@@ -16,8 +16,8 @@
  */
 package com.jpexs.decompiler.flash.gui.abc;
 
+import com.jpexs.decompiler.flash.AppStrings;
 import com.jpexs.decompiler.flash.abc.avm2.parser.MissingSymbolHandler;
-import com.jpexs.decompiler.flash.gui.AppStrings;
 import com.jpexs.decompiler.flash.gui.View;
 import javax.swing.JOptionPane;
 
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/abc/MethodCodePanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/abc/MethodCodePanel.java
index cb7b4080c..51178a7f0 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/abc/MethodCodePanel.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/MethodCodePanel.java
@@ -16,11 +16,11 @@
  */
 package com.jpexs.decompiler.flash.gui.abc;
 
+import com.jpexs.decompiler.flash.AppStrings;
 import com.jpexs.decompiler.flash.abc.ABC;
 import com.jpexs.decompiler.flash.abc.avm2.ConstantPool;
 import com.jpexs.decompiler.flash.abc.types.traits.Trait;
 import com.jpexs.decompiler.flash.configuration.Configuration;
-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.graph.ExportMode;
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/abc/NewTraitDialog.java b/trunk/src/com/jpexs/decompiler/flash/gui/abc/NewTraitDialog.java
index 7ad26619c..33efadea0 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/abc/NewTraitDialog.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/NewTraitDialog.java
@@ -16,10 +16,10 @@
  */
 package com.jpexs.decompiler.flash.gui.abc;
 
+import com.jpexs.decompiler.flash.AppStrings;
 import com.jpexs.decompiler.flash.abc.types.Namespace;
 import com.jpexs.decompiler.flash.abc.types.traits.Trait;
 import com.jpexs.decompiler.flash.gui.AppDialog;
-import com.jpexs.decompiler.flash.gui.AppStrings;
 import com.jpexs.decompiler.flash.gui.View;
 import java.awt.BorderLayout;
 import java.awt.Container;
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/abc/SlotConstTraitDetailPanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/abc/SlotConstTraitDetailPanel.java
index a9993dbba..0d8f7b785 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/abc/SlotConstTraitDetailPanel.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/SlotConstTraitDetailPanel.java
@@ -16,12 +16,12 @@
  */
 package com.jpexs.decompiler.flash.gui.abc;
 
+import com.jpexs.decompiler.flash.AppStrings;
 import com.jpexs.decompiler.flash.abc.ABC;
 import com.jpexs.decompiler.flash.abc.avm2.parser.ASM3Parser;
 import com.jpexs.decompiler.flash.abc.avm2.parser.ParseException;
 import com.jpexs.decompiler.flash.abc.types.ValueKind;
 import com.jpexs.decompiler.flash.abc.types.traits.TraitSlotConst;
-import com.jpexs.decompiler.flash.gui.AppStrings;
 import com.jpexs.decompiler.flash.gui.View;
 import com.jpexs.decompiler.flash.helpers.HilightedTextWriter;
 import com.jpexs.decompiler.flash.helpers.hilight.Highlighting;
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/abc/TraitsListItem.java b/trunk/src/com/jpexs/decompiler/flash/gui/abc/TraitsListItem.java
index 42cfa7f96..7c0d7d944 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/abc/TraitsListItem.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/TraitsListItem.java
@@ -16,11 +16,11 @@
  */
 package com.jpexs.decompiler.flash.gui.abc;
 
+import com.jpexs.decompiler.flash.AppStrings;
 import com.jpexs.decompiler.flash.abc.ABC;
 import com.jpexs.decompiler.flash.abc.types.traits.Trait;
 import com.jpexs.decompiler.flash.abc.types.traits.TraitMethodGetterSetter;
 import com.jpexs.decompiler.flash.abc.types.traits.TraitSlotConst;
-import com.jpexs.decompiler.flash.gui.AppStrings;
 import com.jpexs.decompiler.flash.helpers.HilightedTextWriter;
 import com.jpexs.decompiler.flash.helpers.NulWriter;
 import com.jpexs.decompiler.flash.tags.ABCContainerTag;
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 cc447069f..64c75bc56 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/abc/Tree.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/Tree.java
@@ -17,7 +17,8 @@
 package com.jpexs.decompiler.flash.gui.abc;
 
 import com.jpexs.decompiler.flash.abc.ScriptPack;
-import com.jpexs.decompiler.flash.treenodes.AS3PackageNode;
+import com.jpexs.decompiler.flash.gui.abc.treenodes.AS3PackageNode;
+import com.jpexs.decompiler.flash.gui.abc.treenodes.TreeElement;
 import java.util.StringTokenizer;
 
 public class Tree {
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/abc/TreeVisitor.java b/trunk/src/com/jpexs/decompiler/flash/gui/abc/TreeVisitor.java
index a4b546156..33a3f7087 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/abc/TreeVisitor.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/TreeVisitor.java
@@ -16,6 +16,8 @@
  */
 package com.jpexs.decompiler.flash.gui.abc;
 
+import com.jpexs.decompiler.flash.gui.abc.treenodes.TreeElement;
+
 public interface TreeVisitor {
 
     public void onBranch(TreeElement branch);
diff --git a/trunk/src/com/jpexs/decompiler/flash/treenodes/AS3PackageNode.java b/trunk/src/com/jpexs/decompiler/flash/gui/abc/treenodes/AS3PackageNode.java
similarity index 80%
rename from trunk/src/com/jpexs/decompiler/flash/treenodes/AS3PackageNode.java
rename to trunk/src/com/jpexs/decompiler/flash/gui/abc/treenodes/AS3PackageNode.java
index e71953147..8a650a7e7 100644
--- a/trunk/src/com/jpexs/decompiler/flash/treenodes/AS3PackageNode.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/treenodes/AS3PackageNode.java
@@ -14,11 +14,9 @@
  *  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.treenodes;
+package com.jpexs.decompiler.flash.gui.abc.treenodes;
 
-import com.jpexs.decompiler.flash.AS3PackageNodeItem;
-import com.jpexs.decompiler.flash.TreeElementItem;
-import com.jpexs.decompiler.flash.gui.abc.TreeElement;
+import com.jpexs.decompiler.flash.treeitems.AS3PackageNodeItem;
 
 /**
  *
diff --git a/trunk/src/com/jpexs/decompiler/flash/treenodes/ClassesListNode.java b/trunk/src/com/jpexs/decompiler/flash/gui/abc/treenodes/ClassesListNode.java
similarity index 87%
rename from trunk/src/com/jpexs/decompiler/flash/treenodes/ClassesListNode.java
rename to trunk/src/com/jpexs/decompiler/flash/gui/abc/treenodes/ClassesListNode.java
index 2a434deed..7ab22e75d 100644
--- a/trunk/src/com/jpexs/decompiler/flash/treenodes/ClassesListNode.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/treenodes/ClassesListNode.java
@@ -14,9 +14,10 @@
  *  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.treenodes;
+package com.jpexs.decompiler.flash.gui.abc.treenodes;
 
 import com.jpexs.decompiler.flash.gui.abc.ClassesListTreeModel;
+import com.jpexs.decompiler.flash.treenodes.TreeNode;
 
 /**
  *
diff --git a/trunk/src/com/jpexs/decompiler/flash/treenodes/ScriptPackNode.java b/trunk/src/com/jpexs/decompiler/flash/gui/abc/treenodes/ScriptPackNode.java
similarity index 84%
rename from trunk/src/com/jpexs/decompiler/flash/treenodes/ScriptPackNode.java
rename to trunk/src/com/jpexs/decompiler/flash/gui/abc/treenodes/ScriptPackNode.java
index f6deba9c0..42d27467b 100644
--- a/trunk/src/com/jpexs/decompiler/flash/treenodes/ScriptPackNode.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/treenodes/ScriptPackNode.java
@@ -14,11 +14,9 @@
  *  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.treenodes;
+package com.jpexs.decompiler.flash.gui.abc.treenodes;
 
-import com.jpexs.decompiler.flash.TreeElementItem;
 import com.jpexs.decompiler.flash.abc.ScriptPack;
-import com.jpexs.decompiler.flash.gui.abc.TreeElement;
 
 /**
  *
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/abc/TreeElement.java b/trunk/src/com/jpexs/decompiler/flash/gui/abc/treenodes/TreeElement.java
similarity index 87%
rename from trunk/src/com/jpexs/decompiler/flash/gui/abc/TreeElement.java
rename to trunk/src/com/jpexs/decompiler/flash/gui/abc/treenodes/TreeElement.java
index a34bd1f71..55b644f44 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/abc/TreeElement.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/treenodes/TreeElement.java
@@ -14,14 +14,13 @@
  *  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.gui.abc.treenodes;
 
-import com.jpexs.decompiler.flash.AS3PackageNodeItem;
 import com.jpexs.decompiler.flash.SWF;
-import com.jpexs.decompiler.flash.TreeElementItem;
 import com.jpexs.decompiler.flash.abc.ScriptPack;
-import com.jpexs.decompiler.flash.treenodes.AS3PackageNode;
-import com.jpexs.decompiler.flash.treenodes.ScriptPackNode;
+import com.jpexs.decompiler.flash.gui.abc.TreeVisitor;
+import com.jpexs.decompiler.flash.treeitems.AS3PackageNodeItem;
+import com.jpexs.decompiler.flash.treeitems.TreeElementItem;
 import com.jpexs.decompiler.flash.treenodes.TreeNode;
 import java.util.*;
 import javax.swing.tree.TreePath;
@@ -74,7 +73,7 @@ public abstract class TreeElement extends TreeNode {
         return name;
     }
 
-    TreeElement getBranch(String pathElement, SWF swf) {
+    public TreeElement getBranch(String pathElement, SWF swf) {
         TreeElement branch = branches.get(pathElement);
         if (branch == null) {
             branch = new AS3PackageNode(pathElement, path + "." + pathElement, new AS3PackageNodeItem(pathElement, swf), this);
@@ -83,7 +82,7 @@ public abstract class TreeElement extends TreeNode {
         return branch;
     }
 
-    void addLeaf(String pathElement, ScriptPack item) {
+    public void addLeaf(String pathElement, ScriptPack item) {
         ScriptPackNode child = new ScriptPackNode(pathElement, path + "." + pathElement, item, this);
         leafs.put(pathElement, child);
     }
@@ -140,7 +139,7 @@ public abstract class TreeElement extends TreeNode {
         return -1;
     }
 
-    void visitBranches(TreeVisitor visitor) {
+    public void visitBranches(TreeVisitor visitor) {
         Iterator<TreeElement> iter = branches.values().iterator();
         while (iter.hasNext()) {
             TreeElement branch = iter.next();
@@ -150,7 +149,7 @@ public abstract class TreeElement extends TreeNode {
         }
     }
 
-    void visitLeafs(TreeVisitor visitor) {
+    public void visitLeafs(TreeVisitor visitor) {
         Iterator<TreeElement> iter = leafs.values().iterator();
         while (iter.hasNext()) {
             TreeElement leaf = iter.next();
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java
index 91250d5e2..1c5187702 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java
@@ -16,6 +16,7 @@
  */
 package com.jpexs.decompiler.flash.gui.action;
 
+import com.jpexs.decompiler.flash.AppStrings;
 import com.jpexs.decompiler.flash.DisassemblyListener;
 import com.jpexs.decompiler.flash.SWF;
 import com.jpexs.decompiler.flash.action.Action;
@@ -26,7 +27,6 @@ import com.jpexs.decompiler.flash.action.parser.script.ActionScriptParser;
 import com.jpexs.decompiler.flash.action.swf4.ActionPush;
 import com.jpexs.decompiler.flash.action.swf4.ConstantIndex;
 import com.jpexs.decompiler.flash.configuration.Configuration;
-import com.jpexs.decompiler.flash.gui.AppStrings;
 import com.jpexs.decompiler.flash.gui.GraphFrame;
 import com.jpexs.decompiler.flash.gui.HeaderLabel;
 import com.jpexs.decompiler.flash.gui.Main;
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/player/PlayerControls.java b/trunk/src/com/jpexs/decompiler/flash/gui/player/PlayerControls.java
index 726941b93..b7f90fb04 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/player/PlayerControls.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/player/PlayerControls.java
@@ -16,7 +16,7 @@
  */
 package com.jpexs.decompiler.flash.gui.player;
 
-import com.jpexs.decompiler.flash.gui.AppStrings;
+import com.jpexs.decompiler.flash.AppStrings;
 import com.jpexs.decompiler.flash.gui.View;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/base/ASMSource.java b/trunk/src/com/jpexs/decompiler/flash/tags/base/ASMSource.java
index e7a13750a..e6eb237ac 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/base/ASMSource.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/base/ASMSource.java
@@ -17,9 +17,9 @@
 package com.jpexs.decompiler.flash.tags.base;
 
 import com.jpexs.decompiler.flash.DisassemblyListener;
-import com.jpexs.decompiler.flash.TreeElementItem;
 import com.jpexs.decompiler.flash.action.Action;
 import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
+import com.jpexs.decompiler.flash.treeitems.TreeItem;
 import com.jpexs.decompiler.graph.ExportMode;
 import java.util.List;
 
@@ -28,7 +28,7 @@ import java.util.List;
  *
  * @author JPEXS
  */
-public interface ASMSource extends TreeElementItem {
+public interface ASMSource extends TreeItem {
 
     /**
      * Converts actions to ASM source
diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/base/Container.java b/trunk/src/com/jpexs/decompiler/flash/tags/base/Container.java
index 3d5532f6e..54059bcf8 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/base/Container.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/base/Container.java
@@ -16,7 +16,7 @@
  */
 package com.jpexs.decompiler.flash.tags.base;
 
-import com.jpexs.decompiler.flash.TreeElementItem;
+import com.jpexs.decompiler.flash.treeitems.TreeItem;
 import java.util.List;
 
 /**
@@ -24,7 +24,7 @@ import java.util.List;
  *
  * @author JPEXS
  */
-public interface Container extends TreeElementItem {
+public interface Container extends TreeItem {
 
     /**
      * Returns all sub-items
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 5542b7936..55ca4d141 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/base/ContainerItem.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/base/ContainerItem.java
@@ -16,7 +16,7 @@
  */
 package com.jpexs.decompiler.flash.tags.base;
 
-import com.jpexs.decompiler.flash.TreeItem;
+import com.jpexs.decompiler.flash.treeitems.TreeItem;
 
 /**
  * Object which contains other objects
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/AS2PackageNodeItem.java b/trunk/src/com/jpexs/decompiler/flash/treeitems/AS2PackageNodeItem.java
similarity index 90%
rename from trunk/src/com/jpexs/decompiler/flash/gui/AS2PackageNodeItem.java
rename to trunk/src/com/jpexs/decompiler/flash/treeitems/AS2PackageNodeItem.java
index 23924aa2b..6d20b24fe 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/AS2PackageNodeItem.java
+++ b/trunk/src/com/jpexs/decompiler/flash/treeitems/AS2PackageNodeItem.java
@@ -14,10 +14,9 @@
  *  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.treeitems;
 
 import com.jpexs.decompiler.flash.SWF;
-import com.jpexs.decompiler.flash.TreeItem;
 
 /**
  *
diff --git a/trunk/src/com/jpexs/decompiler/flash/AS3PackageNodeItem.java b/trunk/src/com/jpexs/decompiler/flash/treeitems/AS3PackageNodeItem.java
similarity index 89%
rename from trunk/src/com/jpexs/decompiler/flash/AS3PackageNodeItem.java
rename to trunk/src/com/jpexs/decompiler/flash/treeitems/AS3PackageNodeItem.java
index 6e37e995a..64f98108a 100644
--- a/trunk/src/com/jpexs/decompiler/flash/AS3PackageNodeItem.java
+++ b/trunk/src/com/jpexs/decompiler/flash/treeitems/AS3PackageNodeItem.java
@@ -14,7 +14,9 @@
  *  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;
+package com.jpexs.decompiler.flash.treeitems;
+
+import com.jpexs.decompiler.flash.SWF;
 
 /**
  *
diff --git a/trunk/src/com/jpexs/decompiler/flash/FrameNodeItem.java b/trunk/src/com/jpexs/decompiler/flash/treeitems/FrameNodeItem.java
similarity index 90%
rename from trunk/src/com/jpexs/decompiler/flash/FrameNodeItem.java
rename to trunk/src/com/jpexs/decompiler/flash/treeitems/FrameNodeItem.java
index a4c83c6ea..e182be0f6 100644
--- a/trunk/src/com/jpexs/decompiler/flash/FrameNodeItem.java
+++ b/trunk/src/com/jpexs/decompiler/flash/treeitems/FrameNodeItem.java
@@ -14,8 +14,9 @@
  *  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;
+package com.jpexs.decompiler.flash.treeitems;
 
+import com.jpexs.decompiler.flash.SWF;
 import com.jpexs.decompiler.flash.tags.Tag;
 
 /**
diff --git a/trunk/src/com/jpexs/decompiler/flash/StringItem.java b/trunk/src/com/jpexs/decompiler/flash/treeitems/StringItem.java
similarity index 89%
rename from trunk/src/com/jpexs/decompiler/flash/StringItem.java
rename to trunk/src/com/jpexs/decompiler/flash/treeitems/StringItem.java
index e20b89db4..d6cbd38e3 100644
--- a/trunk/src/com/jpexs/decompiler/flash/StringItem.java
+++ b/trunk/src/com/jpexs/decompiler/flash/treeitems/StringItem.java
@@ -14,7 +14,9 @@
  *  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;
+package com.jpexs.decompiler.flash.treeitems;
+
+import com.jpexs.decompiler.flash.SWF;
 
 /**
  *
diff --git a/trunk/src/com/jpexs/decompiler/flash/TreeElementItem.java b/trunk/src/com/jpexs/decompiler/flash/treeitems/TreeElementItem.java
similarity index 91%
rename from trunk/src/com/jpexs/decompiler/flash/TreeElementItem.java
rename to trunk/src/com/jpexs/decompiler/flash/treeitems/TreeElementItem.java
index 4c2d60ae0..39ff76eec 100644
--- a/trunk/src/com/jpexs/decompiler/flash/TreeElementItem.java
+++ b/trunk/src/com/jpexs/decompiler/flash/treeitems/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;
+package com.jpexs.decompiler.flash.treeitems;
 
 /**
  *
diff --git a/trunk/src/com/jpexs/decompiler/flash/TreeItem.java b/trunk/src/com/jpexs/decompiler/flash/treeitems/TreeItem.java
similarity index 87%
rename from trunk/src/com/jpexs/decompiler/flash/TreeItem.java
rename to trunk/src/com/jpexs/decompiler/flash/treeitems/TreeItem.java
index 3f04f59b3..99699c7a4 100644
--- a/trunk/src/com/jpexs/decompiler/flash/TreeItem.java
+++ b/trunk/src/com/jpexs/decompiler/flash/treeitems/TreeItem.java
@@ -14,7 +14,9 @@
  *  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;
+package com.jpexs.decompiler.flash.treeitems;
+
+import com.jpexs.decompiler.flash.SWF;
 
 /**
  *
diff --git a/trunk/src/com/jpexs/decompiler/flash/treenodes/AS2PackageNode.java b/trunk/src/com/jpexs/decompiler/flash/treenodes/AS2PackageNode.java
index 217dda48e..aef96329b 100644
--- a/trunk/src/com/jpexs/decompiler/flash/treenodes/AS2PackageNode.java
+++ b/trunk/src/com/jpexs/decompiler/flash/treenodes/AS2PackageNode.java
@@ -16,7 +16,7 @@
  */
 package com.jpexs.decompiler.flash.treenodes;
 
-import com.jpexs.decompiler.flash.gui.AS2PackageNodeItem;
+import com.jpexs.decompiler.flash.treeitems.AS2PackageNodeItem;
 
 /**
  *
diff --git a/trunk/src/com/jpexs/decompiler/flash/treenodes/FrameNode.java b/trunk/src/com/jpexs/decompiler/flash/treenodes/FrameNode.java
index 827458ebc..1cbc4d061 100644
--- a/trunk/src/com/jpexs/decompiler/flash/treenodes/FrameNode.java
+++ b/trunk/src/com/jpexs/decompiler/flash/treenodes/FrameNode.java
@@ -16,7 +16,7 @@
  */
 package com.jpexs.decompiler.flash.treenodes;
 
-import com.jpexs.decompiler.flash.FrameNodeItem;
+import com.jpexs.decompiler.flash.treeitems.FrameNodeItem;
 
 /**
  *
diff --git a/trunk/src/com/jpexs/decompiler/flash/treenodes/StringNode.java b/trunk/src/com/jpexs/decompiler/flash/treenodes/StringNode.java
index 85dcbe7d5..ca0419efc 100644
--- a/trunk/src/com/jpexs/decompiler/flash/treenodes/StringNode.java
+++ b/trunk/src/com/jpexs/decompiler/flash/treenodes/StringNode.java
@@ -16,7 +16,7 @@
  */
 package com.jpexs.decompiler.flash.treenodes;
 
-import com.jpexs.decompiler.flash.StringItem;
+import com.jpexs.decompiler.flash.treeitems.StringItem;
 
 /**
  *
diff --git a/trunk/src/com/jpexs/decompiler/flash/treenodes/TagTreeRoot.java b/trunk/src/com/jpexs/decompiler/flash/treenodes/TagTreeRoot.java
index 49279bacc..2b1b84e4b 100644
--- a/trunk/src/com/jpexs/decompiler/flash/treenodes/TagTreeRoot.java
+++ b/trunk/src/com/jpexs/decompiler/flash/treenodes/TagTreeRoot.java
@@ -16,7 +16,7 @@
  */
 package com.jpexs.decompiler.flash.treenodes;
 
-import com.jpexs.decompiler.flash.StringItem;
+import com.jpexs.decompiler.flash.treeitems.StringItem;
 
 /**
  *
diff --git a/trunk/src/com/jpexs/decompiler/flash/treenodes/TreeNode.java b/trunk/src/com/jpexs/decompiler/flash/treenodes/TreeNode.java
index a1c6ad7a1..be2628034 100644
--- a/trunk/src/com/jpexs/decompiler/flash/treenodes/TreeNode.java
+++ b/trunk/src/com/jpexs/decompiler/flash/treenodes/TreeNode.java
@@ -16,7 +16,7 @@
  */
 package com.jpexs.decompiler.flash.treenodes;
 
-import com.jpexs.decompiler.flash.TreeItem;
+import com.jpexs.decompiler.flash.treeitems.TreeItem;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/trunk/src/com/jpexs/helpers/Helper.java b/trunk/src/com/jpexs/helpers/Helper.java
index 0743624e1..f56ef1883 100644
--- a/trunk/src/com/jpexs/helpers/Helper.java
+++ b/trunk/src/com/jpexs/helpers/Helper.java
@@ -16,8 +16,8 @@
  */
 package com.jpexs.helpers;
 
+import com.jpexs.decompiler.flash.AppStrings;
 import com.jpexs.decompiler.flash.configuration.Configuration;
-import com.jpexs.decompiler.flash.gui.AppStrings;
 import com.jpexs.decompiler.flash.helpers.Freed;
 import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
 import com.jpexs.decompiler.flash.helpers.HilightedTextWriter;