diff --git a/src/UnitInfo/core/HudUi.java b/src/UnitInfo/core/HudUi.java
index 9c48b10..52156ed 100644
--- a/src/UnitInfo/core/HudUi.java
+++ b/src/UnitInfo/core/HudUi.java
@@ -2,6 +2,10 @@ package UnitInfo.core;
 
 import UnitInfo.ui.*;
 
+import UnitInfo.ui.windows.CoreDisplay;
+import UnitInfo.ui.windows.CoresItemsDisplay;
+import UnitInfo.ui.windows.SchemDisplay;
+import UnitInfo.ui.windows.WaveDisplay;
 import arc.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
diff --git a/src/UnitInfo/core/Main.java b/src/UnitInfo/core/Main.java
index a9d37fc..a5e6173 100644
--- a/src/UnitInfo/core/Main.java
+++ b/src/UnitInfo/core/Main.java
@@ -3,8 +3,6 @@ package UnitInfo.core;
 import UnitInfo.shaders.*;
 import UnitInfo.ui.HUDFragment;
 import UnitInfo.ui.MindowsTex;
-import UnitInfo.ui.UnitDisplay;
-import UnitInfo.ui.WindowTables;
 import arc.*;
 import mindustry.*;
 import mindustry.game.EventType.*;
diff --git a/src/UnitInfo/ui/HUDFragment.java b/src/UnitInfo/ui/HUDFragment.java
index 9bfd486..a2a8b5d 100644
--- a/src/UnitInfo/ui/HUDFragment.java
+++ b/src/UnitInfo/ui/HUDFragment.java
@@ -3,7 +3,7 @@ package UnitInfo.ui;
 import arc.scene.*;
 import mindustry.ui.fragments.*;
 
