From e5cd30ee29298dddf64c10b21b1703fd8e98f56d Mon Sep 17 00:00:00 2001
From: valerpan <wpanic.actioncat@gmail.com>
Date: Sun, 19 Jul 2026 00:32:15 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=8B=20=D1=84=D0=B0=D0=B9=D0=BB=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/Zoo.java                            | 12 ++++++------
 src/main/java/animals/{carnivores => }/Bear.java  |  5 +----
 src/main/java/animals/{herbivores => }/Deer.java  |  4 +---
 src/main/java/animals/{herbivores => }/Duck.java  |  3 +--
 src/main/java/animals/{carnivores => }/Fish.java  |  4 +---
 src/main/java/animals/Herbivore.java              |  2 +-
 src/main/java/animals/{carnivores => }/Kotik.java |  5 +----
 src/main/java/animals/{herbivores => }/Sheep.java |  5 +----
 8 files changed, 13 insertions(+), 27 deletions(-)
 rename src/main/java/animals/{carnivores => }/Bear.java (82%)
 rename src/main/java/animals/{herbivores => }/Deer.java (83%)
 rename src/main/java/animals/{herbivores => }/Duck.java (95%)
 rename src/main/java/animals/{carnivores => }/Fish.java (83%)
 rename src/main/java/animals/{carnivores => }/Kotik.java (82%)
 rename src/main/java/animals/{herbivores => }/Sheep.java (82%)

diff --git a/src/main/java/Zoo.java b/src/main/java/Zoo.java
index e67f91c..ca09206 100644
--- a/src/main/java/Zoo.java
+++ b/src/main/java/Zoo.java
@@ -1,11 +1,11 @@
 import animals.Animal;
 import animals.Swim;
-import animals.carnivores.Bear;
-import animals.carnivores.Fish;
-import animals.carnivores.Kotik;
-import animals.herbivores.Deer;
-import animals.herbivores.Duck;
-import animals.herbivores.Sheep;
+import animals.Bear;
+import animals.Fish;
+import animals.Kotik;
+import animals.Deer;
+import animals.Duck;
+import animals.Sheep;
 import employee.Worker;
 import food.Grass;
 import food.Meat;
diff --git a/src/main/java/animals/carnivores/Bear.java b/src/main/java/animals/Bear.java
similarity index 82%
rename from src/main/java/animals/carnivores/Bear.java
rename to src/main/java/animals/Bear.java
index b4666e0..2d540ee 100644
--- a/src/main/java/animals/carnivores/Bear.java
+++ b/src/main/java/animals/Bear.java
@@ -1,7 +1,4 @@
-package animals.carnivores;
-import animals.Carnivorous;
-import animals.Run;
-import animals.Voice;
+package animals;
 
 public class Bear extends Carnivorous implements Run, Voice {
 
diff --git a/src/main/java/animals/herbivores/Deer.java b/src/main/java/animals/Deer.java
similarity index 83%
rename from src/main/java/animals/herbivores/Deer.java
rename to src/main/java/animals/Deer.java
index a4dae45..a43aa86 100644
--- a/src/main/java/animals/herbivores/Deer.java
+++ b/src/main/java/animals/Deer.java
@@ -1,6 +1,4 @@
-package animals.herbivores;
-import animals.Herbivore;
-import animals.Run;
+package animals;
 
 public class Deer extends Herbivore implements Run {
 
diff --git a/src/main/java/animals/herbivores/Duck.java b/src/main/java/animals/Duck.java
similarity index 95%
rename from src/main/java/animals/herbivores/Duck.java
rename to src/main/java/animals/Duck.java
index 65175f1..8bcc8eb 100644
--- a/src/main/java/animals/herbivores/Duck.java
+++ b/src/main/java/animals/Duck.java
@@ -1,5 +1,4 @@
-package animals.herbivores;
-import animals.*;
+package animals;
 
 public class Duck extends Herbivore implements Run, Swim, Fly, Voice {
 
diff --git a/src/main/java/animals/carnivores/Fish.java b/src/main/java/animals/Fish.java
similarity index 83%
rename from src/main/java/animals/carnivores/Fish.java
rename to src/main/java/animals/Fish.java
index 2e0bc36..7614f53 100644
--- a/src/main/java/animals/carnivores/Fish.java
+++ b/src/main/java/animals/Fish.java
@@ -1,6 +1,4 @@
-package animals.carnivores;
-import animals.Carnivorous;
-import animals.Swim;
+package animals;
 
 public class Fish extends Carnivorous implements Swim {
 
diff --git a/src/main/java/animals/Herbivore.java b/src/main/java/animals/Herbivore.java
index 186672d..48ac472 100644
--- a/src/main/java/animals/Herbivore.java
+++ b/src/main/java/animals/Herbivore.java
@@ -2,7 +2,7 @@ package animals;
 import food.Food;
 import food.Grass;
 
-public class Herbivore extends Animal{
+public abstract class Herbivore extends Animal{
 
     public Herbivore() {}
 
diff --git a/src/main/java/animals/carnivores/Kotik.java b/src/main/java/animals/Kotik.java
similarity index 82%
rename from src/main/java/animals/carnivores/Kotik.java
rename to src/main/java/animals/Kotik.java
index b349122..dc136fc 100644
--- a/src/main/java/animals/carnivores/Kotik.java
+++ b/src/main/java/animals/Kotik.java
@@ -1,7 +1,4 @@
-package animals.carnivores;
-import animals.Carnivorous;
-import animals.Run;
-import animals.Voice;
+package animals;
 
 public class Kotik extends Carnivorous implements Run, Voice {
 
diff --git a/src/main/java/animals/herbivores/Sheep.java b/src/main/java/animals/Sheep.java
similarity index 82%
rename from src/main/java/animals/herbivores/Sheep.java
rename to src/main/java/animals/Sheep.java
index 3b08fa3..df4c89e 100644
--- a/src/main/java/animals/herbivores/Sheep.java
+++ b/src/main/java/animals/Sheep.java
@@ -1,7 +1,4 @@
-package animals.herbivores;
-import animals.Herbivore;
-import animals.Run;
-import animals.Voice;
+package animals;
 
 public class Sheep extends Herbivore implements Run, Voice {