diff --git a/CountWheels.java b/Directions/CountWheels.java
similarity index 92%
rename from CountWheels.java
rename to Directions/CountWheels.java
index c6803ae..e7a99af 100644
--- a/CountWheels.java
+++ b/Directions/CountWheels.java
@@ -1,3 +1,4 @@
+package Directions;
 public enum CountWheels{
     Min(2),
     Mid(3),
@@ -10,7 +11,7 @@ public enum CountWheels{
     public int getCountWheels(){
         return val;
     }
-    
+
     public static CountWheels fromNumberToEnum(int number) {
         try{
         for (CountWheels countWheels : CountWheels.values()) {
diff --git a/Direction.java b/Directions/Direction.java
similarity index 63%
rename from Direction.java
rename to Directions/Direction.java
index a196269..dbef5f9 100644
--- a/Direction.java
+++ b/Directions/Direction.java
@@ -1,3 +1,4 @@
+package Directions;
 
 enum Direction{
     UP(1), 
@@ -8,4 +9,7 @@ enum Direction{
     private Direction(int val){
         this.val = val;
     }
+    public int getDirection(){
+        return val;
+    }
 }
\ No newline at end of file
diff --git a/DrawingWheels.java b/DrawingWheels.java
index 90e8fe9..1432635 100644
--- a/DrawingWheels.java
+++ b/DrawingWheels.java
@@ -1,5 +1,7 @@
 import java.awt.Color;
 import java.awt.Graphics;
+
+import Directions.CountWheels;
 public class DrawingWheels{
     private int _startPosX;
     private int _startPosY;
diff --git a/DrawningMonorail.java b/DrawningObjects/DrawningMonorail.java
similarity index 95%
rename from DrawningMonorail.java
rename to DrawningObjects/DrawningMonorail.java
index 427ff68..bd04410 100644
--- a/DrawningMonorail.java
+++ b/DrawningObjects/DrawningMonorail.java
@@ -1,10 +1,15 @@
+package DrawningObjects;
 import java.awt.*;
 import javax.swing.JPanel;
+
+import Directions.Direction;
+import Entities.EntityMonorail;
+
 import java.util.Random;
 import java.lang.*;
 
 public class DrawningMonorail extends JPanel {
-    private Entity entity;
+    private EntityMonorail entity;
     private int pictureWidth;
     private int pictureHeight;
     private int _countWheels;
@@ -23,7 +28,7 @@ public class DrawningMonorail extends JPanel {
         _countWheels = wheelCount;
         pictureWidth = width;
         pictureHeight = height;
-        entity = new Entity();
+        entity = new EntityMonorail();
         entity.init(wheelCount, speed, weight, bodyColor, additionalColor, monorails, secondCabin);
         return true;
     }
diff --git a/Entity.java b/Entities/EntityMonorail.java
similarity index 51%
rename from Entity.java
rename to Entities/EntityMonorail.java
index cf90138..13ecc9d 100644
--- a/Entity.java
+++ b/Entities/EntityMonorail.java
@@ -1,25 +1,21 @@
+package Entities;
 import java.awt.*;
 
-public class Entity {
+public class EntityMonorail {
     private int speed;
     private int wheelCount;
     private double weight;
     private Color bodyColor;
-    private Color additionalColor;
-    private boolean monorails;
-    private boolean secondCabin;
+    
 
     public double getStep() {
         return (double) speed * 130 / weight;
     }
 
-    public void init(int wheelCount, int speed, double weight, Color bodyColor, Color additionalColor, boolean monorails, boolean secondCabin) {
+    public void init(int wheelCount, int speed, double weight, Color bodyColor) {
         setSpeed(speed);
         setWeight(weight);
         setBodyColor(bodyColor);
-        setAdditionalColor(additionalColor);
-        setMonorails(monorails);
-        setSecondCabin(secondCabin);
         setWheelCount(wheelCount);
     }
 
@@ -47,29 +43,6 @@ public class Entity {
         this.bodyColor = bodyColor;
     }
 
-    public Color getAdditionalColor() {
-        return additionalColor;
-    }
-
-    private void setAdditionalColor(Color additionalColor) {
-        this.additionalColor = additionalColor;
-    }
-
-    public boolean getMonorails() {
-        return monorails;
-    }
-
-    private void setMonorails(boolean monorails) {
-        this.monorails = monorails;
-    }
-
-    public boolean getSecondCabin() {
-        return secondCabin;
-    }
-
-    private void setSecondCabin(boolean secondCabin) {
-        this.secondCabin = secondCabin;
-    }
     public int getWheelCount(){
         return wheelCount;
     }
diff --git a/Entities/EntitySecondMonorail.java b/Entities/EntitySecondMonorail.java
new file mode 100644
index 0000000..cbe576b
--- /dev/null
+++ b/Entities/EntitySecondMonorail.java
@@ -0,0 +1,37 @@
+package Entities;
+import java.awt.*;
+
+public class EntitySecondMonorail {
+    private Color additionalColor;
+    private boolean monorails;
+    private boolean secondCabin;
+    public EntitySecondMonorail(Color additionalColor, boolean monorails, boolean secondCabin){
+        setAdditionalColor(additionalColor);
+        setMonorails(monorails);
+        setSecondCabin(secondCabin);
+    }
+    
+    public Color getAdditionalColor() {
+        return additionalColor;
+    }
+
+    private void setAdditionalColor(Color additionalColor) {
+        this.additionalColor = additionalColor;
+    }
+
+    public boolean getMonorails() {
+        return monorails;
+    }
+
+    private void setMonorails(boolean monorails) {
+        this.monorails = monorails;
+    }
+
+    public boolean getSecondCabin() {
+        return secondCabin;
+    }
+
+    private void setSecondCabin(boolean secondCabin) {
+        this.secondCabin = secondCabin;
+    }
+}
\ No newline at end of file
diff --git a/MonoFrame.java b/MonoFrame.java
index abd8f6c..3c17947 100644
--- a/MonoFrame.java
+++ b/MonoFrame.java
@@ -3,6 +3,10 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.image.BufferedImage;
 import javax.swing.*;
+
+import Directions.Direction;
+import DrawningObjects.DrawningMonorail;
+
 import java.util.Random;
 
 class Form extends JFrame{