-import static UnitInfo.ui.WindowTables.unitTable;
+import static UnitInfo.ui.windows.WindowTables.unitTable;
 
 public class HUDFragment extends Fragment{
     @Override
diff --git a/src/UnitInfo/ui/TaskbarTable.java b/src/UnitInfo/ui/TaskbarTable.java
index 597f7dc..5d2ae44 100644
--- a/src/UnitInfo/ui/TaskbarTable.java
+++ b/src/UnitInfo/ui/TaskbarTable.java
@@ -1,5 +1,6 @@
 package UnitInfo.ui;
 
+import UnitInfo.ui.windows.WindowTable;
 import arc.func.*;
 import arc.scene.ui.layout.*;
 import mindustry.*;
diff --git a/src/UnitInfo/ui/UnitDisplay.java b/src/UnitInfo/ui/UnitDisplay.java
index 370bf6a..7cb6688 100644
--- a/src/UnitInfo/ui/UnitDisplay.java
+++ b/src/UnitInfo/ui/UnitDisplay.java
@@ -2,6 +2,7 @@ package UnitInfo.ui;
 
 import UnitInfo.SVars;
 import UnitInfo.core.BarInfo;
+import UnitInfo.ui.windows.WindowTable;
 import arc.Core;
 import arc.func.Prov;
 import arc.graphics.Color;
@@ -12,8 +13,6 @@ import arc.math.geom.Rect;
 import arc.math.geom.Vec2;
 import arc.math.geom.Vec3;
 import arc.scene.Element;
-import arc.scene.actions.Actions;
-import arc.scene.event.Touchable;
 import arc.scene.style.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
diff --git a/src/UnitInfo/ui/CoreDisplay.java b/src/UnitInfo/ui/windows/CoreDisplay.java
similarity index 97%
rename from src/UnitInfo/ui/CoreDisplay.java
rename to src/UnitInfo/ui/windows/CoreDisplay.java
index b563e21..2ad31b5 100644
--- a/src/UnitInfo/ui/CoreDisplay.java
+++ b/src/UnitInfo/ui/windows/CoreDisplay.java
@@ -1,7 +1,6 @@
-package UnitInfo.ui;
+package UnitInfo.ui.windows;
 
 import UnitInfo.SVars;
-import arc.graphics.g2d.NinePatch;
 import arc.scene.Element;
 import arc.scene.style.*;
 import arc.scene.ui.ScrollPane;
diff --git a/src/UnitInfo/ui/CoresItemsDisplay.java b/src/UnitInfo/ui/windows/CoresItemsDisplay.java
similarity index 98%
rename from src/UnitInfo/ui/CoresItemsDisplay.java
rename to src/UnitInfo/ui/windows/CoresItemsDisplay.java
index 19329e2..a5652cd 100644
--- a/src/UnitInfo/ui/CoresItemsDisplay.java
+++ b/src/UnitInfo/ui/windows/CoresItemsDisplay.java
@@ -1,5 +1,6 @@
-package UnitInfo.ui;
+package UnitInfo.ui.windows;
 
+import UnitInfo.ui.SBar;
 import arc.Core;
 import arc.graphics.Color;
 import arc.math.Mathf;
@@ -31,9 +32,9 @@ public class CoresItemsDisplay {
     static final ObjectMap<Team, Seq<ItemStack>> updateItems = new ObjectMap<>();
     static final ObjectIntMap<Team> coreAmount = new ObjectIntMap<>();
     static CoreBlock.CoreBuild core;
-    static Seq<Table> tables = new Seq<>();
+    public static Seq<Table> tables = new Seq<>();
 
-    static Team[] teams;
+    public static Team[] teams;
     static float heat;
 
     public CoresItemsDisplay() {
diff --git a/src/UnitInfo/ui/SchemDisplay.java b/src/UnitInfo/ui/windows/SchemDisplay.java
similarity index 99%
rename from src/UnitInfo/ui/SchemDisplay.java
rename to src/UnitInfo/ui/windows/SchemDisplay.java
index 159d0ab..244b437 100644
--- a/src/UnitInfo/ui/SchemDisplay.java
+++ b/src/UnitInfo/ui/windows/SchemDisplay.java
@@ -1,4 +1,4 @@
-package UnitInfo.ui;
+package UnitInfo.ui.windows;
 
 import UnitInfo.SUtils;
 import arc.Core;
diff --git a/src/UnitInfo/ui/WaveDisplay.java b/src/UnitInfo/ui/windows/WaveDisplay.java
similarity index 99%
rename from src/UnitInfo/ui/WaveDisplay.java
rename to src/UnitInfo/ui/windows/WaveDisplay.java
index 5b1901d..eb3fbcd 100644
--- a/src/UnitInfo/ui/WaveDisplay.java
+++ b/src/UnitInfo/ui/windows/WaveDisplay.java
@@ -1,4 +1,4 @@
-package UnitInfo.ui;
+package UnitInfo.ui.windows;
 
 import UnitInfo.SVars;
 import arc.graphics.Color;
diff --git a/src/UnitInfo/ui/WindowTable.java b/src/UnitInfo/ui/windows/WindowTable.java
similarity index 99%
rename from src/UnitInfo/ui/WindowTable.java
rename to src/UnitInfo/ui/windows/WindowTable.java
index ea6a723..4a9ad1c 100644
--- a/src/UnitInfo/ui/WindowTable.java
+++ b/src/UnitInfo/ui/windows/WindowTable.java
@@ -1,4 +1,4 @@
-package UnitInfo.ui;
+package UnitInfo.ui.windows;
 
 import arc.func.*;
 import arc.input.*;
diff --git a/src/UnitInfo/ui/WindowTables.java b/src/UnitInfo/ui/windows/WindowTables.java
similarity index 59%
rename from src/UnitInfo/ui/WindowTables.java
rename to src/UnitInfo/ui/windows/WindowTables.java
index afadbdc..6fc10c3 100644
--- a/src/UnitInfo/ui/WindowTables.java
+++ b/src/UnitInfo/ui/windows/WindowTables.java
@@ -1,4 +1,6 @@
-package UnitInfo.ui;
+package UnitInfo.ui.windows;
+
+import UnitInfo.ui.UnitDisplay;
 
 public class WindowTables {
     public static WindowTable unitTable = new UnitDisplay();