diff --git a/src/main/java/core/basesyntax/HelloWorld.java b/src/main/java/core/basesyntax/HelloWorld.java
new file mode 100644
index 00000000..5ff556ee
--- /dev/null
+++ b/src/main/java/core/basesyntax/HelloWorld.java
@@ -0,0 +1,47 @@
+package core.basesyntax;
+
+import core.basesyntax.model.Cat;
+import core.basesyntax.model.Dog;
+import java.time.LocalDate;
+
+public class HelloWorld {
+    private String helloMates;
+    private int variable;
+    private int age;
+    private int size;
+
+    public static void main(String[] args) {
+        Dog dog = new Dog();
+        Cat cat = new core.basesyntax.model.Cat();
+    }
+
+    private String getFromOneToTen() {
+        String result = "";
+
+        for (int i = 0; i < 10; i++) {
+            if (i % 2 == 0) {
+                result = result + i + " ";
+            }
+        }
+        return result;
+    }
+
+    private void sayHello(String hello) {
+        System.out.println("Hello, Mate! I am happy to see you! "
+                + "This class looks weird! Your task is to fix the checkstyle in this file. "
+                + "Your goal is to run `mvn clean package` and receive "
+                + "`BUILD SUCCESS` message");
+        System.out.println(hello);
+    }
+
+    private void initializeVariables() {
+        helloMates = "Hello mates!";
+        System.out.println(helloMates);
+        variable = LocalDate.now().getYear();
+        System.out.println("It is " + variable + " year");
+        age = 25;
+        System.out.println("I'm " + age);
+        size = 42;
+        System.out.println("The size is " + size);
+    }
+}
diff --git a/src/main/java/core/basesyntax/Hello_World.java b/src/main/java/core/basesyntax/Hello_World.java
deleted file mode 100644
index dbfc306e..00000000
--- a/src/main/java/core/basesyntax/Hello_World.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package core.basesyntax;
-
-import core.basesyntax.Model.Dog;
-import core.basesyntax.Model.Cat;
-
-import java.time.LocalDate;
-import java.util.Objects;
-
-public class Hello_World
-{
-    private String a;
-    private int vARIaBLE;
-    private int age, size;
-
-
-    public static void main(String[] args) {
-        Dog dog = new Dog();
-        Cat cat = new Cat(); }
-
-    private String getFromOneToTen() {
-        String result="";
-
-        for (int i=0; i<10; i++){
-            if(i%2==0)
-             result = result + i + " ";
-        }
-        return result;
-    }
-
-    private void sayHello(String HELLO) {
-        System.out.println("Hello, Mate! I am happy to see you! This class looks weird! Your task is to fix the checkstyle in this file." +
-        " Your goal is to run `mvn clean package` and receive `BUILD SUCCESS` message");
-        System.out.println(HELLO);
-    }
-
-    private void initializeVariables() {
-        a = "Hello mates!";
-        System.out.println(a);
-        vARIaBLE = LocalDate.now().getYear();
-        System.out.println("It is " + vARIaBLE + "year");
-        age = 25;
-        System.out.println("I'm " + age);
-        size = 42;
-        System.out.println("The size is " + size);
-    }
-}
diff --git a/src/main/java/core/basesyntax/Model/Cat.java b/src/main/java/core/basesyntax/Model/Cat.java
index 90efa6d8..0e7cf879 100644
--- a/src/main/java/core/basesyntax/Model/Cat.java
+++ b/src/main/java/core/basesyntax/Model/Cat.java
@@ -1,4 +1,4 @@
-package core.basesyntax.Model;
+package core.basesyntax.model;
 
 public class Cat {
     private int age;
@@ -7,10 +7,15 @@ public class Cat {
 
     @Override
     public String toString() {
-        return "Cat{" +
-                "age=" + age +
-                ", name='" + name + '\'' +
-                ", ownerName='" + ownerName + '\'' +
-                '}';
+        return "Cat{"
+                + "age="
+                + age
+                + ", name='"
+                + name
+                + '\''
+                + ", ownerName='"
+                + ownerName
+                + '\''
+                + '}';
     }
 }
diff --git a/src/main/java/core/basesyntax/Model/Dog.java b/src/main/java/core/basesyntax/Model/Dog.java
index 690360a6..b4d904ce 100644
--- a/src/main/java/core/basesyntax/Model/Dog.java
+++ b/src/main/java/core/basesyntax/Model/Dog.java
@@ -1,4 +1,4 @@
-package core.basesyntax.Model;
+package core.basesyntax.model;
 
 public class Dog {
 }