diff --git a/app/src/main/java/ru/project/App.java b/app/src/main/java/ru/project/App.java
index fa4ee64..73f5efa 100644
--- a/app/src/main/java/ru/project/App.java
+++ b/app/src/main/java/ru/project/App.java
@@ -4,7 +4,7 @@ import com.googlecode.lanterna.gui2.MultiWindowTextGUI;
 import com.googlecode.lanterna.screen.Screen;
 import com.googlecode.lanterna.terminal.DefaultTerminalFactory;
 import ru.project.model.AppState;
-import ru.project.ui.menu.MainMenu;
+import ru.project.ui.main.MainMenu;
 
 public final class App {
 
diff --git a/app/src/main/java/ru/project/ui/window/CollectionDisplayWindow.java b/app/src/main/java/ru/project/ui/common/CollectionDisplayWindow.java
similarity index 98%
rename from app/src/main/java/ru/project/ui/window/CollectionDisplayWindow.java
rename to app/src/main/java/ru/project/ui/common/CollectionDisplayWindow.java
index f5da901..1d71808 100644
--- a/app/src/main/java/ru/project/ui/window/CollectionDisplayWindow.java
+++ b/app/src/main/java/ru/project/ui/common/CollectionDisplayWindow.java
@@ -1,4 +1,4 @@
-package ru.project.ui.window;
+package ru.project.ui.common;
 
 import com.googlecode.lanterna.TerminalSize;
 import com.googlecode.lanterna.gui2.Button;
diff --git a/app/src/main/java/ru/project/ui/window/InputValueWindow.java b/app/src/main/java/ru/project/ui/common/InputValueWindow.java
similarity index 97%
rename from app/src/main/java/ru/project/ui/window/InputValueWindow.java
rename to app/src/main/java/ru/project/ui/common/InputValueWindow.java
index dc16dbb..f3e3200 100644
--- a/app/src/main/java/ru/project/ui/window/InputValueWindow.java
+++ b/app/src/main/java/ru/project/ui/common/InputValueWindow.java
@@ -1,4 +1,4 @@
-package ru.project.ui.window;
+package ru.project.ui.common;
 
 import com.googlecode.lanterna.gui2.Button;
 import com.googlecode.lanterna.gui2.Label;
diff --git a/app/src/main/java/ru/project/ui/window/MessageWindow.java b/app/src/main/java/ru/project/ui/common/MessageWindow.java
similarity index 96%
rename from app/src/main/java/ru/project/ui/window/MessageWindow.java
rename to app/src/main/java/ru/project/ui/common/MessageWindow.java
index 76ad9a1..3f1905f 100644
--- a/app/src/main/java/ru/project/ui/window/MessageWindow.java
+++ b/app/src/main/java/ru/project/ui/common/MessageWindow.java
@@ -1,4 +1,4 @@
-package ru.project.ui.window;
+package ru.project.ui.common;
 
 import com.googlecode.lanterna.gui2.Button;
 import com.googlecode.lanterna.gui2.Label;
diff --git a/app/src/main/java/ru/project/ui/menu/CreateCollectionMenu.java b/app/src/main/java/ru/project/ui/creation/CreateCollectionMenu.java
similarity index 96%
rename from app/src/main/java/ru/project/ui/menu/CreateCollectionMenu.java
rename to app/src/main/java/ru/project/ui/creation/CreateCollectionMenu.java
index dd9785a..72820be 100644
--- a/app/src/main/java/ru/project/ui/menu/CreateCollectionMenu.java
+++ b/app/src/main/java/ru/project/ui/creation/CreateCollectionMenu.java
@@ -1,4 +1,4 @@
-package ru.project.ui.menu;
+package ru.project.ui.creation;
 
 import com.googlecode.lanterna.gui2.Button;
 import com.googlecode.lanterna.gui2.Label;
@@ -8,12 +8,10 @@ import com.googlecode.lanterna.gui2.WindowBasedTextGUI;
 import ru.project.collection.MyLinkedList;
 import ru.project.collection.MyList;
 import ru.project.model.AppState;
-import ru.project.model.FillMethod;
 import ru.project.student.Student;
 import ru.project.ui.base.BaseModalWindow;
-import ru.project.ui.window.CustomDataSettingsWindow;
-import ru.project.ui.window.InputValueWindow;
-import ru.project.ui.window.MessageWindow;
+import ru.project.ui.common.InputValueWindow;
+import ru.project.ui.common.MessageWindow;
 
 public class CreateCollectionMenu extends BaseModalWindow {
 
diff --git a/app/src/main/java/ru/project/ui/window/CustomDataSettingsWindow.java b/app/src/main/java/ru/project/ui/creation/CustomDataSettingsWindow.java
similarity index 98%
rename from app/src/main/java/ru/project/ui/window/CustomDataSettingsWindow.java
rename to app/src/main/java/ru/project/ui/creation/CustomDataSettingsWindow.java
index 377b417..5f0aa10 100644
--- a/app/src/main/java/ru/project/ui/window/CustomDataSettingsWindow.java
+++ b/app/src/main/java/ru/project/ui/creation/CustomDataSettingsWindow.java
@@ -1,4 +1,4 @@
-package ru.project.ui.window;
+package ru.project.ui.creation;
 
 import com.googlecode.lanterna.gui2.Button;
 import com.googlecode.lanterna.gui2.Label;
@@ -12,6 +12,9 @@ import ru.project.model.AppState;
 import ru.project.student.Student;
 import ru.project.student.StudentBuilder;
 import ru.project.ui.base.BaseModalWindow;
+import ru.project.ui.common.CollectionDisplayWindow;
+import ru.project.ui.common.InputValueWindow;
+import ru.project.ui.common.MessageWindow;
 
 public class CustomDataSettingsWindow extends BaseModalWindow {
 
diff --git a/app/src/main/java/ru/project/model/FillMethod.java b/app/src/main/java/ru/project/ui/creation/FillMethod.java
similarity index 63%
rename from app/src/main/java/ru/project/model/FillMethod.java
rename to app/src/main/java/ru/project/ui/creation/FillMethod.java
index df682af..28567fe 100644
--- a/app/src/main/java/ru/project/model/FillMethod.java
+++ b/app/src/main/java/ru/project/ui/creation/FillMethod.java
@@ -1,4 +1,4 @@
-package ru.project.model;
+package ru.project.ui.creation;
 
 public enum FillMethod {
   CUSTOM,
diff --git a/app/src/main/java/ru/project/ui/menu/FillMethodSelectionWindow.java b/app/src/main/java/ru/project/ui/creation/FillMethodSelectionWindow.java
similarity index 94%
rename from app/src/main/java/ru/project/ui/menu/FillMethodSelectionWindow.java
rename to app/src/main/java/ru/project/ui/creation/FillMethodSelectionWindow.java
index f408210..9cf0fc7 100644
--- a/app/src/main/java/ru/project/ui/menu/FillMethodSelectionWindow.java
+++ b/app/src/main/java/ru/project/ui/creation/FillMethodSelectionWindow.java
@@ -1,9 +1,8 @@
-package ru.project.ui.menu;
+package ru.project.ui.creation;
 
 import com.googlecode.lanterna.gui2.ActionListBox;
 import com.googlecode.lanterna.gui2.WindowBasedTextGUI;
 import java.util.function.Consumer;
-import ru.project.model.FillMethod;
 import ru.project.ui.base.BaseModalWindow;
 
 public class FillMethodSelectionWindow extends BaseModalWindow {
diff --git a/app/src/main/java/ru/project/ui/menu/MainMenu.java b/app/src/main/java/ru/project/ui/main/MainMenu.java
similarity index 91%
rename from app/src/main/java/ru/project/ui/menu/MainMenu.java
rename to app/src/main/java/ru/project/ui/main/MainMenu.java
index 32999d7..ff4899e 100644
--- a/app/src/main/java/ru/project/ui/menu/MainMenu.java
+++ b/app/src/main/java/ru/project/ui/main/MainMenu.java
@@ -1,4 +1,4 @@
-package ru.project.ui.menu;
+package ru.project.ui.main;
 
 import com.googlecode.lanterna.gui2.ActionListBox;
 import com.googlecode.lanterna.gui2.WindowBasedTextGUI;
@@ -6,8 +6,10 @@ import ru.project.collection.MyList;
 import ru.project.model.AppState;
 import ru.project.student.Student;
 import ru.project.ui.base.BaseModalWindow;
-import ru.project.ui.window.CollectionDisplayWindow;
-import ru.project.ui.window.MessageWindow;
+import ru.project.ui.common.CollectionDisplayWindow;
+import ru.project.ui.common.MessageWindow;
+import ru.project.ui.creation.CreateCollectionMenu;
+import ru.project.ui.sorting.SortCollectionMenu;
 
 public class MainMenu extends BaseModalWindow {
 
diff --git a/app/src/main/java/ru/project/ui/window/NormalSortSettingsWindow.java b/app/src/main/java/ru/project/ui/sorting/NormalSortSettingsWindow.java
similarity index 95%
rename from app/src/main/java/ru/project/ui/window/NormalSortSettingsWindow.java
rename to app/src/main/java/ru/project/ui/sorting/NormalSortSettingsWindow.java
index 5b6221b..0f3bbd2 100644
--- a/app/src/main/java/ru/project/ui/window/NormalSortSettingsWindow.java
+++ b/app/src/main/java/ru/project/ui/sorting/NormalSortSettingsWindow.java
@@ -1,4 +1,4 @@
-package ru.project.ui.window;
+package ru.project.ui.sorting;
 
 import com.googlecode.lanterna.gui2.ActionListBox;
 import com.googlecode.lanterna.gui2.Button;
@@ -6,7 +6,6 @@ import com.googlecode.lanterna.gui2.LinearLayout;
 import com.googlecode.lanterna.gui2.Panel;
 import com.googlecode.lanterna.gui2.WindowBasedTextGUI;
 import java.util.function.Consumer;
-import ru.project.model.SortField;
 import ru.project.ui.base.BaseModalWindow;
 
 public class NormalSortSettingsWindow extends BaseModalWindow {
diff --git a/app/src/main/java/ru/project/ui/window/ParitySortSettingsWindow.java b/app/src/main/java/ru/project/ui/sorting/ParitySortSettingsWindow.java
similarity index 96%
rename from app/src/main/java/ru/project/ui/window/ParitySortSettingsWindow.java
rename to app/src/main/java/ru/project/ui/sorting/ParitySortSettingsWindow.java
index 1f8db08..aa6d090 100644
--- a/app/src/main/java/ru/project/ui/window/ParitySortSettingsWindow.java
+++ b/app/src/main/java/ru/project/ui/sorting/ParitySortSettingsWindow.java
@@ -1,4 +1,4 @@
-package ru.project.ui.window;
+package ru.project.ui.sorting;
 
 import com.googlecode.lanterna.gui2.Button;
 import com.googlecode.lanterna.gui2.Label;
diff --git a/app/src/main/java/ru/project/ui/menu/SortCollectionMenu.java b/app/src/main/java/ru/project/ui/sorting/SortCollectionMenu.java
similarity index 92%
rename from app/src/main/java/ru/project/ui/menu/SortCollectionMenu.java
rename to app/src/main/java/ru/project/ui/sorting/SortCollectionMenu.java
index 577655a..ae72b4b 100644
--- a/app/src/main/java/ru/project/ui/menu/SortCollectionMenu.java
+++ b/app/src/main/java/ru/project/ui/sorting/SortCollectionMenu.java
@@ -1,4 +1,4 @@
-package ru.project.ui.menu;
+package ru.project.ui.sorting;
 
 import com.googlecode.lanterna.gui2.Button;
 import com.googlecode.lanterna.gui2.Label;
@@ -6,13 +6,8 @@ import com.googlecode.lanterna.gui2.LinearLayout;
 import com.googlecode.lanterna.gui2.Panel;
 import com.googlecode.lanterna.gui2.WindowBasedTextGUI;
 import ru.project.model.AppState;
-import ru.project.model.SortField;
-import ru.project.model.SortMethod;
 import ru.project.ui.base.BaseModalWindow;
-import ru.project.ui.window.MessageWindow;
-import ru.project.ui.window.NormalSortSettingsWindow;
-import ru.project.ui.window.ParitySortSettingsWindow;
-import ru.project.ui.window.SortMethodSelectionWindow;
+import ru.project.ui.common.MessageWindow;
 
 public class SortCollectionMenu extends BaseModalWindow {
 
diff --git a/app/src/main/java/ru/project/model/SortField.java b/app/src/main/java/ru/project/ui/sorting/SortField.java
similarity index 72%
rename from app/src/main/java/ru/project/model/SortField.java
rename to app/src/main/java/ru/project/ui/sorting/SortField.java
index 967a3ac..6219f9b 100644
--- a/app/src/main/java/ru/project/model/SortField.java
+++ b/app/src/main/java/ru/project/ui/sorting/SortField.java
@@ -1,4 +1,4 @@
-package ru.project.model;
+package ru.project.ui.sorting;
 
 public enum SortField {
   GROUP_NUMBER,
diff --git a/app/src/main/java/ru/project/model/SortMethod.java b/app/src/main/java/ru/project/ui/sorting/SortMethod.java
similarity index 60%
rename from app/src/main/java/ru/project/model/SortMethod.java
rename to app/src/main/java/ru/project/ui/sorting/SortMethod.java
index 8cf4c6e..446f27e 100644
--- a/app/src/main/java/ru/project/model/SortMethod.java
+++ b/app/src/main/java/ru/project/ui/sorting/SortMethod.java
@@ -1,4 +1,4 @@
-package ru.project.model;
+package ru.project.ui.sorting;
 
 public enum SortMethod {
   NORMAL,
diff --git a/app/src/main/java/ru/project/ui/window/SortMethodSelectionWindow.java b/app/src/main/java/ru/project/ui/sorting/SortMethodSelectionWindow.java
similarity index 93%
rename from app/src/main/java/ru/project/ui/window/SortMethodSelectionWindow.java
rename to app/src/main/java/ru/project/ui/sorting/SortMethodSelectionWindow.java
index 331f430..121e5e2 100644
--- a/app/src/main/java/ru/project/ui/window/SortMethodSelectionWindow.java
+++ b/app/src/main/java/ru/project/ui/sorting/SortMethodSelectionWindow.java
@@ -1,9 +1,8 @@
-package ru.project.ui.window;
+package ru.project.ui.sorting;
 
 import com.googlecode.lanterna.gui2.ActionListBox;
 import com.googlecode.lanterna.gui2.WindowBasedTextGUI;
 import java.util.function.Consumer;
-import ru.project.model.SortMethod;
 import ru.project.ui.base.BaseModalWindow;
 
 public class SortMethodSelectionWindow extends BaseModalWindow {