diff --git a/src/unitinfo/core/EditorTool.java b/src/unitinfo/core/EditorTool.java
index 15fff2c..cfa6c30 100644
--- a/src/unitinfo/core/EditorTool.java
+++ b/src/unitinfo/core/EditorTool.java
@@ -12,10 +12,10 @@ import mindustry.content.Blocks;
 import mindustry.game.Team;
 import mindustry.world.Block;
 import mindustry.world.Tile;
-import unitinfo.ui.windows.*;
+import unitinfo.ui.window.*;
 
-import static unitinfo.ui.windows.MapEditorWindow.*;
-import static unitinfo.ui.windows.Windows.editorTable;
+import static unitinfo.ui.window.MapEditorWindow.*;
+import static unitinfo.ui.window.Windows.editorTable;
 import static mindustry.Vars.world;
 
 public enum EditorTool{
diff --git a/src/unitinfo/core/Main.java b/src/unitinfo/core/Main.java
index e8d760e..8a75c15 100644
--- a/src/unitinfo/core/Main.java
+++ b/src/unitinfo/core/Main.java
@@ -3,7 +3,7 @@ package unitinfo.core;
 import arc.input.KeyCode;
 import unitinfo.ui.*;
 import unitinfo.ui.draws.OverDraws;
-import unitinfo.ui.windows.*;
+import unitinfo.ui.window.*;
 import arc.*;
 import mindustry.*;
 import mindustry.game.EventType.*;
diff --git a/src/unitinfo/ui/WindowManager.java b/src/unitinfo/ui/WindowManager.java
index 7c5b9a5..451d881 100644
--- a/src/unitinfo/ui/WindowManager.java
+++ b/src/unitinfo/ui/WindowManager.java
@@ -5,7 +5,7 @@ import arc.struct.*;
 import arc.util.*;
 import mindustry.*;
 import mindustry.ui.*;
-import unitinfo.ui.windows.Window;
+import unitinfo.ui.window.Window;
 
 public class WindowManager {
     public static Seq<Window> windows = new Seq<>();
diff --git a/src/unitinfo/ui/windows/CoreWindow.java b/src/unitinfo/ui/window/CoreWindow.java
similarity index 99%
rename from src/unitinfo/ui/windows/CoreWindow.java
rename to src/unitinfo/ui/window/CoreWindow.java
index 72635e3..950e0fc 100644
--- a/src/unitinfo/ui/windows/CoreWindow.java
+++ b/src/unitinfo/ui/window/CoreWindow.java
@@ -1,4 +1,4 @@
-package unitinfo.ui.windows;
+package unitinfo.ui.window;
 
 import arc.Events;
 import mindustry.game.EventType;
diff --git a/src/unitinfo/ui/windows/MapEditorWindow.java b/src/unitinfo/ui/window/MapEditorWindow.java
similarity index 99%
rename from src/unitinfo/ui/windows/MapEditorWindow.java
rename to src/unitinfo/ui/window/MapEditorWindow.java
index 6cbcb4f..1db41e2 100644
--- a/src/unitinfo/ui/windows/MapEditorWindow.java
+++ b/src/unitinfo/ui/window/MapEditorWindow.java
@@ -1,4 +1,4 @@
-package unitinfo.ui.windows;
+package unitinfo.ui.window;
 
 import arc.Events;
 import arc.graphics.g2d.*;
diff --git a/src/unitinfo/ui/windows/PlayerWindow.java b/src/unitinfo/ui/window/PlayerWindow.java
similarity index 99%
rename from src/unitinfo/ui/windows/PlayerWindow.java
rename to src/unitinfo/ui/window/PlayerWindow.java
index c492c4a..da6ef24 100644
--- a/src/unitinfo/ui/windows/PlayerWindow.java
+++ b/src/unitinfo/ui/window/PlayerWindow.java
@@ -1,4 +1,4 @@
-package unitinfo.ui.windows;
+package unitinfo.ui.window;
 
 import unitinfo.ui.OverScrollPane;
 import unitinfo.ui.Updatable;
diff --git a/src/unitinfo/ui/windows/ToolWindow.java b/src/unitinfo/ui/window/ToolWindow.java
similarity index 98%
rename from src/unitinfo/ui/windows/ToolWindow.java
rename to src/unitinfo/ui/window/ToolWindow.java
index 3d4381d..3ac44c7 100644
--- a/src/unitinfo/ui/windows/ToolWindow.java
+++ b/src/unitinfo/ui/window/ToolWindow.java
@@ -1,4 +1,4 @@
-package unitinfo.ui.windows;
+package unitinfo.ui.window;
 
 import unitinfo.ui.OverScrollPane;
 import unitinfo.ui.Updatable;
diff --git a/src/unitinfo/ui/windows/UnitWindow.java b/src/unitinfo/ui/window/UnitWindow.java
similarity index 99%
rename from src/unitinfo/ui/windows/UnitWindow.java
rename to src/unitinfo/ui/window/UnitWindow.java
index 42db370..a4f15f9 100644
--- a/src/unitinfo/ui/windows/UnitWindow.java
+++ b/src/unitinfo/ui/window/UnitWindow.java
@@ -1,4 +1,4 @@
-package unitinfo.ui.windows;
+package unitinfo.ui.window;
 
 import unitinfo.core.*;
 import unitinfo.ui.*;
diff --git a/src/unitinfo/ui/windows/WaveWindow.java b/src/unitinfo/ui/window/WaveWindow.java
similarity index 99%
rename from src/unitinfo/ui/windows/WaveWindow.java
rename to src/unitinfo/ui/window/WaveWindow.java
index 301126d..6db86cb 100644
--- a/src/unitinfo/ui/windows/WaveWindow.java
+++ b/src/unitinfo/ui/window/WaveWindow.java
@@ -1,7 +1,6 @@
-package unitinfo.ui.windows;
+package unitinfo.ui.window;
 
 import mindustry.Vars;
-import mindustry.game.Team;
 import mindustry.type.UnitType;
 import unitinfo.ui.OverScrollPane;
 import arc.Events;
diff --git a/src/unitinfo/ui/windows/Window.java b/src/unitinfo/ui/window/Window.java
similarity index 99%
rename from src/unitinfo/ui/windows/Window.java
rename to src/unitinfo/ui/window/Window.java
index fe14e4c..ea65c33 100644
--- a/src/unitinfo/ui/windows/Window.java
+++ b/src/unitinfo/ui/window/Window.java
@@ -1,4 +1,4 @@
-package unitinfo.ui.windows;
+package unitinfo.ui.window;
 
 import arc.*;
 import arc.func.*;
diff --git a/src/unitinfo/ui/windows/Windows.java b/src/unitinfo/ui/window/Windows.java
similarity index 90%
rename from src/unitinfo/ui/windows/Windows.java
rename to src/unitinfo/ui/window/Windows.java
index 95f4630..739250c 100644
--- a/src/unitinfo/ui/windows/Windows.java
+++ b/src/unitinfo/ui/window/Windows.java
@@ -1,4 +1,4 @@
-package unitinfo.ui.windows;
+package unitinfo.ui.window;
 
 public class Windows {
     public static MapEditorWindow editorTable;