diff --git a/ProjectAntiAircraftGun/src/CountRollers.java b/ProjectAntiAircraftGun/src/CountRollers.java
deleted file mode 100644
index 1a04e48..0000000
--- a/ProjectAntiAircraftGun/src/CountRollers.java
+++ /dev/null
@@ -1,5 +0,0 @@
-public enum CountRollers {
-    Four,
-    Five,
-    Six;
-}
diff --git a/ProjectAntiAircraftGun/src/DifferentsDrawningRollers/CountRollers.java b/ProjectAntiAircraftGun/src/DifferentsDrawningRollers/CountRollers.java
new file mode 100644
index 0000000..d6da58f
--- /dev/null
+++ b/ProjectAntiAircraftGun/src/DifferentsDrawningRollers/CountRollers.java
@@ -0,0 +1,14 @@
+package DifferentsDrawningRollers;
+
+public enum CountRollers {
+    Four(1),
+    Five(2),
+    Six(3);
+    private final int count;
+    CountRollers(int count) {
+        this.count = count;
+    }
+    public int getCountRollers() {
+        return count;
+    }
+}
diff --git a/ProjectAntiAircraftGun/src/DrawningRollers.java b/ProjectAntiAircraftGun/src/DifferentsDrawningRollers/DrawningRollers.java
similarity index 63%
rename from ProjectAntiAircraftGun/src/DrawningRollers.java
rename to ProjectAntiAircraftGun/src/DifferentsDrawningRollers/DrawningRollers.java
index 2cbfd98..40f3937 100644
--- a/ProjectAntiAircraftGun/src/DrawningRollers.java
+++ b/ProjectAntiAircraftGun/src/DifferentsDrawningRollers/DrawningRollers.java
@@ -1,29 +1,21 @@
+package DifferentsDrawningRollers;
+
+import DifferentsDrawningRollers.CountRollers;
+
 import java.awt.*;
