diff --git a/src/enums/BlocksNumber.java b/src/drawing_objects/BlocksNumber.java
similarity index 67%
rename from src/enums/BlocksNumber.java
rename to src/drawing_objects/BlocksNumber.java
index 7233e2a..5d96d4f 100644
--- a/src/enums/BlocksNumber.java
+++ b/src/drawing_objects/BlocksNumber.java
@@ -1,4 +1,4 @@
-package enums;
+package drawing_objects;
 
 public enum BlocksNumber {
     TWO,
diff --git a/src/enums/DirectionType.java b/src/drawing_objects/DirectionType.java
similarity index 72%
rename from src/enums/DirectionType.java
rename to src/drawing_objects/DirectionType.java
index 1f59378..bdc0fd6 100644
--- a/src/enums/DirectionType.java
+++ b/src/drawing_objects/DirectionType.java
@@ -1,4 +1,4 @@
-package enums;
+package drawing_objects;
 
 public enum DirectionType {
     UP,
diff --git a/src/drawing_objects/DrawingBattleship.java b/src/drawing_objects/DrawingBattleship.java
index 0da0e6c..051edac 100644
--- a/src/drawing_objects/DrawingBattleship.java
+++ b/src/drawing_objects/DrawingBattleship.java
@@ -1,7 +1,6 @@
 package drawing_objects;
 
 import entities.EntityBattleship;
-import enums.DirectionType;
 
 import java.awt.*;
 
diff --git a/src/drawing_objects/DrawingBlocks.java b/src/drawing_objects/DrawingBlocks.java
index 6c6ad21..e724e93 100644
--- a/src/drawing_objects/DrawingBlocks.java
+++ b/src/drawing_objects/DrawingBlocks.java
@@ -1,7 +1,5 @@
 package drawing_objects;
 
-import enums.BlocksNumber;
-
 import java.awt.*;
 
 public class DrawingBlocks {
@@ -20,10 +18,10 @@ public class DrawingBlocks {
         if (number == BlocksNumber.FOUR || number == BlocksNumber.SIX){
             graphics2D.fillRect(_startX+62, _startY+12, 6, 6);
             graphics2D.fillRect(_startX+62, _startY+32, 6, 6);
-        }
-        if (number == BlocksNumber.SIX){
-            graphics2D.fillRect(_startX+42, _startY+12, 6, 6);
-            graphics2D.fillRect(_startX+42, _startY+32, 6, 6);
+            if (number == BlocksNumber.SIX){
+                graphics2D.fillRect(_startX+42, _startY+12, 6, 6);
+                graphics2D.fillRect(_startX+42, _startY+32, 6, 6);
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/src/frames/FrameBattleship.java b/src/frames/FrameBattleship.java
index 7236810..4bc185c 100644
--- a/src/frames/FrameBattleship.java
+++ b/src/frames/FrameBattleship.java
@@ -1,7 +1,7 @@
 package frames;
 
 import drawing_objects.DrawingBattleship;
-import enums.DirectionType;
+import drawing_objects.DirectionType;
 
 import javax.imageio.ImageIO;
 import javax.swing.*;
@@ -27,12 +27,12 @@ public class FrameBattleship extends JFrame {
                 super.repaint();
             }
         };
+        pictureBox.setBounds( 0, 0, getContentPane().getWidth(), getContentPane().getHeight());
         JButton createButton = new JButton("Создать");
         JButton rightButton = new JButton(new ImageIcon(ImageIO.read(new File("images/right.png"))));
         JButton leftButton = new JButton(new ImageIcon(ImageIO.read(new File("images/left.png"))));
         JButton upButton = new JButton(new ImageIcon(ImageIO.read(new File("images/up.png"))));
         JButton downButton = new JButton(new ImageIcon(ImageIO.read(new File("images/down.png"))));
-        pictureBox.setBounds( 0, 0, getContentPane().getWidth(), getContentPane().getHeight());
         //ActionListeners and ActionCommand addition
         createButton.addActionListener(e -> buttonCreateClick());
         rightButton.setActionCommand("right");