-public class DrawningRollers {
+public class DrawningRollers  implements  IDrawningsRollers{
     private CountRollers _rollers;
-
-    public CountRollers getCount() {
-        return _rollers;
-    }
-
-    public void SetCount(int count) {
-        switch (count) {
-            case 1: // 4
-                _rollers = CountRollers.Four;
-                break;
-            case 2: // 5
-                _rollers = CountRollers.Five;
-                break;
-            case 3: // 6
-                _rollers = CountRollers.Six;
-                break;
-            default:
-                _rollers = CountRollers.Four;
-                break;
+    @Override
+    public void setCountRollers(int numRollers) {
+        for (CountRollers value : CountRollers.values()) {
+            if (value.getCountRollers() == numRollers) {
+                _rollers = value;
+                return;
+            }
         }
     }
-
-    public void Draw(Graphics2D g, int _StartPosX, int _StartPosY) {
+    @Override
+    public void DrawRollers(Graphics2D g, int _StartPosX, int _StartPosY) {
         g.setColor(Color.BLACK);
         if (_rollers == null) {
             return;
diff --git a/ProjectAntiAircraftGun/src/DifferentsDrawningRollers/IDrawningsRollers.java b/ProjectAntiAircraftGun/src/DifferentsDrawningRollers/IDrawningsRollers.java
new file mode 100644
index 0000000..6503d71
--- /dev/null
+++ b/ProjectAntiAircraftGun/src/DifferentsDrawningRollers/IDrawningsRollers.java
@@ -0,0 +1,8 @@
+package DifferentsDrawningRollers;
+
+import java.awt.*;
+
+public interface IDrawningsRollers {
+    void setCountRollers(int numRollers);
+    void DrawRollers(Graphics g, int startPosX, int startPosY);
+}
diff --git a/ProjectAntiAircraftGun/src/CanvasAntiAircraftGun.java b/ProjectAntiAircraftGun/src/Drawnings/CanvasAntiAircraftGun.java
similarity index 88%
rename from ProjectAntiAircraftGun/src/CanvasAntiAircraftGun.java
rename to ProjectAntiAircraftGun/src/Drawnings/CanvasAntiAircraftGun.java
index bbe4120..53a37d6 100644
--- a/ProjectAntiAircraftGun/src/CanvasAntiAircraftGun.java
+++ b/ProjectAntiAircraftGun/src/Drawnings/CanvasAntiAircraftGun.java
@@ -1,3 +1,7 @@
+package Drawnings;
+
+import Drawnings.DrawningAntiAircraftGun;
+
 import javax.swing.*;
 import java.awt.*;
 public class CanvasAntiAircraftGun extends JComponent {
diff --git a/ProjectAntiAircraftGun/src/DirectionType.java b/ProjectAntiAircraftGun/src/Drawnings/DirectionType.java
similarity index 77%
rename from ProjectAntiAircraftGun/src/DirectionType.java
rename to ProjectAntiAircraftGun/src/Drawnings/DirectionType.java
index 35657f0..6026a7e 100644
--- a/ProjectAntiAircraftGun/src/DirectionType.java
+++ b/ProjectAntiAircraftGun/src/Drawnings/DirectionType.java
@@ -1,3 +1,5 @@
+package Drawnings;
+
 public enum DirectionType {
     Up,
     Down,
diff --git a/ProjectAntiAircraftGun/src/DrawningAntiAircraftGun.java b/ProjectAntiAircraftGun/src/Drawnings/DrawningAntiAircraftGun.java
similarity index 94%
rename from ProjectAntiAircraftGun/src/DrawningAntiAircraftGun.java
rename to ProjectAntiAircraftGun/src/Drawnings/DrawningAntiAircraftGun.java
index ecac4d8..4a34268 100644
--- a/ProjectAntiAircraftGun/src/DrawningAntiAircraftGun.java
+++ b/ProjectAntiAircraftGun/src/Drawnings/DrawningAntiAircraftGun.java
@@ -1,8 +1,12 @@
+package Drawnings;
+
+import Entities.EntityAntiAircraftGun;
+
 import javax.swing.*;
 import java.awt.*;
 import java.util.Random;
 public class DrawningAntiAircraftGun extends JPanel{
-    public EntityAntiAircraftGun EntityAntiAircraftGun;
+    public Entities.EntityAntiAircraftGun EntityAntiAircraftGun;
     public DrawningRollers _rollers = null;
     private Integer picture_width;
     private Integer picture_height;
@@ -59,24 +63,24 @@ public class DrawningAntiAircraftGun extends JPanel{
     public boolean MoveTransport(DirectionType direction) {
         if (EntityAntiAircraftGun == null || _StartPosX == null || _StartPosY == null) return false;
         switch (direction) {
-            case Left:
+            case DirectionType.Left:
                 if (_StartPosX - EntityAntiAircraftGun.Step > 0) {
                     _StartPosX -= (int)EntityAntiAircraftGun.Step;
                 }
                 return true;
-            case Up:
+            case DirectionType.Up:
                 if (_StartPosY - EntityAntiAircraftGun.Step > 0)
                 {
                     _StartPosY -= (int)EntityAntiAircraftGun.Step;
                 }
                 return true;
-            case Right:
+            case DirectionType.Right:
                 if (_StartPosX + drawningCarWidth + (int)EntityAntiAircraftGun.Step < picture_width - EntityAntiAircraftGun.Step)
                 {
                     _StartPosX += (int)EntityAntiAircraftGun.Step;
                 }
                 return true;
-            case Down:
+            case DirectionType.Down:
                 if (_StartPosY + drawningCarHeight + (int)EntityAntiAircraftGun.Step < picture_height - EntityAntiAircraftGun.Step)
                 {
                     _StartPosY += (int)EntityAntiAircraftGun.Step;
@@ -124,7 +128,7 @@ public class DrawningAntiAircraftGun extends JPanel{
         g.setColor(EntityAntiAircraftGun.getBodyColor());
         g.fillRect(_StartPosX + 10, _StartPosY+ 65, 120, 13);
 
-        _rollers.Draw(g,_StartPosX, _StartPosY);
+        _rollers.DrawRollers(g,_StartPosX, _StartPosY);
         //отрисовки башни
         if (EntityAntiAircraftGun.getIsTower())
         {
diff --git a/ProjectAntiAircraftGun/src/EntityAntiAircraftGun.java b/ProjectAntiAircraftGun/src/Entities/EntityAntiAircraftGun.java
similarity index 97%
rename from ProjectAntiAircraftGun/src/EntityAntiAircraftGun.java
rename to ProjectAntiAircraftGun/src/Entities/EntityAntiAircraftGun.java
index cfe2bd6..864a59e 100644
--- a/ProjectAntiAircraftGun/src/EntityAntiAircraftGun.java
+++ b/ProjectAntiAircraftGun/src/Entities/EntityAntiAircraftGun.java
@@ -1,3 +1,5 @@
+package Entities;
+
 import java.awt.*;
 public class EntityAntiAircraftGun {
     private int Speed;
diff --git a/ProjectAntiAircraftGun/src/FormAntiAircraftGun.java b/ProjectAntiAircraftGun/src/FormAntiAircraftGun.java
index 5d4fd1a..af1955f 100644
--- a/ProjectAntiAircraftGun/src/FormAntiAircraftGun.java
+++ b/ProjectAntiAircraftGun/src/FormAntiAircraftGun.java
@@ -1,3 +1,7 @@
+import Drawnings.CanvasAntiAircraftGun;
+import Drawnings.DirectionType;
+import Drawnings.DrawningAntiAircraftGun;
+
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;